瀏覽代碼

HUE-6077 [frontend] Style the compose menu

Johan Ahlen 8 年之前
父節點
當前提交
2d0d5af

文件差異過大導致無法顯示
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue.css


文件差異過大導致無法顯示
+ 0 - 0
desktop/core/src/desktop/static/desktop/css/hue3-extra.css


+ 3 - 2
desktop/core/src/desktop/static/desktop/less/hue-cui-overrides.less

@@ -24,10 +24,11 @@
 .navbar .navbar-inner {
   padding-right: 24px;
 
-  li {
+  ul.nav li {
     margin-right: 10px;
   }
-  li a:hover {
+
+  ul.nav li a:hover {
     background-color: transparent;
   }
 }

+ 0 - 21
desktop/core/src/desktop/static/desktop/less/hue.less

@@ -190,27 +190,6 @@ body {
   margin: -1px 2px 0 -7px;
 }
 
-.compose-action .dropdown-menu li {
-  height: 32px;
-}
-
-.compose-action .dropdown-menu li a {
-  line-height: 32px;
-}
-
-.compose-action .dropdown-submenu>a:after {
-  margin-top: 11px;
-}
-
-.compose-action .dropdown-menu li.divider {
-  height: 1px;
-  margin: 5px 0;
-}
-
-.compose-action.open .dropdown-toggle:not(:hover) {
-  background-color: transparent !important;
-}
-
 .dropdown-no-icon {
   margin-left: 17px;
 }

+ 12 - 12
desktop/core/src/desktop/templates/hue.mako

@@ -138,7 +138,7 @@ ${ hueIcons.symbols() }
                       % endfor
                       % if user.is_superuser:
                         <li class="divider"></li>
-                        <li><a href="gethue.com" class="dropdown-no-icon">${ _('Add more...') }</a></li>
+                        <li><a href="gethue.com"><span class="dropdown-no-icon">${ _('Add more...') }</span></a></li>
                       % endif
                     </ul>
                   </li>
@@ -156,7 +156,7 @@ ${ hueIcons.symbols() }
                 <ul class="dropdown-menu">
                   <li><a href="javascript: void(0)" data-bind="click: function(){ page('/oozie/editor/workflow/new/') }"><img src="${ static('oozie/art/icon_oozie_workflow_48.png') }" class="app-icon" alt="${ _('Oozie workflow icon') }"/> ${_('Workflow')}</a></li>
                   <li><a href="javascript: void(0)" data-bind="click: function(){ page('/oozie/editor/coordinator/new/') }"><img src="${ static('oozie/art/icon_oozie_coordinator_48.png') }" class="app-icon" alt="${ _('Oozie coordinator icon') }" /> ${_('Schedule')}</a></li>
-                  <li><a href="javascript: void(0)" data-bind="click: function(){ page('/oozie/editor/bundle/new/') }"/><img src="${ static('oozie/art/icon_oozie_bundle_48.png') }" class="app-icon" alt="${ _('Oozie bundle icon') }" /> ${_('Bundle')}</a></li>
+                  <li><a href="javascript: void(0)" data-bind="click: function(){ page('/oozie/editor/bundle/new/') }"><img src="${ static('oozie/art/icon_oozie_bundle_48.png') }" class="app-icon" alt="${ _('Oozie bundle icon') }" /> ${_('Bundle')}</a></li>
                 </ul>
               </li>
               % endif
@@ -563,7 +563,7 @@ ${ assist.assistPanel() }
               callback(ko.dataFor($koElement[0]));
             }
           }, 25);
-        }
+        };
 
         self.changeEditorType = function (type, changeURL) {
           self.getActiveAppViewModel(function (viewModel) {
@@ -575,20 +575,20 @@ ${ assist.assistPanel() }
               });
             }
           })
-        }
+        };
 
         self.currentApp.subscribe(function (newApp) {
           huePubSub.publish('set.current.app.name', newApp);
           self.getActiveAppViewModel(function (viewModel) {
             huePubSub.publish('set.current.app.view.model', viewModel);
           })
-        })
+        });
 
         huePubSub.subscribe('get.current.app.view.model', function () {
           self.getActiveAppViewModel(function (viewModel) {
             huePubSub.publish('set.current.app.view.model', viewModel);
           })
-        })
+        });
 
         huePubSub.subscribe('get.current.app.name', function () {
           huePubSub.publish('set.current.app.name', self.currentApp());
@@ -670,7 +670,7 @@ ${ assist.assistPanel() }
           });
           r.unwrap('<span>');
           return r;
-        }
+        };
 
         self.currentApp.subscribe(function (newVal) {
           self.isLoadingEmbeddable(true);
@@ -723,14 +723,14 @@ ${ assist.assistPanel() }
           self.getActiveAppViewModel(function (vm) {
             vm.createWizard.source.path(DropzoneGlobals.homeDir + '/' + filename);
           });
-        }
+        };
 
         self.dropzoneComplete = function (path) {
           self.currentApp('importer');
           self.getActiveAppViewModel(function (vm) {
             vm.createWizard.source.path(path);
           });
-        }
+        };
 
         huePubSub.subscribe('switch.app', function (name) {
           self.currentApp(name);
@@ -802,7 +802,7 @@ ${ assist.assistPanel() }
         });
 
         page('/notebook/editor', function (ctx) {
-          self.currentApp('editor')
+          self.currentApp('editor');
           if (window.location.getParameter('editor') !== '') {
             self.getActiveAppViewModel(function (viewModel) {
               viewModel.openNotebook(window.location.getParameter('editor'));
@@ -946,11 +946,11 @@ ${ assist.assistPanel() }
 
         self.activeAppViewModel.subscribe(function (viewModel) {
           self.sessionsAvailable(typeof viewModel.selectedNotebook !== 'undefined');
-        })
+        });
 
         huePubSub.subscribe('context.panel.visible', function (visible) {
           self.contextPanelVisible(visible);
-        })
+        });
 
         huePubSub.subscribe('active.snippet.type.changed', function (type) {
           if (type === 'hive' || type === 'impala') {

部分文件因文件數量過多而無法顯示