瀏覽代碼

HUE-6077 [frontend] Improved styling of top bar in the new pages

Johan Ahlen 8 年之前
父節點
當前提交
b4bfc3f
共有 28 個文件被更改,包括 46 次插入32 次删除
  1. 2 2
      apps/beeswax/src/beeswax/templates/execute.mako
  2. 2 2
      apps/beeswax/src/beeswax/templates/layout.mako
  3. 1 1
      apps/filebrowser/src/filebrowser/templates/fb_components.mako
  4. 1 1
      apps/hbase/src/hbase/templates/app.mako
  5. 1 1
      apps/jobbrowser/src/jobbrowser/templates/job_browser.mako
  6. 1 1
      apps/jobbrowser/src/jobbrowser/templates/jobbrowser_components.mako
  7. 1 1
      apps/jobsub/src/jobsub/templates/designs.mako
  8. 1 1
      apps/metastore/src/metastore/templates/components.mako
  9. 1 1
      apps/oozie/src/oozie/templates/navigation-bar.mako
  10. 2 2
      apps/pig/src/pig/templates/app.mako
  11. 1 1
      apps/rdbms/src/rdbms/templates/common.mako
  12. 1 1
      apps/security/src/security/templates/layout.mako
  13. 1 1
      apps/useradmin/src/useradmin/templates/layout.mako
  14. 1 1
      apps/zookeeper/src/zookeeper/templates/shared_components.mako
  15. 1 1
      desktop/core/src/desktop/app_template/src/app_name/templates/shared_components.mako
  16. 0 0
      desktop/core/src/desktop/static/desktop/css/hue.css
  17. 0 0
      desktop/core/src/desktop/static/desktop/css/hue3-extra.css
  18. 16 2
      desktop/core/src/desktop/static/desktop/less/hue.less
  19. 3 3
      desktop/core/src/desktop/static/desktop/less/hue3-extra.less
  20. 1 1
      desktop/core/src/desktop/templates/about_layout.mako
  21. 1 1
      desktop/core/src/desktop/templates/common_header.mako
  22. 1 1
      desktop/core/src/desktop/templates/common_header_m.mako
  23. 1 1
      desktop/core/src/desktop/templates/common_home.mako
  24. 1 1
      desktop/core/src/desktop/templates/home.mako
  25. 1 1
      desktop/libs/indexer/src/indexer/templates/importer.mako
  26. 1 1
      desktop/libs/indexer/src/indexer/templates/indexer.mako
  27. 1 1
      desktop/libs/notebook/src/notebook/templates/editor_components.mako
  28. 1 1
      desktop/libs/notebook/src/notebook/templates/notebooks.mako

+ 2 - 2
apps/beeswax/src/beeswax/templates/execute.mako

