From 385ca8771b8a1cf5bc9ff0260d08f9e9d16d3c3c Mon Sep 17 00:00:00 2001
From: Sebastian Castro <90scastro@gmail.com>
Date: Thu, 8 Nov 2018 21:56:40 +0100
Subject: [PATCH] colibris: various improvements, including author_hover,
 cursortrace plugins

---
 src/static/skins/colibris/pad.css             | 12 ++++---
 src/static/skins/colibris/pad.js              | 12 -------
 .../skins/colibris/src/components/buttons.css |  7 ++--
 .../colibris/src/components/import-export.css | 33 +++++++++++++++++++
 .../skins/colibris/src/components/popup.css   |  3 +-
 src/static/skins/colibris/src/layout.css      | 20 ++++++++++-
 .../colibris/src/plugins/author_hover.css     | 10 ++++++
 .../colibris/src/plugins/comments_page.css    |  8 ++++-
 .../colibris/src/plugins/cursortrace.css      |  0
 .../colibris/src/plugins/set_title_on_pad.css |  4 +--
 src/static/skins/colibris/timeslider.css      | 13 ++++++--
 11 files changed, 95 insertions(+), 27 deletions(-)
 create mode 100644 src/static/skins/colibris/src/components/import-export.css
 create mode 100644 src/static/skins/colibris/src/plugins/author_hover.css
 create mode 100644 src/static/skins/colibris/src/plugins/cursortrace.css

diff --git a/src/static/skins/colibris/pad.css b/src/static/skins/colibris/pad.css
index 1dc73ceab..f238c80e4 100644
--- a/src/static/skins/colibris/pad.css
+++ b/src/static/skins/colibris/pad.css
@@ -11,6 +11,7 @@
 @import url("src/components/toolbar.css");
 @import url("src/components/users.css");
 @import url("src/components/form.css");
+@import url("src/components/import-export.css");
 
 @import url("src/plugins/brightcolorpicker.css");
 @import url("src/plugins/comments_page.css");
@@ -18,6 +19,7 @@
 @import url("src/plugins/set_title_on_pad.css");
 @import url("src/plugins/tables2.css");
 @import url("src/plugins/embedded_hyperlinks.css");
+@import url("src/plugins/author_hover.css");
 
 /* NEUTRAL COLOR */
 body,
@@ -50,7 +52,8 @@ body,
 .reply-suggestion .reply-comment-suggest-from,
 .suggestion .comment-suggest-from,
 .hyperlink-dialog>.hyperlink-url,
