From ce84ee7f3dfa591c8ce2eb07f5c98b03827c4c4c Mon Sep 17 00:00:00 2001 From: guerler Date: Mon, 8 Jul 2019 22:59:42 +0200 Subject: [PATCH 1/4] Fix indention in base styles --- client/galaxy/style/scss/base.scss | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index 74b47b27bcb..ac8f6eb205b 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -1507,26 +1507,26 @@ div.toolSectionTitle, div.toolTitle, div.toolTitleNoSection { } a { - @extend .px-3; - @extend .py-1; - text-decoration: none; - display: block; - &:hover { + @extend .px-3; + @extend .py-1; + text-decoration: none; + display: block; + &:hover { background: darken($panel-bg-color, 5%); - } + } } &.text-muted a { - &:hover { - background: inherit; - } + &:hover { + background: inherit; + } } } div.toolSectionWrapper { - div.toolTitle a, div.toolPanelLabel { - @extend .pl-4; - font-size: inherit; + div.toolTitle a, div.toolPanelLabel { + @extend .pl-4; + font-size: inherit; } } From 74c1f68e7161cfdfe780fdfa821efaa9c4e5f34f Mon Sep 17 00:00:00 2001 From: guerler Date: Mon, 8 Jul 2019 23:08:40 +0200 Subject: [PATCH 2/4] Fix indention for admin panel sections --- client/galaxy/scripts/entry/panels/admin-panel.js | 2 +- client/galaxy/style/scss/base.scss | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/client/galaxy/scripts/entry/panels/admin-panel.js b/client/galaxy/scripts/entry/panels/admin-panel.js index e67252912a6..9ae48429d2a 100644 --- a/client/galaxy/scripts/entry/panels/admin-panel.js +++ b/client/galaxy/scripts/entry/panels/admin-panel.js @@ -181,7 +181,7 @@ const AdminPanel = Backbone.View.extend({ _templateSection: function(options) { return `
-
${_l(options.title)}
+
${_l(options.title)}
`; }, diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index ac8f6eb205b..8e2fd2d86af 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -1486,9 +1486,6 @@ div.permissionContainer { div.toolSectionTitle { font-weight: 500; font-size: $h4-font-size; - &:hover { - background: darken($panel-bg-color, 5%); - } } div.toolPanelLabel { From 9cd3f2aa0bdd691eae054cdbe4daeff509264291 Mon Sep 17 00:00:00 2001 From: guerler Date: Mon, 8 Jul 2019 23:13:31 +0200 Subject: [PATCH 3/4] Fix additional indentions in base styles --- client/galaxy/style/scss/base.scss | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index 8e2fd2d86af..398c5acf815 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -1477,7 +1477,7 @@ div.permissionContainer { .toolMenuContainer { color: $panel-text-color; a { - color: $panel-text-color; + color: $panel-text-color; } background: $panel-bg-color; min-height: 100%; @@ -1502,7 +1502,6 @@ div.toolSectionTitle, div.toolTitle, div.toolTitleNoSection { .labels { float: right; } - a { @extend .px-3; @extend .py-1; @@ -1512,7 +1511,6 @@ div.toolSectionTitle, div.toolTitle, div.toolTitleNoSection { background: darken($panel-bg-color, 5%); } } - &.text-muted a { &:hover { background: inherit; @@ -1521,7 +1519,7 @@ div.toolSectionTitle, div.toolTitle, div.toolTitleNoSection { } div.toolSectionWrapper { - div.toolTitle a, div.toolPanelLabel { + div.toolTitle a, div.toolPanelLabel { @extend .pl-4; font-size: inherit; } From d96769d311936c4857fd84e4149e9a5ac17081d8 Mon Sep 17 00:00:00 2001 From: guerler Date: Mon, 8 Jul 2019 23:23:32 +0200 Subject: [PATCH 4/4] Remove indention from tool panel labels --- client/galaxy/style/scss/base.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index 398c5acf815..c048084f93d 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -1519,7 +1519,7 @@ div.toolSectionTitle, div.toolTitle, div.toolTitleNoSection { } div.toolSectionWrapper { - div.toolTitle a, div.toolPanelLabel { + div.toolTitle a { @extend .pl-4; font-size: inherit; }