Browse Source

HUE-5304 [indexer] Added LESS to the new indexer

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

+ 1 - 0
Gruntfile.js

@@ -61,6 +61,7 @@ module.exports = function(grunt) {
           'apps/hbase/src/hbase/static/hbase/css/hbase.css': 'apps/hbase/src/hbase/static/hbase/less/hbase.less',
           'apps/security/src/security/static/security/css/security.css': 'apps/security/src/security/static/security/less/security.less',
           'apps/sqoop/src/sqoop/static/sqoop/css/sqoop.css': 'apps/sqoop/src/sqoop/static/sqoop/less/sqoop.less',
+          'desktop/libs/indexer/src/indexer/static/indexer/css/indexes.css': 'desktop/libs/indexer/src/indexer/static/indexer/less/indexes.less',
         }
       }
     },

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


+ 1 - 1
apps/metastore/src/metastore/static/metastore/less/metastore.less

@@ -20,7 +20,7 @@
 
 .divider {
   padding-left: 12px;
-  color: #CCC;
+  color: @cui-gray-400;
 }
 
 .sidebar-nav {

+ 17 - 0
desktop/libs/indexer/src/indexer/static/indexer/css/indexes.css

@@ -0,0 +1,17 @@
+/*!
+Licensed to Cloudera, Inc. under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  Cloudera, Inc. licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ */.indexer-main{padding-top:10px}.divider{padding-left:12px;color:#C8C8C8}

+ 28 - 0
desktop/libs/indexer/src/indexer/static/indexer/less/indexes.less

@@ -0,0 +1,28 @@
+/*
+ Licensed to Cloudera, Inc. under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  Cloudera, Inc. licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+@import (reference) "hue-mixins.less";
+
+.indexer-main {
+  padding-top: 10px;
+}
+
+.divider {
+  padding-left: 12px;
+  color: @cui-gray-400;
+}

+ 35 - 16
desktop/libs/indexer/src/indexer/templates/indexes.mako

@@ -27,27 +27,46 @@
 ${ commonheader(_("Index Browser"), "search", user, request, "60px") | n,unicode }
 %endif
 
+<link rel="stylesheet" href="${ static('indexer/css/indexes.css') }" type="text/css">
+
 <script type="text/html" id="indexes-breadcrumbs">
-  <ul class="nav nav-pills hue-breadcrumbs-bar" id="breadcrumbs">
-    <li>
-      <a href="javascript:void(0);" data-bind="click: function() { section('list-indexes'); }">${ _('Indexes') }
-        <!-- ko if: index -->
-        <span class="divider">&gt;</span>
-        <!-- /ko -->
-      </a>
-    </li>
-    <!-- ko with: index -->
-    <li>
-      <span data-bind="text: name"></span>
-    </li>
-    <!-- /ko -->
-  </ul>
+  <h1>
+    <ul class="nav nav-pills hue-breadcrumbs-bar" id="breadcrumbs">
+      <li>
+        <a href="javascript:void(0);" data-bind="click: function() { section('list-indexes'); }">${ _('Indexes') }
+          <!-- ko if: index -->
+          <span class="divider">&gt;</span>
+          <!-- /ko -->
+        </a>
+      </li>
+      <!-- ko with: index -->
+      <li>
+        <a href="#index-overview" data-bind="text: name"></a>
+      </li>
+      <!-- /ko -->
+    </ul>
+  </h1>
 </script>
 
+<div class="navbar hue-title-bar nokids">
+    <div class="navbar-inner">
+      <div class="container-fluid">
+        <div class="nav-collapse">
+          <ul class="nav">
+            <li class="app-header">
+              <a href="/${app_name}">
+                ${ _('Index Browser') }
+              </a>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+</div>
+
 <div id="indexesComponents" class="container-fluid">
-  <div class="card card-small">
-    <h1 class="card-heading simple">${ _('Index Browser') }</h1>
 
+  <div class="indexer-main">
     <!-- ko template: { name: 'indexes-breadcrumbs' }--><!-- /ko -->
 
     <%actionbar:render>

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