-.timeslider #padcontent span 
+.timeslider #padcontent span ,
+.exporttype, .timeslider #export > p 
 { color: #495057 !important; }
 
 /* MENUS ICONS */
@@ -69,7 +72,8 @@ body,
 #yui-picker-panel .button-group .yui-button:last-child button,
 #newComment.sidebar-comment input[type=submit],
 .comment-changeTo-approve input[type=submit],
-.hyperlink-dialog>.hyperlink-save
+.hyperlink-dialog>.hyperlink-save,
+#importsubmitinput, #forcereconnect
 { 
   background-color: #64d29b; 
   color: white;
@@ -81,7 +85,7 @@ h1,
 .yui-skin-sam .yui-panel .hd,
 p[data-l10n-id="ep_comments_page.comment"],
 .comment-reply-input-label span,
-.stepper
+.stepper, #importmessageabiword, #importmessageabiword > a
 { color: #64d29b; }
 #ui-slider-handle, #playpause_button_icon {
   background-color: #64d29b; 
@@ -106,7 +110,7 @@ td[name=tData],
 #comments, #newComments,
 #sidediv,
 #comments .sidebar-comment,
-#timeslider #timer
+#timeslider #timer, .exporttype
 { font-family: Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; }
 
 /* PRIMARY FONT */
diff --git a/src/static/skins/colibris/pad.js b/src/static/skins/colibris/pad.js
index a71a6513a..88ddce4c3 100644
--- a/src/static/skins/colibris/pad.js
+++ b/src/static/skins/colibris/pad.js
@@ -1,16 +1,4 @@
 function customStart()
 {
   $('#pad_title').show();
-
-  $('.hyperlink-icon').on('click',function() {
-    $('.hyperlink-dialog').appendTo('body').css({'top': $('.hyperlink-icon').offset().top + 42, 'left': $('.hyperlink-icon').offset().left - 12});
-  });
-  $('.hyperlink-url').on("keyup", function(e)
-  {
-    if(e.keyCode == 13) // touche entrée
-    { 
-      $('.hyperlink-save').click();
-    }
-  });
-  $('.hyperlink-save').click(function() { $('.hyperlink-dialog').hide(); });
 }
diff --git a/src/static/skins/colibris/src/components/buttons.css b/src/static/skins/colibris/src/components/buttons.css
index ef23840e9..93879023e 100644
--- a/src/static/skins/colibris/src/components/buttons.css
+++ b/src/static/skins/colibris/src/components/buttons.css
@@ -1,4 +1,5 @@
-.btn, #mycolorpickercancel, #mycolorpickersave, #save_title button, #yui-picker-panel .button-group .yui-button button, .hyperlink-dialog>.hyperlink-save, .timeslider #editbar .buttontext 
+.btn, #mycolorpickercancel, #mycolorpickersave, #save_title button, #yui-picker-panel .button-group .yui-button button, .hyperlink-dialog>.hyperlink-save, .timeslider #editbar .buttontext,
+#importsubmitinput, #forcereconnect
 {
   margin-right: 10px;
   padding: 5px 20px;
@@ -6,7 +7,7 @@
   font-size: 13px;
   line-height: 1.5;
   width: auto;
-  border: none;
+  border: none !important;
   font-weight: bold;
   text-transform: uppercase;
   position: relative;
@@ -15,6 +16,6 @@
   left: 0;
 }
 
-.btn:hover, #mycolorpickercancel:hover, #mycolorpickersave:hover, #save_title button:hover, .hyperlink-dialog>.hyperlink-save:hover {
+.btn:hover, #mycolorpickercancel:hover, #mycolorpickersave:hover, #save_title button:hover, .hyperlink-dialog>.hyperlink-save:hover, #importsubmitinput:hover, #forcereconnect:hover {
   cursor: pointer;
 }
diff --git a/src/static/skins/colibris/src/components/import-export.css b/src/static/skins/colibris/src/components/import-export.css
new file mode 100644
index 000000000..9407ade69
--- /dev/null
+++ b/src/static/skins/colibris/src/components/import-export.css
@@ -0,0 +1,33 @@
+#exportColumn {
+  margin-top: 0;
+  padding-left: 20px;
+  width: calc(50% - 20px);
+}
+
+#importmessageabiword { 
+  font-style: italic;
+  font-size: 13px;
+}
+#importmessageabiword > a {
+  font-weight: bold;
+  text-decoration: underline;
+}
+
+.exportlink {
+  font-size: 14px;
+  margin: 0;
+  margin-bottom: 7px;
+  margin-left: 10px;
+}
+
+.exporttype {
+  margin-left: 5px;
+  font-size: 14px;
+}
+
+#importmessagefail {
+  font-size: 13px;
+  margin-top: 10px;
+}
+
+#importsubmitinput[disabled] { opacity: .6; }
\ No newline at end of file
diff --git a/src/static/skins/colibris/src/components/popup.css b/src/static/skins/colibris/src/components/popup.css
index 18da07351..7b3c0381b 100644
--- a/src/static/skins/colibris/src/components/popup.css
+++ b/src/static/skins/colibris/src/components/popup.css
@@ -26,4 +26,5 @@
 
 .popup p {
   margin: 10px 0;
-}
\ No newline at end of file
+}
+
diff --git a/src/static/skins/colibris/src/layout.css b/src/static/skins/colibris/src/layout.css
index cbc732686..5f3183eb5 100644
--- a/src/static/skins/colibris/src/layout.css
+++ b/src/static/skins/colibris/src/layout.css
@@ -58,6 +58,19 @@
   right: calc(100% - 113px); 
 }
 
+/* Fixs comments_page & author_hover does not take in account the document padding */
+.comment-modal { margin-top: 75px !important; margin-left: 45px; }
+.authortooltip { margin-top: 65px !important; margin-left: 60px; }
+.caretindicator { margin-top: 61px!important; margin-left: 52px; }
+
+#outerdocbody.ep_author_neat .authortooltip{ margin-left: 145px; }
+#outerdocbody.ep_author_neat .caretindicator{ margin-left: 52px; margin-top: 65px!important;}
+@media (max-width:1000px) { 
+  #outerdocbody.ep_author_neat .authortooltip{ margin-left: 115px; } 
+  .caretindicator{ margin-left: 13px; } 
+  #outerdocbody.ep_author_neat .caretindicator{ margin-left: 17px; } 
+}
+
 @media (min-width: 1381px) { 
   #outerdocbody.ep_comments_page  { padding-right: 150px; } }
   #outerdocbody.ep_comments_page #comments { left: calc(100% - 150px) }
@@ -81,9 +94,13 @@
     width: calc(100% - 40px) !important; /* 100% - padding */
   }
   #sidediv { 
