Merge pull request #34 from guerler/scratchicon

Fix scratchpad icon
galaxyproject · Apr 4, 2018 · 712fb6b · 712fb6b
2 parents 103025a + 2a7ea1c
commit 712fb6b
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 42 deletions.
diff --git a/client/galaxy/scripts/layout/menu.js b/client/galaxy/scripts/layout/menu.js
@@ -319,8 +319,8 @@ var Tab = Backbone.View.extend({
         this.model = options.model;
         this.setElement(this._template());
         this.$link = this.$(".nav-link");
+        this.$note = this.$(".nav-note");
         this.$menu = this.$(".dropdown-menu");
-        this.$note = this.$(".dropdown-note");
         this.listenTo(this.model, "change", this.render, this);
     },
 
@@ -343,15 +343,17 @@ var Tab = Backbone.View.extend({
         this.$note
             .html(this.model.get("note") || "")
             .removeClass()
-            .addClass("dropdown-note")
+            .addClass("nav-note")
             .addClass(this.model.get("note_cls"))
             .css({
                 display: (this.model.get("show_note") && "block") || "none"
             });
         this.$link
             .html(this.model.get("title") || "")
+            .removeClass()
+            .addClass("nav-link")
             .addClass(this.model.get("cls"))
-            .addClass(this.model.get("icon") && `dropdown-icon fa ${this.model.get("icon")}`)
+            .addClass(this.model.get("icon") && `nav-icon fa ${this.model.get("icon")}`)
             .addClass(this.model.get("menu") && "dropdown-toggle")
             .addClass(this.model.get("toggle") && "toggle")
             .attr("target", this.model.get("target"))
@@ -473,8 +475,8 @@ var Tab = Backbone.View.extend({
         return `
             <li class="nav-item">
                 <a class="nav-link"/>
+                <div class="nav-note"/>
                 <div class="dropdown-menu"/>
-                <div class="dropdown-note"/>
             </li>`;
     }
 });

diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss
@@ -423,11 +423,28 @@ div.unified-panel-body-background {
 #masthead {
     padding: 0;
     margin-bottom: 0px;
-    .nav-link {
-        cursor: pointer;
-        text-decoration: $navbar-default-link-text-decoration;
-        &:hover {
-            color: $navbar-default-link-hover-color;
+    .navbar-nav {
+        .nav-link {
+            cursor: pointer;
+            text-decoration: $navbar-default-link-text-decoration;
+            &:hover {
+                color: $navbar-default-link-hover-color;
+            }
+            &.nav-icon {
+                font-size: 1.7em;
+            }
+            &.toggle {
+                color: gold;
+            }
+        }
+        .nav-note {
+            font-weight: bold;
+            font-size: 10px;
+            position: relative;
+            left: 30px;
+            top: -15px;
+            color: gold;
+            height: 0px;
         }
     }
     .navbar-brand {
@@ -454,37 +471,6 @@ div.unified-panel-body-background {
             color: white;
         }
     }
-    //     .navbar-header {
-    //         position: relative;
-    //         right: -50%;
-    //         float: left;
-    //         .navbar-tabs {
-    //             display: block;
-    //             position: relative;
-    //             right: 50%;
-    //         }
-    //     }
-    //     .navbar-tabs {
-    //         .toggle {
-    //             color           : gold;
-    //         }
-    //         .dropdown-icon {
-    //             top             : 1px;
-    //             font-size       : 1.8em;
-    //         }
-    //         .dropdown-note {
-    //             font-weight     : bold;
-    //             font-size       : 10px;
-    //             position        : absolute;
-    //             left            : 35px;
-    //             top             : 20px;
-    //             color           : gold;
-    //         }
-    //     }
-    //     li.dropdown > a:hover .caret {
-    //         border-top-color: gold;
-    //         border-bottom-color: gold;
-    //     }
 }
 
 .quota-meter-container {

diff --git a/static/style/blue/base.css b/static/style/blue/base.css
@@ -12460,11 +12460,23 @@ div.unified-panel-body-background {
 #masthead {
   padding: 0;
   margin-bottom: 0px; }
-  #masthead .nav-link {
+  #masthead .navbar-nav .nav-link {
     cursor: pointer;
     text-decoration: none; }
-    #masthead .nav-link:hover {
+    #masthead .navbar-nav .nav-link:hover {
       color: gold; }
+    #masthead .navbar-nav .nav-link.nav-icon {
+      font-size: 1.7em; }
+    #masthead .navbar-nav .nav-link.toggle {
+      color: gold; }
+  #masthead .navbar-nav .nav-note {
+    font-weight: bold;
+    font-size: 10px;
+    position: relative;
+    left: 30px;
+    top: -15px;
+    color: gold;
+    height: 0px; }
   #masthead .navbar-brand {
     position: absolute;
     left: 0;