diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss index cecffffab7f..d72195cb283 100644 --- a/client/galaxy/style/scss/base.scss +++ b/client/galaxy/style/scss/base.scss @@ -1502,88 +1502,57 @@ div.permissionContainer { @import "ui/error-modal.scss"; // ==== Tool menu styles - .toolMenuContainer { color: $panel-text-color; a { color: $panel-text-color; - // text-decoration: none; } background: $panel-bg-color; min-height: 100%; @extend .m-3; } -div.toolSectionPad { - margin: 0; - padding: 0; - height: 5px; - font-size: 0px; -} - div.toolSectionWrapper { - margin-bottom: 5px; -} - -div.toolSectionDetailsInner { - margin-left: 5px; - margin-right: 5px; + @extend .mb-1; } div.toolSectionTitle { font-weight: 500; - font-size: 1rem; + font-size: $h4-font-size; } div.toolPanelLabel { - padding-top: 10px; - padding-bottom: 5px; + @extend .m-2; font-weight: bold; - color: gray; + color: $gray-600; text-transform: uppercase; } div.toolTitle { - margin-left: 10px; - margin-right: 10px; + @extend .m-2; display: block; .labels { float: right; - margin-left: 2px; } } div a.tool-link { text-decoration: none; display: block; - padding-top: 5px; - padding-bottom: 5px; - span.tool-old-link { text-decoration: underline; } - &:hover { background: darken($panel-bg-color, 5%); } } -div.toolSectionBody div.toolPanelLabel { - padding-top: 5px; - padding-bottom: 5px; - margin-left: 16px; - margin-right: 10px; - display: list-item; - list-style: none outside; -} - div.toolTitleNoSection { - padding-bottom: 5px; + @extend .pb-1; font-weight: bold; } // Dataset Display Styles - #loading_indicator { position: fixed; right: 10px; @@ -1943,7 +1912,7 @@ div.toolTitleNoSection { } /* Toolshed, reports custom styles from mako templates */ -body.toolshed { +body.toolshed, body.reports { margin: 0; padding: 0; overflow: hidden; @@ -1958,15 +1927,6 @@ body.toolshed { } } -body.reports { - margin: 0; - padding: 0; - overflow: hidden; - #left { - background: #c1c9e5 url(../../images/menu_bg.png) top repeat-x; - } -} - /* Used in Galaxy IE for spinner loading TODO: Remove in IE entrypoint refactoring */ #ie-loading-spinner { position: absolute; diff --git a/client/galaxy/style/scss/reports.scss b/client/galaxy/style/scss/reports.scss index 92a9082877a..bd3cf8ae891 100644 --- a/client/galaxy/style/scss/reports.scss +++ b/client/galaxy/style/scss/reports.scss @@ -1,21 +1,5 @@ // ############################################################# Reports Webapp -// ======================================================== Left ============== -.reports-panel-container { - position: absolute; - /*From base.scss, top should be $panel_header_height*/ - top: 30px; - bottom: 10px; - overflow: scroll; - width: 100%; - padding: 10px; -} -#reports_home { - position: relative; - top: -7px; - float: right; -} - // ======================================================== SparkLines ======== #spark_time_select { display: inline-block; diff --git a/templates/webapps/reports/base_panels.mako b/templates/webapps/reports/base_panels.mako index bf102f2b4df..52e0c81d349 100644 --- a/templates/webapps/reports/base_panels.mako +++ b/templates/webapps/reports/base_panels.mako @@ -38,13 +38,11 @@ ## Logo, layered over tabs to be clickable -
+ %def> diff --git a/templates/webapps/reports/index.mako b/templates/webapps/reports/index.mako index b0667332c90..70e983edac3 100644 --- a/templates/webapps/reports/index.mako +++ b/templates/webapps/reports/index.mako @@ -30,12 +30,12 @@ %> -