Fix topbar buttons positioning, user widget default avatar background.

pydio · Sep 10, 2016 · 3201ad6 · 3201ad6
1 parent ba92c0c
commit 3201ad6
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 26 deletions.
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/forms.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/forms.less
@@ -326,6 +326,9 @@ select.SF_input {
 .SF_image.small {
   max-height: 80px;
   max-width: 80px;
+  &[src*="default_avatar"]{
+    background-color: #B0BEC5;
+  }
 }
 #user_profile_form {
   img.SF_image.small {

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/userwidget.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/userwidget.less
@@ -1,9 +1,13 @@
-@userwidget_font_color: @white;
-@userwidget_font_size:12px;
-@userwidget_font_weight:300;
+@userwidget_font_color: @topbar_buttons_color;
+@userwidget_font_color_hover: @topbar_buttons_color_hover;
+@userwidget_font_size:@topbar_buttons_font_size;
+@userwidget_font_weight:@topbar_buttons_font_weight;
 
 #logging_string {
   color:@userwidget_font_color;
+  &:hover{
+    color: @userwidget_font_color_hover;
+  }
   float: right;
   margin-top: 12px;
   div.inlineBarButtonLeft {
@@ -50,10 +54,10 @@
       display: inline-block;
       font-size: @userwidget_font_size;
       font-weight: @userwidget_font_weight;
-      padding: 6px 0 0 8px;
-      color: rgba(255,255,255,0.9);
+      padding: 4px 0 0 8px;
+      color: @userwidget_font_color;
       &:hover{
-        color: white;
+        color: @userwidget_font_color_hover;
       }
       img {
       }
@@ -63,7 +67,7 @@
     float: right;
     width: 39px;
     height: 39px;
-    margin-top: -14px;
+    margin-top: -12px;
     margin-left: 14px;
     border-radius: 100%;
     background-position: center center;

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css
@@ -1320,6 +1320,9 @@ select.SF_input {
   max-height: 80px;
   max-width: 80px;
 }
+.SF_image.small[src*="default_avatar"] {
+  background-color: #B0BEC5;
+}
 #user_profile_form img.SF_image.small {
   border-radius: 40px;
 }
@@ -2687,10 +2690,13 @@ div.detailed div.FL-inlineToolbar div.toolbarGroup {
   cursor: pointer;
 }
 #logging_string {
-  color: #ffffff;
+  color: rgba(255, 255, 255, 0.98);
   float: right;
   margin-top: 12px;
 }
+#logging_string:hover {
+  color: #ffffff;
+}
 #logging_string div.inlineBarButtonLeft {
   display: none;
 }
@@ -2735,17 +2741,17 @@ div.detailed div.FL-inlineToolbar div.toolbarGroup {
   display: inline-block;
   font-size: 13px;
   font-weight: 300;
-  padding: 6px 0 0 8px;
-  color: rgba(255, 255, 255, 0.9);
+  padding: 4px 0 0 8px;
+  color: rgba(255, 255, 255, 0.98);
 }
 #logging_string .user_widget_label.withImage i:hover {
-  color: white;
+  color: #ffffff;
 }
 #logging_string div.user_widget_mini {
   float: right;
   width: 39px;
   height: 39px;
-  margin-top: -14px;
+  margin-top: -12px;
   margin-left: 14px;
   border-radius: 100%;
   background-position: center center;
@@ -5815,7 +5821,7 @@ div.pydio-tasks-panel div.task .task_actions > span {
 /* tooltips */
 /* tree */
 /* uploaders */
-/* user widget */
+/* user widget && top toolbar actions */
 /* menus */
 /* InfoPanel */
 /* Left PAnel */
@@ -6267,18 +6273,22 @@ div.dialogButtons.inlineEdition input {
 #ajxp_desktop[class^="ajxp_ws-"] #global_toolbar #top_toolbar a,
 #ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #top_toolbar a {
   font-size: 13px;
-  padding: 7px 24px;
+  padding: 5px 20px;
   font-weight: 300;
-  color: rgba(255, 255, 255, 0.9);
+  color: rgba(255, 255, 255, 0.98);
   display: inline-block;
 }
+#ajxp_desktop[class^="ajxp_ws-"] #global_toolbar #top_toolbar a:hover,
+#ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #top_toolbar a:hover {
+  color: #ffffff;
+}
 #ajxp_desktop[class^="ajxp_ws-"] #global_toolbar #top_toolbar a span.ajxp_icon_span,
 #ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #top_toolbar a span.ajxp_icon_span,
 #ajxp_desktop[class^="ajxp_ws-"] #global_toolbar #top_toolbar a span.ajxp_icon_arrow,
 #ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #top_toolbar a span.ajxp_icon_arrow {
   font-size: 1.0em;
   display: inline-block;
-  padding: 0 4px;
+  padding: 0 8px;
 }
 #ajxp_desktop[class^="ajxp_ws-"] #global_toolbar #top_toolbar a img,
 #ajxp_desktop[class*=" ajxp_ws-"] #global_toolbar #top_toolbar a img {

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/toolbars.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/toolbars.less
@@ -93,17 +93,20 @@
 
     a
     {
-      font-size: 13px;
-      padding: 7px 24px;
-      font-weight: 300;
-      color: rgba(255, 255, 255, 0.9);
+      font-size: @topbar_buttons_font_size;
+      padding: 5px 20px;
+      font-weight: @topbar_buttons_font_weight;
+      color: @topbar_buttons_color;
+      &:hover{
+        color: @topbar_buttons_color_hover;
+      }
       display: inline-block;
 
       span.ajxp_icon_span,
       span.ajxp_icon_arrow{
         font-size: 1.0em;
         display:inline-block;
-        padding: 0 4px;
+        padding: 0 8px;
       }
       img{
         display:none;

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/variables.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/theme/variables.less
@@ -193,10 +193,11 @@
 @uploader_dialog_chooser_secondary:@applicationSecondaryColor;
 @uploader_dialog_progress_color: lighten(@uploader_dialog_chooser_secondary, 28);
 
-/* user widget */
-@userwidget_font_color: @white;
-@userwidget_font_size:13px;
-@userwidget_font_weight:300;
+/* user widget && top toolbar actions */
+@topbar_buttons_color: rgba(255,255,255,0.98);
+@topbar_buttons_color_hover: rgba(255,255,255,1);
+@topbar_buttons_font_size: 13px;
+@topbar_buttons_font_weight: 300;
 
 /* menus */
 @menu_box_shadow:0px 1px 6px rgba(0, 0, 0, 0.16), 0px 1px 6px rgba(0, 0, 0, 0.23);