Browse Source

HUE-6077 [frontend] Style the file browser breadcrumbs

Enrico Berti 8 năm trước cách đây
mục cha
commit
a0477b065a

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
apps/filebrowser/src/filebrowser/static/filebrowser/css/listdir_components.css


+ 2 - 1
apps/filebrowser/src/filebrowser/static/filebrowser/less/listdir_components.less

@@ -247,6 +247,7 @@
   font-size: 1.25em;
   margin-left: 25px;
   margin-top: 6px;
+  margin-bottom: 3px;
   padding-left: 14px;
   border-radius: 2px;
   border: 1px solid #EEE;
@@ -254,4 +255,4 @@
   -moz-box-shadow: none;
   box-shadow: none;
   font-weight: bold;
-}
+}

+ 1 - 1
apps/filebrowser/src/filebrowser/templates/display.mako

@@ -40,7 +40,7 @@ ${ fb_components.menubar() }
   <link href="${ static('filebrowser/css/display.css') }" rel="stylesheet" type="text/css">
   <div class="row-fluid">
     <div class="span2">
-      <div class="sidebar-nav" style="padding-top: 0">
+      <div class="sidebar-nav margin-top-10">
         <!-- ko if: $root.file -->
         <ul class="nav nav-list">
           <!-- ko if: $root.isViewing -->

+ 5 - 5
apps/filebrowser/src/filebrowser/templates/fb_components.mako

@@ -25,12 +25,12 @@ from aws import get_client
       <ul class="nav nav-pills hue-breadcrumbs-bar">
         %if path.lower().find('s3a://') == 0:
           <li style="padding-top: 10px">
-            <span class="homeLink" title="${ _('S3 region %s') % get_client()._region }">
+            <span class="breadcrumb-link homeLink" title="${ _('S3 region %s') % get_client()._region }">
               <i class="fa fa-fw fa-cubes"></i> ${ get_client()._region }
             </span>
           </li>
         %else:
-          <li><a class="pointer homeLink" data-bind="click: $root.openHome, attr:{'href': '${url('filebrowser.views.view', path=urlencode(path))}?default_to_home'}"><i class="fa fa-home"></i> ${_('Home')}</a></li>
+          <li><a class="pointer breadcrumb-link homeLink" data-bind="click: $root.openHome, attr:{'href': '${url('filebrowser.views.view', path=urlencode(path))}?default_to_home'}"><i class="fa fa-home"></i> ${_('Home')}</a></li>
         %endif
         <li>
             <ul id="editBreadcrumb" class="hue-breadcrumbs editable-breadcrumbs" data-bind="foreach: breadcrumbs" style="padding-right:40px; padding-top: 12px" title="${_('Edit path')}">
@@ -41,13 +41,13 @@ from aws import get_client
         </li>
         % if is_trash_enabled:
         <li class="pull-right">
-          <a class="pointer trashLink" data-bind="click: $root.openTrash, attr:{'href': '${url('filebrowser.views.view', path=urlencode(path))}?default_to_trash'}" title="${_('View trash')}">
+          <a class="pointer breadcrumb-link trashLink" data-bind="click: $root.openTrash, attr:{'href': '${url('filebrowser.views.view', path=urlencode(path))}?default_to_trash'}" title="${_('View trash')}">
             <i class="fa fa-trash-o"></i> ${_('Trash')}
           </a>
         </li>
         % endif
         <li class="pull-right">
-          <div class="dropdown history">
+          <div class="dropdown breadcrumb-link history">
             <a href="javascript:void(0)" class="historyLink dropdown-toggle" title="${_('View History')}" data-toggle="dropdown" id="historyDropdown">
               <i class="fa fa-caret-down"></i> ${_('History')}
             </a>
@@ -56,7 +56,7 @@ from aws import get_client
       </ul>
     % else:
       <ul class="nav nav-pills hue-breadcrumbs-bar">
-        <li><a href="${url('filebrowser.views.view', path=urlencode(path))}?default_to_home" class="homeLink"><i class="fa fa-home"></i> ${_('Home')}</a></li>
+        <li><a href="${url('filebrowser.views.view', path=urlencode(path))}?default_to_home" class="breadcrumb-link homeLink"><i class="fa fa-home"></i> ${_('Home')}</a></li>
         <li>
           <ul class="hue-breadcrumbs" style="padding-right:40px; padding-top: 12px">
           % for breadcrumb_item in breadcrumbs:

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue.css


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue3-extra.css


+ 0 - 46
desktop/core/src/desktop/static/desktop/css/hue3.css

@@ -79,56 +79,10 @@ ul.errorlist li {
   font-style: italic;
 }
 
-.homeLink,
-.trashLink,
-.historyLink {
-  font-size: 1.25em;
-  line-height: 18px;
-}
-
-.hue-breadcrumbs {
-  font-size: 1.25em;
-  list-style: none outside none;
-  padding: 9px 9px;
-}
-
-.hue-breadcrumbs li {
-  display: inline-block;
-  text-shadow: 0 1px 0 #FFFFFF;
-}
-
-.hue-breadcrumbs .divider {
-  color: #999999;
-  padding: 0 5px;
-}
-
-.hue-breadcrumbs .active a {
-  color: #333333;
-}
-
-.hue-breadcrumbs a.nounderline:hover {
-  text-decoration: none;
-}
-
-.hue-breadcrumbs > li:last-child > a {
-  font-weight: bold;
-  color: #333333;
-}
-
-.hue-breadcrumbs > li:last-child > span {
-  display: none;
-}
-
 .hueWell {
   padding-bottom: 0;
 }
 
-.hue-breadcrumbs-bar {
-  padding: 8px 15px;
-  margin: 0 0 20px;
-  list-style: none;
-}
-
 .modal-body iframe {
   border: 0;
   width: 100%;

+ 11 - 0
desktop/core/src/desktop/static/desktop/less/components/hue-breadcrumbs.less

@@ -17,6 +17,7 @@
 */
 
 .hue-breadcrumbs {
+  font-size: 18px;
   list-style: none outside none;
   padding: 9px 9px;
   li {
@@ -40,3 +41,13 @@
     display: none;
   }
 }
+
+.hue-breadcrumbs-bar {
+  padding: 8px 15px;
+  margin: 0 0 20px;
+  list-style: none;
+  .breadcrumb-link {
+    line-height: 21px;
+    font-size: 18px;
+  }
+}

+ 4 - 0
desktop/core/src/desktop/static/desktop/less/hue-cross-version.less

@@ -233,3 +233,7 @@ input[type='password']::-ms-reveal {
 .inline {
   display: inline;
 }
+
+.sidebar-nav .nav-list > li > a {
+  padding: 9px 18px;
+}

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác