浏览代码

HUE-3358 [home] Use SVG icons with hive and impala logos for documents

Johan Ahlen 9 年之前
父节点
当前提交
814bace54e

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

@@ -2517,4 +2517,11 @@ body {
 
 .dropdown-menu.less-padding > li > a {
   padding-left: 6px
+}
+
+.hi {
+  display: inline-block;
+  width: 1em;
+  height: 1em;
+  fill: currentColor;
 }

+ 29 - 3
desktop/core/src/desktop/templates/file_browser.mako

@@ -21,7 +21,11 @@ from django.utils.translation import ugettext as _
 from desktop.views import _ko
 %>
 
+<%namespace name="hueIcons" file="/hue_icons.mako" />
+
 <%def name="fileBrowser()">
+  ${ hueIcons.symbols() }
+
   <style>
     .fb-container {
       position: absolute;
@@ -140,12 +144,17 @@ from desktop.views import _ko
     }
 
     .fb-list i {
-      color: #666;
+      color: #338BB8;
       font-size: 20px;
-      margin-right: 8px;
       font-weight: lighter;
     }
 
+    .fb-list .hi {
+      color: #338BB8;
+      font-size: 20px;
+      width: 1.28571429em
+    }
+
     .fb-action {
       font-size: 25px;
       margin-left: 5px;
@@ -172,6 +181,12 @@ from desktop.views import _ko
       vertical-align: middle;
     }
 
+    .fb-primary-col .hi {
+      vertical-align: middle;
+      display: inline-block;
+      margin-bottom: 0.2em;
+    }
+
     .fb-attr-group {
       flex: 1;
       white-space: nowrap;
@@ -541,7 +556,18 @@ from desktop.views import _ko
                 <!-- /ko -->
               </ul>
               <div class="fb-primary-col">
-                <i class="fa fa-fw" data-bind="css: { 'fa-folder-o' : isDirectory, 'fa-file-o': ! isDirectory() }"></i>
+                <!-- ko if: isDirectory() -->
+                <i class="fa fa-fw fa-folder-o"></i>
+                <!-- /ko -->
+                <!-- ko if: ! isDirectory() && definition().type === 'query-hive' -->
+                <svg class="hi"><use xlink:href="#hi-file-hive"></use></svg>
+                <!-- /ko -->
+                <!-- ko if: ! isDirectory() && definition().type === 'query-impala' -->
+                <svg class="hi"><use xlink:href="#hi-file-impala"></use></svg>
+                <!-- /ko -->
+                <!-- ko if: ! isDirectory() && definition().type !== 'query-impala' && definition().type !== 'query-hive' -->
+                <i class="fa fa-fw fa-file-o"></i>
+                <!-- /ko -->
                 <a href="javascript: void(0);" data-bind="text: definition().name, click: open, attr: { 'title': definition().name }"></a>
               </div>
               <div class="fb-attr-group">

文件差异内容过多而无法显示
+ 19 - 0
desktop/core/src/desktop/templates/hue_icons.mako


部分文件因为文件数量过多而无法显示