From ea6d26923fd03b8d4aeea2beafe56519210faefc Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 10 Jan 2019 04:07:46 -0500 Subject: [PATCH 01/27] Remove fixed color from ui styles --- client/galaxy/style/scss/ui.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/galaxy/style/scss/ui.scss b/client/galaxy/style/scss/ui.scss index 1c9e0d8ed3b..f245bb72a68 100644 --- a/client/galaxy/style/scss/ui.scss +++ b/client/galaxy/style/scss/ui.scss @@ -105,7 +105,7 @@ $ui-margin-horizontal-large: $margin-v * 2; height: 86px; font-size: 4em; padding: 20px 26px; - color: lighten(#25537b, 10%); + color: lighten($brand-primary, 10%); } .ui-thumbnails-text { word-wrap: break-word; From 2a3bd642f58c32ae6a763f6b4fa1fc1c2985e9db Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 10 Jan 2019 04:12:55 -0500 Subject: [PATCH 02/27] Use panel background for upload button initial background --- client/galaxy/style/scss/upload.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/galaxy/style/scss/upload.scss b/client/galaxy/style/scss/upload.scss index f395d2723ee..e68d7851dca 100644 --- a/client/galaxy/style/scss/upload.scss +++ b/client/galaxy/style/scss/upload.scss @@ -9,7 +9,7 @@ height: 21px; margin: 0px; font-size: 0.75rem; - background-color: #f5f5f5; + background-color: $panel-bg-color; } .progress-bar-danger { background: $state-danger-bg; From 8cabc95a4a48b1bdfbd5618d96497c6d45ee4092 Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 10 Jan 2019 04:19:38 -0500 Subject: [PATCH 03/27] Use default text color for upload paste field --- client/galaxy/style/scss/upload.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/galaxy/style/scss/upload.scss b/client/galaxy/style/scss/upload.scss index e68d7851dca..180ff64ea8f 100644 --- a/client/galaxy/style/scss/upload.scss +++ b/client/galaxy/style/scss/upload.scss @@ -134,7 +134,7 @@ height: 80px; resize: none; background: inherit; - color: $black; + color: $text-color; white-space: pre; overflow: auto; } From 55b22bee08fefaec45c7046e96679f830d3a0f03 Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 10 Jan 2019 04:24:59 -0500 Subject: [PATCH 04/27] Use theme colors for scratchbook --- client/galaxy/style/scss/frame.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/galaxy/style/scss/frame.scss b/client/galaxy/style/scss/frame.scss index 5650dbfefa1..64a772e445a 100644 --- a/client/galaxy/style/scss/frame.scss +++ b/client/galaxy/style/scss/frame.scss @@ -8,7 +8,7 @@ $frame-default-border: $gray-300; } .toggle { - color: gold; + color: $dropdown-link-active-color; } .frame-background { @@ -41,7 +41,7 @@ $frame-default-border: $gray-300; z-index: $frame-zindex + 5; position: absolute; cursor: pointer; - color: gold; + color: $dropdown-link-active-color; right: 10px; } From 535c2ae5fbdaec72957075f4a6d6a5890d7526de Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 10 Jan 2019 04:39:10 -0500 Subject: [PATCH 05/27] Use panel button color in charts --- client/galaxy/style/scss/charts.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/galaxy/style/scss/charts.scss b/client/galaxy/style/scss/charts.scss index aba457b09ca..93b42b8c966 100644 --- a/client/galaxy/style/scss/charts.scss +++ b/client/galaxy/style/scss/charts.scss @@ -8,7 +8,7 @@ top: 4px; .btn { background: white; - color: #666; + color: $panel-header-text-color; border: none; .icon { font-size: 1.5em; From d5539a4472f5b82afb4f1ce2478a32bef9327c7b Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 10 Jan 2019 04:57:38 -0500 Subject: [PATCH 06/27] Replace a subset of fixed color in base styles --- client/galaxy/style/scss/base.scss | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index e49eaac9507..2ecc861ba6f 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -128,7 +128,7 @@ body { width: 100%; height: $panel-message-height !important; overflow: hidden; - border-bottom: solid #999 1px; + border-bottom: solid $gray-600 1px; font-size: 90%; display: none; } @@ -140,7 +140,7 @@ body { width: 100%; height: $panel-message-height !important; overflow: hidden; - border-bottom: solid #999 1px; + border-bottom: solid $gray-600 1px; font-size: 90%; display: none; } @@ -428,13 +428,13 @@ div.unified-panel-body-background { cursor: pointer; text-decoration: none; &:hover { - color: gold; + color: $dropdown-link-active-color; } &.nav-icon { font-size: 1.7em; } &.toggle { - color: gold; + color: $dropdown-link-active-color; } } .nav-note { @@ -443,7 +443,7 @@ div.unified-panel-body-background { position: relative; right: 5px; top: 10px; - color: gold; + color: $dropdown-link-active-color; width: 0px; } } @@ -456,7 +456,7 @@ div.unified-panel-body-background { font-weight: bold; font-size: 20px; // line-height: 1; - color: white; + color: $white; // Override margin and padding due to shorter navbar height padding: 5px 20px 12px; margin-left: -15px; @@ -469,7 +469,7 @@ div.unified-panel-body-background { border: none; } .navbar-brand-title { - color: white; + color: $white; } } } @@ -555,11 +555,11 @@ div.metadataFormBody div.metadataFormTitle { div.metadataFormDisabled div.metadataFormTitle { background: #eee; - border-color: #999; + border-color: $gray-600; } div.metadataFormDisabled { - border-color: #999; + border-color: $gray-600; } div.metadataHelpBody { @@ -1582,7 +1582,7 @@ div.permissionContainer { .editable-text:hover { cursor: text; - border: dotted #999999 1px; + border: dotted $gray-600 1px; } .icon-button.multiinput { From 63fe99662870834baa00bedc6c7bc8f462fe343f Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 10 Jan 2019 17:32:58 -0500 Subject: [PATCH 07/27] Replace footer text color --- client/galaxy/style/scss/base.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index 2ecc861ba6f..48d7d4fa431 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -277,9 +277,9 @@ body { z-index: 1000; // Above #dd-helper border-top: $layout-border; background: $navbar-default-bg; - color: #555; + color: $panel-header-text-color; a { - color: #555; + color: $panel-header-text-color; } .drag { position: absolute; From 76a0bea2627774e93985df5a50cfd95575372f9b Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 10 Jan 2019 23:12:00 -0500 Subject: [PATCH 08/27] Remove custom tool title style variation --- client/galaxy/style/scss/base.scss | 18 ------------------ templates/webapps/galaxy/workflow/editor.mako | 4 ++-- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index 48d7d4fa431..1e66b8fe2cc 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -595,24 +595,6 @@ div.toolHelpBody { width: 100%; } -// In workflow -div.toolTitleDisabled { - padding-top: 5px; - padding-bottom: 5px; - margin-left: 16px; - margin-right: 10px; - display: list-item; - list-style: square outside; - font-style: italic; - color: gray; -} - -div.toolTitleNoSectionDisabled { - padding-bottom: 0px; - font-style: italic; - color: gray; -} - div.toolFormRow { position: relative; } diff --git a/templates/webapps/galaxy/workflow/editor.mako b/templates/webapps/galaxy/workflow/editor.mako index f922cb58b76..223c952406e 100644 --- a/templates/webapps/galaxy/workflow/editor.mako +++ b/templates/webapps/galaxy/workflow/editor.mako @@ -84,9 +84,9 @@ %else: %if section: -
+
%else: -
+
%endif %if "[[" in tool.description and "]]" in tool.description: ${tool.description.replace( '[[', '' % tool.id ).replace( "]]", "" )} From 58926ae2fe81fdc60237c1800e5662b696b472da Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 10 Jan 2019 23:47:57 -0500 Subject: [PATCH 09/27] Remove unused styles, reuse existing colors in base styles --- client/galaxy/style/scss/base.scss | 96 ++---------------------------- 1 file changed, 4 insertions(+), 92 deletions(-) diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index 1e66b8fe2cc..e7e261c72be 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -629,12 +629,13 @@ div.toolFormRow { } .toolForm.toolFormInCanvas.tool-node-error { - border-color: #aa6666; + border-color: $state-danger-border; .toolFormTitle { - background: #ffcccc; - border-color: #aa6666; + background: $state-danger-bg; + border-color: $state-danger-border; } } + div.form, div.toolForm { border: solid $form-border 1px; @@ -694,22 +695,6 @@ div.form-row-input label { display: inline; } -div.form-row-error-message { - width: 300px; - float: left; - color: red; - font-weight: bold; - padding: 3px 0; -} - -.form-row .help, -.toolParamHelp { - color: #666; - a { - color: #666; - } -} - .form-row.form-actions { background: whiteSmoke; border-top: solid #ddd 1px; @@ -866,13 +851,6 @@ button { background-image: url(../../images/info_large.png); } -.screencastBox { - padding-left: 10px; - border-color: #aaaa66; - background-color: #ffffcc; - background-image: none; -} - .errormessage, .warningmessage, .donemessage, @@ -1256,38 +1234,6 @@ ul.manage-table-actions li { background: $state-default-bg; } -.state-fg-new { - color: #ffb030; -} - -.state-fg-upload { - color: #d090d0; -} - -.state-fg-waiting { - color: #e8c060; -} - -.state-fg-queued { - color: #888888; -} - -.state-fg-running { - color: #aaaa66; -} - -.state-fg-ok { - color: #66aa66; -} - -.state-fg-error { - color: #aa6666; -} - -.state-fg-deleted { - color: #3399ff; -} - // Button styles button { @@ -1322,19 +1268,11 @@ a.action-button { @extend .btn-secondary; } -//.action-button > * { -// vertical-align: middle; -//} - .action-button:hover { @extend .btn:hover; - //color: black; - //background: #dddddd; } .action-button:active { @extend .btn.active; - //color: white; - //background: #aaaaaa; } // A menu button is a button that has an attached popup menu @@ -1355,14 +1293,6 @@ a.action-button { position: relative; @extend .unselectable; - // border: solid transparent 1px; - // -moz-border-radius: 0.25em; - // -webkit-border-radius: 0.25em; - // border-radius: 0.25em; - - // padding: 1px 0.25em; - // margin: -1px -0.25em; - a { text-decoration: none; } @@ -1416,24 +1346,6 @@ a.action-button { } // Popup menu styles - -/* -.overlay-border { - position: absolute; - top: 0; - left: 0; - height: 100%; - width: 100%; - padding: 1em; - margin: -1em; - background-color: rgba(0,0,0,0.5); - -moz-border-radius: 1em; - -webkit-border-radius: 1em; - z-index: -1; -} -*/ - -// Galaxy popup menus div.popmenu-wrapper { position: absolute; top: 100%; From 17aa51cb85a084e57d99ca70c208bca2dc8079af Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 11 Jan 2019 00:55:49 -0500 Subject: [PATCH 10/27] Introduce brand color parameters, leave actual ui colors unchanged --- client/galaxy/style/scss/theme/blue.scss | 31 +++++++++++++++--------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/client/galaxy/style/scss/theme/blue.scss b/client/galaxy/style/scss/theme/blue.scss index de2a0a0192a..c9660e752fe 100644 --- a/client/galaxy/style/scss/theme/blue.scss +++ b/client/galaxy/style/scss/theme/blue.scss @@ -1,6 +1,18 @@ // Everything is derived from $base-color // Caveat: currently only works for light colored backgrounds, scss provides functions (contrast) that could be used to improve this +// Brand colors +$brand-primary: #25537b; +$brand-secondary: $gray-300; +$brand-success: #66cc66; +$brand-info: #2077b3; +$brand-warning: #fe7f02; +$brand-danger: #e31a1e; +$brand-light: $gray-100; +$brand-dark: $gray-800; +$brand-white: white; +$brand-muted: $gray-600; + // Base color -- Based on the Galaxy masthead color $base-color-1: #2c3143; $base-color-2: lighten($base-color-1, 25%); @@ -23,26 +35,21 @@ $gray-800: #343a40 !default; $gray-900: #212529 !default; $black: #000 !default; -// Brand colors -$brand-primary: #25537b; -$brand-success: #66cc66; -$brand-info: #2077b3; -$brand-warning: #fe7f02; -$brand-danger: #e31a1e; - // These variables don't actually determine the colors in Bootstrap 4, instead // they use a map called $theme-colors, so here we override that $theme-colors: (); $theme-colors: map-merge( ( "primary": $brand-primary, - "secondary": $gray-300, + "secondary": $brand-secondary, "success": $brand-success, - "info": $brand-info, - "warning": $brand-warning, "danger": $brand-danger, - "light": $gray-100, - "dark": $gray-800 + "warning": $brand-warning, + "info": $brand-info, + "light": $brand-light, + "dark": $brand-dark, + "muted": $brand-muted, + "white": $brand-white ), $theme-colors ); From f1ca1a92156531bf0b269de12f3c87cfc7e722b8 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 11 Jan 2019 00:59:06 -0500 Subject: [PATCH 11/27] Replace with actual color values --- client/galaxy/style/scss/theme/blue.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/galaxy/style/scss/theme/blue.scss b/client/galaxy/style/scss/theme/blue.scss index c9660e752fe..16553ff62cb 100644 --- a/client/galaxy/style/scss/theme/blue.scss +++ b/client/galaxy/style/scss/theme/blue.scss @@ -3,15 +3,15 @@ // Brand colors $brand-primary: #25537b; -$brand-secondary: $gray-300; +$brand-secondary: #dee2e6; $brand-success: #66cc66; $brand-info: #2077b3; $brand-warning: #fe7f02; $brand-danger: #e31a1e; -$brand-light: $gray-100; -$brand-dark: $gray-800; -$brand-white: white; -$brand-muted: $gray-600; +$brand-light: #f8f9fa; +$brand-dark: #343a40; +$brand-white: #fff; +$brand-muted: #6c757d; // Base color -- Based on the Galaxy masthead color $base-color-1: #2c3143; From f806e7b4f1c60d826c8604a725d52a5c78cf2e78 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 11 Jan 2019 01:51:10 -0500 Subject: [PATCH 12/27] Consolidate base colors --- client/galaxy/style/scss/base.scss | 3 +- client/galaxy/style/scss/frame.scss | 6 +-- client/galaxy/style/scss/theme/blue.scss | 58 +++++++++++------------- client/galaxy/style/scss/tour.scss | 2 +- 4 files changed, 32 insertions(+), 37 deletions(-) diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index e7e261c72be..0d9e3be8f0c 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -411,7 +411,7 @@ div.unified-panel-body-background { #masthead { padding: 0; margin-bottom: 0px; - background-color: $base-color-1; + background-color: $base-color; height: $masthead-height; .navbar-nav { min-height: 100%; @@ -974,7 +974,6 @@ table.colored th { table.colored tr.header { background: $table-heading-bg; - color: contrast(spin($base-color-3, 180)); background-repeat: repeat-x; background-position: top; border-bottom: solid $table-border-color 1px; diff --git a/client/galaxy/style/scss/frame.scss b/client/galaxy/style/scss/frame.scss index 64a772e445a..b3cce5aa4db 100644 --- a/client/galaxy/style/scss/frame.scss +++ b/client/galaxy/style/scss/frame.scss @@ -30,7 +30,7 @@ $frame-default-border: $gray-300; top: 0px; left: 0px; opacity: 0.5; - background: darken($base-color, 25%); + background: $base-color; border: 1px solid $frame-default-border; } @@ -98,7 +98,7 @@ $frame-default-border: $gray-300; margin: 2px; cursor: pointer; border: 1px solid $black; - background: $base-color-1; + background: $base-color; color: $white; .f-icon-left { cursor: pointer; @@ -146,7 +146,7 @@ $frame-default-border: $gray-300; background: $white; width: 16px; height: 16px; - color: $base-color-1; + color: $base-color; right: 0px; bottom: 0px; text-align: center; diff --git a/client/galaxy/style/scss/theme/blue.scss b/client/galaxy/style/scss/theme/blue.scss index 16553ff62cb..caa0d12bba9 100644 --- a/client/galaxy/style/scss/theme/blue.scss +++ b/client/galaxy/style/scss/theme/blue.scss @@ -1,6 +1,9 @@ // Everything is derived from $base-color // Caveat: currently only works for light colored backgrounds, scss provides functions (contrast) that could be used to improve this +// Base colors +$base-color: #2c3143; + // Brand colors $brand-primary: #25537b; $brand-secondary: #dee2e6; @@ -12,28 +15,20 @@ $brand-light: #f8f9fa; $brand-dark: #343a40; $brand-white: #fff; $brand-muted: #6c757d; - -// Base color -- Based on the Galaxy masthead color -$base-color-1: #2c3143; -$base-color-2: lighten($base-color-1, 25%); -$base-color-3: lighten($base-color-1, 50%); -$base-color: $base-color-2; - -// Default border bolor, this is between gray-light and gray-lighter -- classic Galaxy border color -$border-default-color: lighten(black, 75%); +$brand-toggle: gold; // Grays from Bootstrap 4 _variables.scss -$white: #fff !default; -$gray-100: #f8f9fa !default; -$gray-200: #e9ecef !default; -$gray-300: #dee2e6 !default; -$gray-400: #ced4da !default; -$gray-500: #adb5bd !default; -$gray-600: #6c757d !default; -$gray-700: #495057 !default; -$gray-800: #343a40 !default; -$gray-900: #212529 !default; -$black: #000 !default; +$white: $brand-white; +$gray-100: $brand-light; +$gray-200: darken($brand-light, 10%); +$gray-300: darken($gray-200, 10%); +$gray-400: darken($gray-300, 10%); +$gray-500: darken($gray-400, 10%); +$gray-600: darken($gray-500, 10%); +$gray-700: darken($gray-600, 10%); +$gray-800: darken($gray-700, 10%); +$gray-900: darken($gray-800, 10%); +$black: $brand-dark; // These variables don't actually determine the colors in Bootstrap 4, instead // they use a map called $theme-colors, so here we override that @@ -97,9 +92,9 @@ $h5-font-size: $font-size-base; // default 1.25 $h6-font-size: $font-size-base * 0.85; // default 1 // Increase contrast of dropdown items -$dropdown-link-hover-color: white; +$dropdown-link-hover-color: $brand-light; $dropdown-link-hover-bg: $brand-primary; -$dropdown-link-active-color: gold; +$dropdown-link-active-color: $brand-toggle; // Additional variables that are not used by bootstrap but are used // in Galaxy stylesheets @@ -113,7 +108,7 @@ $masthead-height: 3rem; $panel-bg-color: $gray-100; // #dfe5f9; $panel-text-color: $gray-900; $panel-header-bg-color: $gray-100; -$panel-header-text-color: #555; +$panel-header-text-color: $gray-800; $panel-message-height: 2.5rem; //1.875rem; $panel-width: 18rem; $panel_header_height: 2.5rem; @@ -127,27 +122,28 @@ $layout-border: none; // Borders $border-radius-base: 0.1875rem; $border-radius-large: 0.3125rem; +$border-default-color: $gray-300; // Buttons -$btn-default-color: #333; +$btn-default-color: $text-color; $btn-default-bg: darken($white, 5%); $btn-default-border: $border-default-color; // Forms -$form-heading-bg: #ebd9b2; +$form-heading-bg: $panel-bg-color; $form-border: darken($form-heading-bg, 20%); // Table $table-heading-bg: $panel-bg-color; -$table-bg-accent: #f9f9f9; // for striping +$table-bg-accent: lighten($panel-bg-color, 10%); // for striping $table-border-color: darken($table-heading-bg, 20%); // Additional state colors $state-default-bg: $gray-200; $state-default-border: $border-default-color; -$state-paused-bg: #d9edf7; -$state-running-border: #aaaa66; -$state-running-bg: #ffffcc; +$state-paused-bg: lighten($brand-info, 50%); +$state-running-bg: lighten($brand-warning, 30%); +$state-running-border: $border-default-color; // Navbar $navbar-height: 36px; // 2.062500rem; @@ -155,7 +151,7 @@ $navbar-default-bg: $gray-100; // JT #f8f8f8; $navbar-default-border: darken($navbar-default-bg, 20%); // Workflow editor -$workflow-editor-bg: white; +$workflow-editor-bg: $brand-white; $workflow-overview-border: $gray-200; // Margins @@ -164,4 +160,4 @@ $margin-v: $spacer * 1.5; $margin-h: $spacer; // Inputs -$input-border: #aaa; +$input-border: $gray-200; diff --git a/client/galaxy/style/scss/tour.scss b/client/galaxy/style/scss/tour.scss index 4fce701f91f..b1f085aef1f 100644 --- a/client/galaxy/style/scss/tour.scss +++ b/client/galaxy/style/scss/tour.scss @@ -1,4 +1,4 @@ .tour-tour > .popover-title { - background-color: $base-color-1; + background-color: $base-color; color: $white; } From d8801ecd595142166fa41afbdfa18fa622fb4915 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 11 Jan 2019 02:11:57 -0500 Subject: [PATCH 13/27] Replace fixed masthead toggle color --- client/galaxy/style/scss/base.scss | 2 +- client/galaxy/style/scss/theme/blue.scss | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index 0d9e3be8f0c..194e8ab1555 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -422,7 +422,7 @@ div.unified-panel-body-background { display: flex; align-items: center; &.active { - background: black; + background: darken($base-color, 10%); } .nav-link { cursor: pointer; diff --git a/client/galaxy/style/scss/theme/blue.scss b/client/galaxy/style/scss/theme/blue.scss index caa0d12bba9..2c849307649 100644 --- a/client/galaxy/style/scss/theme/blue.scss +++ b/client/galaxy/style/scss/theme/blue.scss @@ -1,6 +1,3 @@ -// Everything is derived from $base-color -// Caveat: currently only works for light colored backgrounds, scss provides functions (contrast) that could be used to improve this - // Base colors $base-color: #2c3143; @@ -20,7 +17,7 @@ $brand-toggle: gold; // Grays from Bootstrap 4 _variables.scss $white: $brand-white; $gray-100: $brand-light; -$gray-200: darken($brand-light, 10%); +$gray-200: darken($gray-100, 10%); $gray-300: darken($gray-200, 10%); $gray-400: darken($gray-300, 10%); $gray-500: darken($gray-400, 10%); From 3bce850b05599622eb876c51be8504f7d9c69134 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 11 Jan 2019 14:39:53 -0500 Subject: [PATCH 14/27] Remove duplicate border color --- client/galaxy/style/scss/base.scss | 14 ++++++-------- client/galaxy/style/scss/theme/blue.scss | 3 --- client/galaxy/style/scss/ui.scss | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index 194e8ab1555..99b806e078d 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -704,7 +704,7 @@ div.form-row-input label { } .workflow-right { - background: white; + background: $white; } .workflow-right .right-content { @@ -717,7 +717,6 @@ div.form-row-input label { // Selects select { - //border: 1px solid $input-border; padding: 2px; font-size: $font-size-base; line-height: $line-height-base; @@ -746,7 +745,7 @@ input[type="text"], input[type="password"] { font-size: $font-size-base; line-height: $line-height-base; - border: 1px solid $input-border; + border: 1px solid $border-default-color; padding: 3px; } @@ -767,10 +766,10 @@ button { font-size: $font-size-base; line-height: $line-height-base; color: $gray-700; - border: 1px solid $input-border; + border: 1px solid $border-default-color; padding-left: 14px !important; padding-right: 14px; - margin-bottom: 0; // remove the default margin on all inputs + margin-bottom: 0; @include border-radius(14px); max-width: auto; } @@ -1102,7 +1101,6 @@ div.debug { display: inline-block; padding: 0; white-space: nowrap; - // border: 1px solid #aaa; } .gray-background { background-color: #dddddd; @@ -1646,7 +1644,7 @@ div.toolTitleNoSection { .toolMenuAndView .toolForm { float: left; - background-color: white; + background-color: $white; margin: 10px; } @@ -1903,7 +1901,7 @@ div.toolTitleNoSection { @extend .fa; @extend .fa-circle; @extend .mt-1; - color: white; + color: $white; position: absolute; z-index: 1500; > icon { diff --git a/client/galaxy/style/scss/theme/blue.scss b/client/galaxy/style/scss/theme/blue.scss index 2c849307649..08269ac0ddb 100644 --- a/client/galaxy/style/scss/theme/blue.scss +++ b/client/galaxy/style/scss/theme/blue.scss @@ -155,6 +155,3 @@ $workflow-overview-border: $gray-200; $spacer: 1rem; // Not sure why this is not coming from Bootstrap $margin-v: $spacer * 1.5; $margin-h: $spacer; - -// Inputs -$input-border: $gray-200; diff --git a/client/galaxy/style/scss/ui.scss b/client/galaxy/style/scss/ui.scss index f245bb72a68..71feb9dd4cb 100644 --- a/client/galaxy/style/scss/ui.scss +++ b/client/galaxy/style/scss/ui.scss @@ -478,7 +478,7 @@ $ui-margin-horizontal-large: $margin-v * 2; // select2 adjustments .select2-drop-active, .select2-drop-above.select2-drop-active { - border: 1px solid $input-border; + border: 1px solid $border-default-color; .select2-search { @extend .pt-1; } From 8cce43838bda9b56a7448ccf1d37e18571ae442f Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 11 Jan 2019 14:59:31 -0500 Subject: [PATCH 15/27] Consolidate panel related footer color, remove duplicates --- client/galaxy/style/scss/base.scss | 12 +++--------- client/galaxy/style/scss/theme/blue.scss | 11 +++-------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index 99b806e078d..fafe77949b4 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -122,9 +122,6 @@ body { } #messagebox { - // position: absolute; - // top: $navbar-height + $layout_top_padding + 1; - // left: 0; width: 100%; height: $panel-message-height !important; overflow: hidden; @@ -134,9 +131,6 @@ body { } #inactivebox { - // position: absolute; - // top: $navbar-height + $layout_top_padding + 1; - // left: 0; width: 100%; height: $panel-message-height !important; overflow: hidden; @@ -276,7 +270,7 @@ body { width: 100%; z-index: 1000; // Above #dd-helper border-top: $layout-border; - background: $navbar-default-bg; + background: $panel-footer-bg-color; color: $panel-header-text-color; a { color: $panel-header-text-color; @@ -328,7 +322,7 @@ body { background: none; border-right: $layout-border; border-top: $layout-border; - background: $navbar-default-bg; + background: $panel-footer-bg-color; &.right { left: inherit; right: 0; @@ -1966,7 +1960,7 @@ div.toolTitleNoSection { border-top: solid gray 1px; border-left: solid grey 1px; padding: 7px 0 0 7px; - background: $workflow-overview-border no-repeat url("../../images/resizable.png"); + background: $workflow-overview-bg no-repeat url("../../images/resizable.png"); z-index: 20000; overflow: hidden; max-width: 300px; diff --git a/client/galaxy/style/scss/theme/blue.scss b/client/galaxy/style/scss/theme/blue.scss index 08269ac0ddb..45620b39eb9 100644 --- a/client/galaxy/style/scss/theme/blue.scss +++ b/client/galaxy/style/scss/theme/blue.scss @@ -56,7 +56,6 @@ $alert-color-level: 8 !default; // These are not Bootstrap styles but are used extensively in Galaxy. This // duplicated the way that Bootstrap 4 alerts are derived. - $state-warning-text: theme-color-level("warning", $alert-color-level); $state-warning-bg: theme-color-level("warning", $alert-bg-level); $state-warning-border: theme-color-level("warning", $alert-border-level); @@ -106,6 +105,7 @@ $panel-bg-color: $gray-100; // #dfe5f9; $panel-text-color: $gray-900; $panel-header-bg-color: $gray-100; $panel-header-text-color: $gray-800; +$panel-footer-bg-color: $gray-100; $panel-message-height: 2.5rem; //1.875rem; $panel-width: 18rem; $panel_header_height: 2.5rem; @@ -142,16 +142,11 @@ $state-paused-bg: lighten($brand-info, 50%); $state-running-bg: lighten($brand-warning, 30%); $state-running-border: $border-default-color; -// Navbar -$navbar-height: 36px; // 2.062500rem; -$navbar-default-bg: $gray-100; // JT #f8f8f8; -$navbar-default-border: darken($navbar-default-bg, 20%); - // Workflow editor $workflow-editor-bg: $brand-white; -$workflow-overview-border: $gray-200; +$workflow-overview-bg: $gray-200; // Margins -$spacer: 1rem; // Not sure why this is not coming from Bootstrap +$spacer: 1rem; $margin-v: $spacer * 1.5; $margin-h: $spacer; From 85713f4d4dbc15f6e6a04b55929b64f2d368774c Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 11 Jan 2019 15:33:37 -0500 Subject: [PATCH 16/27] Fix table accent color --- client/galaxy/style/scss/theme/blue.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/galaxy/style/scss/theme/blue.scss b/client/galaxy/style/scss/theme/blue.scss index 45620b39eb9..3f68c827e7a 100644 --- a/client/galaxy/style/scss/theme/blue.scss +++ b/client/galaxy/style/scss/theme/blue.scss @@ -132,7 +132,7 @@ $form-border: darken($form-heading-bg, 20%); // Table $table-heading-bg: $panel-bg-color; -$table-bg-accent: lighten($panel-bg-color, 10%); // for striping +$table-bg-accent: darken($panel-bg-color, 5%); $table-border-color: darken($table-heading-bg, 20%); // Additional state colors From 2e4f5fb52fc48c6be921582805194d1ba9f9fc35 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 11 Jan 2019 15:54:58 -0500 Subject: [PATCH 17/27] Fix unused colors --- client/galaxy/style/scss/theme/blue.scss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/client/galaxy/style/scss/theme/blue.scss b/client/galaxy/style/scss/theme/blue.scss index 3f68c827e7a..8cfb1ce1d02 100644 --- a/client/galaxy/style/scss/theme/blue.scss +++ b/client/galaxy/style/scss/theme/blue.scss @@ -11,7 +11,6 @@ $brand-danger: #e31a1e; $brand-light: #f8f9fa; $brand-dark: #343a40; $brand-white: #fff; -$brand-muted: #6c757d; $brand-toggle: gold; // Grays from Bootstrap 4 _variables.scss @@ -39,9 +38,7 @@ $theme-colors: map-merge( "warning": $brand-warning, "info": $brand-info, "light": $brand-light, - "dark": $brand-dark, - "muted": $brand-muted, - "white": $brand-white + "dark": $brand-dark ), $theme-colors ); From daf601e8342e2fabe05f9b45ed4a3f71b7bd22ee Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 11 Jan 2019 16:11:28 -0500 Subject: [PATCH 18/27] Remove unused input style specs --- client/galaxy/style/scss/base.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index fafe77949b4..d4fb8b9d810 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -739,8 +739,6 @@ input[type="text"], input[type="password"] { font-size: $font-size-base; line-height: $line-height-base; - border: 1px solid $border-default-color; - padding: 3px; } // Always style buttons and submits as bootstrap buttons @@ -748,7 +746,6 @@ input[type="submit"], button { @extend .btn; @extend .btn-secondary; - // The above overrides the button variants (primary, danger, etc) because it occurs later, redefine btn-primary (bit of a hack) &.btn-primary { @extend .btn-primary; } From 9d0d1231efd16c95ae1da0e90338349002172444 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 11 Jan 2019 19:00:16 -0500 Subject: [PATCH 19/27] Resolve background panel portlet contrast --- client/galaxy/style/scss/theme/blue.scss | 27 +++++++++++++----------- client/galaxy/style/scss/ui.scss | 6 +++--- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/client/galaxy/style/scss/theme/blue.scss b/client/galaxy/style/scss/theme/blue.scss index 8cfb1ce1d02..b82cecfc6ee 100644 --- a/client/galaxy/style/scss/theme/blue.scss +++ b/client/galaxy/style/scss/theme/blue.scss @@ -16,14 +16,14 @@ $brand-toggle: gold; // Grays from Bootstrap 4 _variables.scss $white: $brand-white; $gray-100: $brand-light; -$gray-200: darken($gray-100, 10%); -$gray-300: darken($gray-200, 10%); -$gray-400: darken($gray-300, 10%); -$gray-500: darken($gray-400, 10%); -$gray-600: darken($gray-500, 10%); -$gray-700: darken($gray-600, 10%); -$gray-800: darken($gray-700, 10%); -$gray-900: darken($gray-800, 10%); +$gray-200: darken($gray-100, 5%); // welcome background +$gray-300: darken($gray-100, 10%); +$gray-400: darken($gray-100, 20%); // input borders +$gray-500: darken($gray-100, 40%); +$gray-600: darken($gray-100, 60%); // text-muted +$gray-700: darken($gray-100, 70%); +$gray-800: darken($gray-100, 80%); +$gray-900: darken($gray-100, 90%); // text-regular $black: $brand-dark; // These variables don't actually determine the colors in Bootstrap 4, instead @@ -98,16 +98,19 @@ $text-color: $gray-900; $masthead-height: 3rem; // Side panels -$panel-bg-color: $gray-100; // #dfe5f9; +$panel-bg-color: $gray-100; $panel-text-color: $gray-900; $panel-header-bg-color: $gray-100; $panel-header-text-color: $gray-800; $panel-footer-bg-color: $gray-100; -$panel-message-height: 2.5rem; //1.875rem; +$panel-message-height: 2.5rem; $panel-width: 18rem; $panel_header_height: 2.5rem; $panel_footer_height: 25px; +// Portlets +$portlet-bg-color: $gray-200; + // Layout $layout_top_padding: 0px; $layout-border-color: $gray-900; @@ -116,11 +119,11 @@ $layout-border: none; // Borders $border-radius-base: 0.1875rem; $border-radius-large: 0.3125rem; -$border-default-color: $gray-300; +$border-default-color: $gray-400; // Buttons $btn-default-color: $text-color; -$btn-default-bg: darken($white, 5%); +$btn-default-bg: $gray-200; $btn-default-border: $border-default-color; // Forms diff --git a/client/galaxy/style/scss/ui.scss b/client/galaxy/style/scss/ui.scss index 71feb9dd4cb..92fc8133fb1 100644 --- a/client/galaxy/style/scss/ui.scss +++ b/client/galaxy/style/scss/ui.scss @@ -199,7 +199,7 @@ $ui-margin-horizontal-large: $margin-v * 2; .portlet-header:first-child { @extend .card-header; @extend .rounded; - background: $gray-200; + background: $portlet-bg-color; .portlet-title { .portlet-title-text.collapsible { cursor: pointer; @@ -239,10 +239,10 @@ $ui-margin-horizontal-large: $margin-v * 2; @extend .ui-portlet; @extend .mb-2; border: none; - border-left: solid 3px $gray-200; + border-left: solid 3px $portlet-bg-color; border-radius: $border-radius-large; .portlet-header:first-child { - background: $gray-200; + background: $portlet-bg-color; @extend .rounded-0; border-top-right-radius: $border-radius-large !important; padding: 5px; From 5a36b9dd2cc2091bf278ace6ee78e551a3e87089 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 11 Jan 2019 19:22:05 -0500 Subject: [PATCH 20/27] Remove rounded borders from welcome box --- static/welcome.html.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/welcome.html.sample b/static/welcome.html.sample index 4842eefe1b2..c3ef6200153 100644 --- a/static/welcome.html.sample +++ b/static/welcome.html.sample @@ -4,8 +4,8 @@ - -
+ +

Hello, Galaxy is running!

To customize this page edit static/welcome.html From 2d9ccf5e9fdae128938827447781a50b73795ffc Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 11 Jan 2019 19:36:34 -0500 Subject: [PATCH 21/27] Fix tool search icon position --- client/galaxy/style/scss/base.scss | 2 +- client/galaxy/style/scss/ui/search-input.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index d4fb8b9d810..54fbe957790 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -787,7 +787,7 @@ button { #search-clear-btn { position: absolute; right: 6px; - top: 5px; + top: 6px; display: block; font-size: 1.4em !important; text-decoration: none; diff --git a/client/galaxy/style/scss/ui/search-input.scss b/client/galaxy/style/scss/ui/search-input.scss index c3ea2051031..71b0d9290ca 100644 --- a/client/galaxy/style/scss/ui/search-input.scss +++ b/client/galaxy/style/scss/ui/search-input.scss @@ -11,7 +11,7 @@ display: inline-block; float: right; - margin-top: -24px; + margin-top: -25px; margin-right: 4px; font-size: 1.4em; From e6cd79bd424e3f8126d1ef5fe7bc29b720b000e1 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 11 Jan 2019 21:28:30 -0500 Subject: [PATCH 22/27] Consolidate base color --- client/galaxy/style/scss/base.scss | 4 ++-- client/galaxy/style/scss/frame.scss | 10 +++++----- client/galaxy/style/scss/theme/blue.scss | 5 +---- client/galaxy/style/scss/tour.scss | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index 54fbe957790..459a542fd18 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -405,7 +405,7 @@ div.unified-panel-body-background { #masthead { padding: 0; margin-bottom: 0px; - background-color: $base-color; + background-color: $brand-dark; height: $masthead-height; .navbar-nav { min-height: 100%; @@ -416,7 +416,7 @@ div.unified-panel-body-background { display: flex; align-items: center; &.active { - background: darken($base-color, 10%); + background: darken($brand-dark, 10%); } .nav-link { cursor: pointer; diff --git a/client/galaxy/style/scss/frame.scss b/client/galaxy/style/scss/frame.scss index b3cce5aa4db..6737dc0f6eb 100644 --- a/client/galaxy/style/scss/frame.scss +++ b/client/galaxy/style/scss/frame.scss @@ -18,8 +18,8 @@ $frame-default-border: $gray-300; left: 0px; height: 100%; width: 100%; - opacity: 0.6; - background: $black; + opacity: 0.5; + background: $brand-dark; overflow: auto; } @@ -30,7 +30,7 @@ $frame-default-border: $gray-300; top: 0px; left: 0px; opacity: 0.5; - background: $base-color; + background: $brand-dark; border: 1px solid $frame-default-border; } @@ -98,7 +98,7 @@ $frame-default-border: $gray-300; margin: 2px; cursor: pointer; border: 1px solid $black; - background: $base-color; + background: $brand-dark; color: $white; .f-icon-left { cursor: pointer; @@ -146,7 +146,7 @@ $frame-default-border: $gray-300; background: $white; width: 16px; height: 16px; - color: $base-color; + color: $brand-dark; right: 0px; bottom: 0px; text-align: center; diff --git a/client/galaxy/style/scss/theme/blue.scss b/client/galaxy/style/scss/theme/blue.scss index b82cecfc6ee..5a5a176be2e 100644 --- a/client/galaxy/style/scss/theme/blue.scss +++ b/client/galaxy/style/scss/theme/blue.scss @@ -1,6 +1,3 @@ -// Base colors -$base-color: #2c3143; - // Brand colors $brand-primary: #25537b; $brand-secondary: #dee2e6; @@ -9,7 +6,7 @@ $brand-info: #2077b3; $brand-warning: #fe7f02; $brand-danger: #e31a1e; $brand-light: #f8f9fa; -$brand-dark: #343a40; +$brand-dark: #2c3143; $brand-white: #fff; $brand-toggle: gold; diff --git a/client/galaxy/style/scss/tour.scss b/client/galaxy/style/scss/tour.scss index b1f085aef1f..9fdbcee7959 100644 --- a/client/galaxy/style/scss/tour.scss +++ b/client/galaxy/style/scss/tour.scss @@ -1,4 +1,4 @@ .tour-tour > .popover-title { - background-color: $base-color; + background-color: $brand-dark; color: $white; } From b998553b3afa9c5a88e70ffc908b0d3283336b45 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 11 Jan 2019 22:04:52 -0500 Subject: [PATCH 23/27] Consolidate text and border colors Fix --- client/galaxy/style/scss/base.scss | 18 ++++++++---------- client/galaxy/style/scss/frame.scss | 2 +- client/galaxy/style/scss/theme/blue.scss | 10 ++++------ client/galaxy/style/scss/ui.scss | 2 +- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index 459a542fd18..3429a17f625 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -125,7 +125,7 @@ body { width: 100%; height: $panel-message-height !important; overflow: hidden; - border-bottom: solid $gray-600 1px; + border-bottom: solid $border-default-color 1px; font-size: 90%; display: none; } @@ -134,7 +134,7 @@ body { width: 100%; height: $panel-message-height !important; overflow: hidden; - border-bottom: solid $gray-600 1px; + border-bottom: solid $border-default-color 1px; font-size: 90%; display: none; } @@ -549,11 +549,11 @@ div.metadataFormBody div.metadataFormTitle { div.metadataFormDisabled div.metadataFormTitle { background: #eee; - border-color: $gray-600; + border-color: $border-default-color; } div.metadataFormDisabled { - border-color: $gray-600; + border-color: $border-default-color; } div.metadataHelpBody { @@ -756,7 +756,7 @@ button { padding: 4px; font-size: $font-size-base; line-height: $line-height-base; - color: $gray-700; + color: $text-color; border: 1px solid $border-default-color; padding-left: 14px !important; padding-right: 14px; @@ -1358,15 +1358,13 @@ ul.dropdown-menu { font-size: 11px; font-weight: bold; line-height: $line-height-base; - color: $gray-500; + color: $text-color; text-transform: uppercase; } - li.head > a:hover { background: inherit; border-color: transparent; } - li > a { @extend .dropdown-item; } @@ -1464,7 +1462,7 @@ div.permissionContainer { .editable-text:hover { cursor: text; - border: dotted $gray-600 1px; + border: dotted $border-default-color 1px; } .icon-button.multiinput { @@ -1927,7 +1925,7 @@ div.toolTitleNoSection { } .mark-terminal { cursor: pointer; - color: $gray-500; + color: darken($border-default-color, 20%); &.mark-terminal-active { color: $brand-success; } diff --git a/client/galaxy/style/scss/frame.scss b/client/galaxy/style/scss/frame.scss index 6737dc0f6eb..382e8c9492a 100644 --- a/client/galaxy/style/scss/frame.scss +++ b/client/galaxy/style/scss/frame.scss @@ -1,5 +1,5 @@ $frame-zindex: 1000; -$frame-default-border: $gray-300; +$frame-default-border: $border-default-color; .galaxy-frame { .corner { diff --git a/client/galaxy/style/scss/theme/blue.scss b/client/galaxy/style/scss/theme/blue.scss index 5a5a176be2e..87da376ce77 100644 --- a/client/galaxy/style/scss/theme/blue.scss +++ b/client/galaxy/style/scss/theme/blue.scss @@ -86,8 +86,7 @@ $dropdown-link-hover-color: $brand-light; $dropdown-link-hover-bg: $brand-primary; $dropdown-link-active-color: $brand-toggle; -// Additional variables that are not used by bootstrap but are used -// in Galaxy stylesheets +// Galaxy Variables (not used by bootstrap) $body-bg: $white; $text-color: $gray-900; @@ -96,10 +95,9 @@ $masthead-height: 3rem; // Side panels $panel-bg-color: $gray-100; -$panel-text-color: $gray-900; -$panel-header-bg-color: $gray-100; -$panel-header-text-color: $gray-800; -$panel-footer-bg-color: $gray-100; +$panel-text-color: $text-color; +$panel-header-text-color: $text-color; +$panel-footer-bg-color: $panel-bg-color; $panel-message-height: 2.5rem; $panel-width: 18rem; $panel_header_height: 2.5rem; diff --git a/client/galaxy/style/scss/ui.scss b/client/galaxy/style/scss/ui.scss index 92fc8133fb1..a7ee926a32b 100644 --- a/client/galaxy/style/scss/ui.scss +++ b/client/galaxy/style/scss/ui.scss @@ -277,7 +277,7 @@ $ui-margin-horizontal-large: $margin-v * 2; &[readonly], fieldset[disabled] & { cursor: not-allowed; - background-color: $gray-200; + background-color: $brand-light; } } From b6271da34db8156ffd189ebd313f4dd2f5b45cda Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 11 Jan 2019 22:18:26 -0500 Subject: [PATCH 24/27] Fix grid search field style --- client/galaxy/scripts/mvc/grid/grid-template.js | 2 +- client/galaxy/style/scss/base.scss | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/client/galaxy/scripts/mvc/grid/grid-template.js b/client/galaxy/scripts/mvc/grid/grid-template.js index 141c6df7a95..6cc4346b340 100644 --- a/client/galaxy/scripts/mvc/grid/grid-template.js +++ b/client/galaxy/scripts/mvc/grid/grid-template.js @@ -414,7 +414,7 @@ export default { // // advanced search // - tmpl += `