@@ -2641,7 +2641,7 @@ $(document).ready(function () {
     $('#queryContainer').show();
     $('#resizePanel').show();
     $('a[href="#query"]').parent().show();
-    $('.hue3-navbar-fixed-top').show();
+    $('.hue-title-bar').show();
     $('.resultsContainer').css('marginTop', '20px');
   }
 
@@ -2654,7 +2654,7 @@ $(document).ready(function () {
     $('a[href="#query"]').parent().hide();
     $('a[href="#recentTab"]').parent().hide();
     $('a[href="#queryBuilderTab"]').parent().hide();
-    $('.hue3-navbar-fixed-top').hide();
+    $('.hue-title-bar').hide();
     $('.resultsContainer').css('marginTop', '-50px');
   }
 

+ 2 - 2
apps/beeswax/src/beeswax/templates/layout.mako

@@ -25,7 +25,7 @@ def is_selected(section, matcher):
 %>
 
 <%def name="menubar(section='')">
-  <div class="navbar hue3-navbar-fixed-top">
+  <div class="navbar hue-title-bar">
       <div class="navbar-inner">
         <div class="container-fluid">
           <div class="nav-collapse">
@@ -56,7 +56,7 @@ def is_selected(section, matcher):
 </%def>
 
 <%def name="metastore_menubar()">
-  <div class="navbar hue3-navbar-fixed-top">
+  <div class="navbar hue-title-bar">
       <div class="navbar-inner">
         <div class="container-fluid">
           <div class="nav-collapse">

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

@@ -91,7 +91,7 @@ from aws import get_client
 
 
 <%def name="menubar()">
-  <div class="navbar hue3-navbar-fixed-top nokids">
+  <div class="navbar hue-title-bar nokids">
       <div class="navbar-inner">
         <div class="container-fluid">
           <div class="nav-collapse">

+ 1 - 1
apps/hbase/src/hbase/templates/app.mako

@@ -25,7 +25,7 @@ ${ commonheader(None, "hbase", user, request) | n,unicode }
 <div id="hbaseComponents">
 <link href="${ static('hbase/css/hbase.css') }" rel="stylesheet" type="text/css" />
 
-<div class="navbar hue3-navbar-fixed-top nokids">
+<div class="navbar hue-title-bar nokids">
     <div class="navbar-inner">
     <div class="container-fluid">
       <div class="nav-collapse">

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -70,7 +70,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
 
 
 % if not is_mini:
-<div class="navbar hue3-navbar-fixed-top">
+<div class="navbar hue-title-bar">
     <div class="navbar-inner">
       <div class="container-fluid">
         <div class="nav-collapse">

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/jobbrowser_components.mako

@@ -230,7 +230,7 @@
 </%def>
 
 <%def name="menubar(hiveserver2_impersonation_enabled=True)">
-  <div class="navbar hue3-navbar-fixed-top nokids">
+  <div class="navbar hue-title-bar nokids">
       <div class="navbar-inner">
         <div class="container-fluid">
           <div class="nav-collapse">

+ 1 - 1
apps/jobsub/src/jobsub/templates/designs.mako

@@ -37,7 +37,7 @@ ${ commonheader(None, "jobsub", user, request) | n,unicode }
 <script src="${ static('jobsub/js/jobsub.js') }" type="text/javascript" charset="utf-8"></script>
 
 
-<div class="navbar hue3-navbar-fixed-top nokids">
+<div class="navbar hue-title-bar nokids">
     <div class="navbar-inner">
       <div class="container-fluid">
         <div class="nav-collapse">

+ 1 - 1
apps/metastore/src/metastore/templates/components.mako

@@ -19,7 +19,7 @@
 %>
 
 <%def name="menubar()">
-  <div class="navbar hue3-navbar-fixed-top nokids">
+  <div class="navbar hue-title-bar nokids">
       <div class="navbar-inner">
         <div class="container-fluid">
           <div class="nav-collapse">

+ 1 - 1
apps/oozie/src/oozie/templates/navigation-bar.mako

@@ -23,7 +23,7 @@
 
 
 <%def name="menubar(section='', dashboard=False, is_editor=False, pullright=None)">
-    <div class="navbar hue3-navbar-fixed-top">
+    <div class="navbar hue-title-bar">
       <div class="navbar-inner">
         <div class="container-fluid">
           %if pullright:

+ 2 - 2
apps/pig/src/pig/templates/app.mako

@@ -23,7 +23,7 @@
 ${ commonheader(None, "pig", user, request) | n,unicode }
 
 <div id="pig-editor-app">
-  <div class="navbar hue3-navbar-fixed-top">
+  <div class="navbar hue-title-bar">
       <div class="navbar-inner">
         <div class="container-fluid">
           <div class="nav-collapse">
@@ -1300,7 +1300,7 @@ ${ commonshare() | n,unicode }
     }
 
     function highlightMainMenu(mainSection) {
-      $(".hue3-navbar-fixed-top .nav li").removeClass("active");
+      $(".hue-title-bar .nav li").removeClass("active");
       $("a[href='#" + mainSection + "']").parent().addClass("active");
     }
 

+ 1 - 1
apps/rdbms/src/rdbms/templates/common.mako

@@ -16,7 +16,7 @@
 <%! from django.utils.translation import ugettext as _ %>
 
 <%def name="navbar()">
-  <div class="navbar hue3-navbar-fixed-top">
+  <div class="navbar hue-title-bar">
     <div class="navbar-inner">
       <div class="container-fluid">
         <div class="nav-collapse">

+ 1 - 1
apps/security/src/security/templates/layout.mako

@@ -54,7 +54,7 @@ def is_selected(section, matcher):
   <script src="${ static('desktop/js/apiHelper.js') }"></script>
 
 
-  <div class="navbar hue3-navbar-fixed-top">
+  <div class="navbar hue-title-bar">
       <div class="navbar-inner">
         <div class="container-fluid">
           <div class="nav-collapse">

+ 1 - 1
apps/useradmin/src/useradmin/templates/layout.mako

@@ -49,7 +49,7 @@ def is_selected(section, matcher):
 
 
 <%def name="menubar(section='')">
-  <div class="navbar hue3-navbar-fixed-top">
+  <div class="navbar hue-title-bar">
       <div class="navbar-inner">
         <div class="container-fluid">
           <div class="nav-collapse">

+ 1 - 1
apps/zookeeper/src/zookeeper/templates/shared_components.mako

@@ -70,7 +70,7 @@
 </%def>
 
 <%def name="menubar()">
-  <div class="navbar hue3-navbar-fixed-top nokids">
+  <div class="navbar hue-title-bar nokids">
       <div class="navbar-inner">
         <div class="container-fluid">
           <div class="nav-collapse">

+ 1 - 1
desktop/core/src/desktop/app_template/src/app_name/templates/shared_components.mako

@@ -26,7 +26,7 @@ def is_selected(section, matcher):
 ${'%>'}
 
 ${'<%'}def name="menubar(section='')">
-  <div class="navbar hue3-navbar-fixed-top nokids">
+  <div class="navbar hue-title-bar nokids">
     <div class="navbar-inner">
       <div class="container-fluid">
         <div class="nav-collapse">

File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue.css


File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue3-extra.css


+ 16 - 2
desktop/core/src/desktop/static/desktop/less/hue.less

@@ -273,7 +273,7 @@ body {
 .resizer {
   .flex(0);
   height: 100%;
-  min-width: 4px;
+  min-width: 2px;
   cursor: col-resize;
 }
 
@@ -295,6 +295,20 @@ body {
   overflow-x: hidden;
 }
 
+.hue-title-bar {
+  border-bottom: 1px solid #DCDCDC;
+  background-color:#F8F8F8;
+  -webkit-box-shadow:inset 0 -1px #DCDCDC;
+  box-shadow:inset 0 -1px #DCDCDC;
+
+  .navbar-inner {
+    background-color: transparent !important;
+    margin: 0 !important;
+    padding-top: 8px;
+    background: none;
+  }
+}
+
 .left-nav {
   position:absolute;
   background-color: @hue-primary-color-dark;
@@ -816,7 +830,7 @@ a:visited {
   background-color: transparent;
   border: none;
   border-bottom: 1px solid @cui-gray-050;
-  padding-bottom: 8px;
+  padding-bottom: 6px;
 }
 
 .page-content .navbar.navbar-inverse.navbar-fixed-top {

+ 3 - 3
desktop/core/src/desktop/static/desktop/less/hue3-extra.less

@@ -119,7 +119,7 @@
   -moz-border-radius: 0;
 }
 
-.hue3-navbar-fixed-top {
+.hue-title-bar {
   position: fixed;
   right: 0;
   left: 0;
@@ -128,11 +128,11 @@
   top: 28px;
 }
 
-.hue3-navbar-fixed-top.nokids .navbar-inner {
+.hue-title-bar.nokids .navbar-inner {
   height: 45px;
 }
 
-.hue3-navbar-fixed-top .navbar-inner {
+.hue-title-bar .navbar-inner {
   padding-right: 24px;
   -webkit-border-radius: 0;
   -moz-border-radius: 0;

+ 1 - 1
desktop/core/src/desktop/templates/about_layout.mako

@@ -25,7 +25,7 @@ def is_selected(section, matcher):
 %>
 
 <%def name="menubar(section='')">
-  <div class="navbar hue3-navbar-fixed-top">
+  <div class="navbar hue-title-bar">
       <div class="navbar-inner">
         <div class="container-fluid">
           <div class="nav-collapse">

+ 1 - 1
desktop/core/src/desktop/templates/common_header.mako

@@ -84,7 +84,7 @@ if USE_NEW_EDITOR.get():
       .navigator {
         top: 30px!important;
       }
-      .hue3-navbar-fixed-top {
+      .hue-title-bar {
         top: 58px!important;
       }
       % if current_app == "sqoop":

+ 1 - 1
desktop/core/src/desktop/templates/common_header_m.mako

@@ -298,7 +298,7 @@ if USE_NEW_EDITOR.get():
        count += 1
     return found_app, count
 %>
-<div class="navbar hue3-navbar-fixed-top">
+<div class="navbar hue-title-bar">
   <div class="navbar-inner">
     <div class="container">
       <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">

+ 1 - 1
desktop/core/src/desktop/templates/common_home.mako

@@ -36,7 +36,7 @@
 
 
 <%def name="navbar()">
-<div class="navbar hue3-navbar-fixed-top nokids">
+<div class="navbar hue-title-bar nokids">
   <div class="navbar-inner">
     <div class="container-fluid">
       <div class="nav-collapse">

+ 1 - 1
desktop/core/src/desktop/templates/home.mako

@@ -83,7 +83,7 @@ ${ commonheader(_('Welcome Home'), "home", user, request) | n,unicode }
 
 </style>
 
-<div class="navbar hue3-navbar-fixed-top nokids">
+<div class="navbar hue-title-bar nokids">
   <div class="navbar-inner">
     <div class="container-fluid">
       <div class="nav-collapse">

+ 1 - 1
desktop/libs/indexer/src/indexer/templates/importer.mako

@@ -261,7 +261,7 @@ ${ assist.assistPanel() }
 
 <span id="importerComponents" class="notebook" data-bind="dropzone: { url: '/filebrowser/upload/file?dest=' + DropzoneGlobals.homeDir, params: {dest: DropzoneGlobals.homeDir}, paramName: 'hdfs_file', onComplete: function(path){ createWizard.source.path(path); } }">
 <div class="dz-message" data-dz-message></div>
-<div class="navbar hue3-navbar-fixed-top">
+<div class="navbar hue-title-bar">
   <div class="navbar-inner">
     <div class="container-fluid">
       <div class="nav-collapse">

+ 1 - 1
desktop/libs/indexer/src/indexer/templates/indexer.mako

@@ -114,7 +114,7 @@ ${ assist.assistPanel() }
 </style>
 
 <span id="indexerComponents" class="notebook">
-<div class="navbar hue3-navbar-fixed-top">
+<div class="navbar hue-title-bar">
   <div class="navbar-inner">
     <div class="container-fluid">
       <div class="nav-collapse">

+ 1 - 1
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -210,7 +210,7 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, ENABLE_
   <img class="pull-right" src="${ static('desktop/art/icon_hue_48.png') }"  alt="${ _('Hue logo') }"/>
 </div>
 
-<div class="navbar hue3-navbar-fixed-top" data-bind="visible: ! $root.isPlayerMode()">
+<div class="navbar hue-title-bar" data-bind="visible: ! $root.isPlayerMode()">
   <div class="navbar-inner">
     <div class="container-fluid">
       <div class="pull-right">

+ 1 - 1
desktop/libs/notebook/src/notebook/templates/notebooks.mako

@@ -23,7 +23,7 @@
 ${ commonheader(_("Notebooks"), "spark", user, request, "60px") | n,unicode }
 
 
-<div class="navbar hue3-navbar-fixed-top" data-bind="visible: ! $root.isPlayerMode()">
+<div class="navbar hue-title-bar" data-bind="visible: ! $root.isPlayerMode()">
   <div class="navbar-inner">
     <div class="container-fluid">
       <div class="nav-collapse">

Some files were not shown because too many files changed in this diff