Fix overlapping css tags

galaxyproject · May 15, 2017 · fe59e3a · fe59e3a
1 parent 2399df0
commit fe59e3a
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/client/galaxy/scripts/apps/panels/admin-panel.js b/client/galaxy/scripts/apps/panels/admin-panel.js
@@ -136,10 +136,10 @@ var AdminPanel = Backbone.View.extend({
         this.$el.empty();
         this.categories.each( function( category ) {
             var $section = $( self._templateSection( category.attributes ) );
-            var $entries = $section.find( '.ui-panel-section-body' );
+            var $entries = $section.find( '.ui-side-section-body' );
             _.each( category.get( 'items' ), function( item ) {
                 if ( item.enabled === undefined || item.enabled ) {
-                    $entries.append( $( '<div/>' ).addClass( 'ui-panel-section-body-title' )
+                    $entries.append( $( '<div/>' ).addClass( 'ui-side-section-body-title' )
                                                   .append( $( '<a/>' ).attr({
                                                                 href    : self.root + item.url,
                                                                 target  : 'galaxy_main' }).text( item.title ) ) );
@@ -153,14 +153,14 @@ var AdminPanel = Backbone.View.extend({
     _templateSection : function( options ) {
         return [
             '<div>',
-                '<div class="ui-panel-section-title">' + options.title + '</div>',
-                '<div class="ui-panel-section-body"/>',
+                '<div class="ui-side-section-title">' + options.title + '</div>',
+                '<div class="ui-side-section-body"/>',
             '</div>'
         ].join('');
     },
 
     _template : function() {
-        return '<div class="ui-panel"/>';
+        return '<div class="ui-side-panel"/>';
     },
 
     toString : function() { return 'adminPanel' }

diff --git a/client/galaxy/style/less/ui.less b/client/galaxy/style/less/ui.less
@@ -197,29 +197,48 @@
     padding-right: 3px !important;
 }
 
-// panel
-.ui-panel {
+// side panel
+.ui-side-panel {
     color: @base-text-color;
     background: @side-panel-bg;
     padding: 10px;
-    .ui-panel-section-title {
+    .ui-side-section-title {
         font-weight: bold;
     }
-    .ui-panel-section-body {
-        .ui-panel-section-body-title {
+    .ui-side-section-body {
+        .ui-side-section-body-title {
             padding-top: 5px;
             padding-bottom: 5px;
             margin-left: 16px;
             margin-right: 10px;
             display: list-item;
             list-style: square outside;
         }
-        .ui-panel-section-body-title:last-child {
+        .ui-side-section-body-title:last-child {
             padding-bottom: 15px;
         }
     }
 }
 
+// panel
+.ui-panel {
+    .ui-panel-table {
+        margin-left: 20px;
+        margin-right: 20px;
+        .ui-panel-icon {
+            margin: 10px;
+            margin-right: 20px;
+            font-size: 1.6em;
+        }
+        .ui-panel-anchor {
+            font-weight: bold;
+        }
+    }
+    .ui-panel-footer {
+        margin-top: 10px;
+    }
+}
+
 // tabs
 .ui-tabs {
     .tab-operations {

diff --git a/static/scripts/bundled/libs.bundled.js.map b/static/scripts/bundled/libs.bundled.js.map
diff --git a/static/style/blue/base.css b/static/style/blue/base.css