-    top: 30px !important; 
+    top: 20px !important; /* = #outerdocbody iframe padding-top */
   }  
 
+  .comment-modal, .authortooltip { margin-top: 20px !important; }
+  .caretindicator { margin-top: 0px !important; }
+  #outerdocbody.ep_author_neat  .caretindicator { margin-top: 10px !important; }
+
   #outerdocbody.ep_author_neat #sidedivinner>div:before { padding-right: 10px !important; }
   #outerdocbody.ep_author_neat #sidedivinner.authorColors>div, 
   #outerdocbody.ep_author_neat #sidedivinner.authorColors>div.primary-none, 
@@ -102,6 +119,7 @@
   }
   #sidediv { 
     display: block;
+    top: 15px !important; /* = #outerdocbody iframe padding-top */
   }
 }
 
diff --git a/src/static/skins/colibris/src/plugins/author_hover.css b/src/static/skins/colibris/src/plugins/author_hover.css
new file mode 100644
index 000000000..6a0fbe42a
--- /dev/null
+++ b/src/static/skins/colibris/src/plugins/author_hover.css
@@ -0,0 +1,10 @@
+.authortooltip {
+  opacity: 1!important;
+  border-radius: 2px;
+  padding: 4px 10px 3px!important;
+  text-transform: uppercase;
+  font-size: 13px!important;
+  font-weight: 700;
+  color: #000;
+  background-color: rgba(255, 255, 255, 0.85) !important;
+}
\ No newline at end of file
diff --git a/src/static/skins/colibris/src/plugins/comments_page.css b/src/static/skins/colibris/src/plugins/comments_page.css
index 425f4012c..f11fa61c8 100644
--- a/src/static/skins/colibris/src/plugins/comments_page.css
+++ b/src/static/skins/colibris/src/plugins/comments_page.css
@@ -281,4 +281,10 @@ textarea.comment-suggest-to {
   width: 350px !important;
   margin-top: 0;
   padding-top: 10px;
-}
\ No newline at end of file
+}
+
+.comment-modal-comment>.comment-author-name {
+  padding-left: 14px;
+}
+
+
diff --git a/src/static/skins/colibris/src/plugins/cursortrace.css b/src/static/skins/colibris/src/plugins/cursortrace.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/static/skins/colibris/src/plugins/set_title_on_pad.css b/src/static/skins/colibris/src/plugins/set_title_on_pad.css
index b38c007f8..8d0c76677 100644
--- a/src/static/skins/colibris/src/plugins/set_title_on_pad.css
+++ b/src/static/skins/colibris/src/plugins/set_title_on_pad.css
@@ -1,5 +1,5 @@
 #pad_title {
-  margin-bottom: 8px !important;
+  margin-bottom: 15px !important;
   margin-top: 5px !important;
   display: none; /* display only when page is loaded via javascript */
 }
@@ -14,7 +14,7 @@
 #edit_title:before {
   font-family: fontawesome-etherpad;
   position: absolute;
-  top: 15px;
+  top: 20px;
   font-size: 14px;
   content: "\E839";
   margin-left: 10px;
diff --git a/src/static/skins/colibris/timeslider.css b/src/static/skins/colibris/timeslider.css
index be4a9d62d..1f4d16456 100644
--- a/src/static/skins/colibris/timeslider.css
+++ b/src/static/skins/colibris/timeslider.css
@@ -6,8 +6,15 @@
   }
 }
 
-.timeslider #import_export, #settings{
-  top: 115px !important;
+.timeslider #import_export, .timeslider #settings{
+  top: 108px !important;
+  right: 55px;
+}
+
+.timeslider #export > p {
+  font-size: 15px;
+  margin-top: 0;
+  margin-bottom: 20px;
 }
 
 .timeslider #padpage {
@@ -21,7 +28,7 @@
 }
 
 .timeslider-bar { background: none; }
-.timeslider-bar p { margin: 8px; }
+.timeslider-bar p { margin: 8px; font-size: 12px;}
 
 .timeslider-bar #editbar {
   border: none;