From 0c43d4efbb06fd3d60c69e18a6ea46c168f9d906 Mon Sep 17 00:00:00 2001 From: ialarmedalien Date: Mon, 19 Oct 2020 11:44:43 -0700 Subject: [PATCH 1/2] CSS cleanup: - removing commented-out styles - removing invalid css tags and values - removing duplicated stanzas - combining declarations spread over several lines --- kbase-extension/static/kbase/css/appCell.css | 49 +---- .../static/kbase/css/bootstrapHelper.css | 2 - kbase-extension/static/kbase/css/buttons.css | 30 +-- .../static/kbase/css/kbaseJobLog.css | 12 +- .../static/kbase/css/kbaseNarrative.css | 173 +++++------------- .../static/kbase/css/kbaseNotify.css | 1 - .../static/kbase/css/kbaseStylesheet.css | 6 +- .../static/kbase/css/landing-pages.css | 53 +----- .../static/kbase/css/narrative.css | 94 +--------- .../static/kbase/custom/custom.css | 23 ++- 10 files changed, 87 insertions(+), 356 deletions(-) diff --git a/kbase-extension/static/kbase/css/appCell.css b/kbase-extension/static/kbase/css/appCell.css index 77b3e436ed..9f00a7de96 100644 --- a/kbase-extension/static/kbase/css/appCell.css +++ b/kbase-extension/static/kbase/css/appCell.css @@ -69,16 +69,10 @@ color: gray; } -/* .cell.selected .btn-default.kb-app-row-close-btn:hover { - color: red; -} */ - .kb-app-row-clip-btn, .kb-app-row-close-btn { height: 100%; margin-left: 1px; - - /* border-left: 3px solid transparent; */ border-right: 0; border-top: 0; border-bottom: 0; @@ -90,10 +84,10 @@ /* let's just do this as a normal button hover effect */ .kb-app-parameter-right-error-bar { - /* height: 100%; */ height: 28px; /* firefox wants it explicitly wired */ + background: red; } @@ -105,6 +99,7 @@ .kb-app-cell .kb-app-parameter-row .message.-error { background: #f2dede; + color: #f44336; } .kb-app-cell .kb-app-parameter-row .message { @@ -112,10 +107,6 @@ font-family: 'Oxygen', sans-serif; } -.kb-app-cell .kb-app-parameter-row .message.-error { - color: #f44336; -} - /* not sure how to get text in these divs to valign middle... */ .kb-app-cell .kb-app-parameter-name { @@ -159,12 +150,6 @@ in the column in which the icon lives, and does this by shrinking the select control with padding, and then scooting the icon back into its column. */ -/* .kb-app-cell .kb-app-parameter-input > div { - allow space for the required (red arrow), satisfied (green checkbox) icon - padding-right: 20px; -} -*/ - .kb-app-cell .kb-app-parameter-input .kb-app-parameter-accepted-glyph, .kb-app-cell .kb-app-parameter-input .kb-app-parameter-required-glyph { /* This scoots the icon inside */ @@ -176,10 +161,6 @@ control with padding, and then scooting the icon back into its column. color: #f44336; } -.kb-app-cell .kb-app-parameter-hint { - padding-left: 7px; -} - .kb-app-cell .kb-parameter-data-selection { font-weight: bold; } @@ -188,6 +169,7 @@ control with padding, and then scooting the icon back into its column. color: #777; text-align: left; margin-top: 3px; + padding-left: 7px; } .kb-app-cell .kb-app-parameter-accepted-glyph { @@ -243,11 +225,6 @@ control with padding, and then scooting the icon back into its column. padding: 3px 5px; } -.kb-app-cell .kb-app-subtitle { - background-color: #f5f5f5; - padding: 3px 5px; -} - .report-widget .panel-title > [data-toggle="collapse"]::before { display: inline-block; margin-left: 0; @@ -433,13 +410,6 @@ warning: orange margin-bottom: 0; } -.btn.kb-app-cell-btn.btn-danger.active:hover { - color: rgb(209, 82, 65); - background-color: #ddd; - border-bottom: 2px rgb(209, 82, 65) solid; - margin-bottom: 4px; -} - .btn.kb-app-cell-btn.btn-danger.active { color: white; background-color: rgb(209, 82, 65); @@ -457,15 +427,6 @@ warning: orange /* DISABLED is gray border and text */ -/* -.btn.kb-app-cell-btn.btn-primary.disabled:hover { - color: #888; - background-color: #FFF; - border-bottom: 2px #888 solid; - margin-bottom: 4px; -} -*/ - .btn.kb-app-cell-btn.disabled, .btn.kb-app-cell-btn.disabled:hover, .btn.kb-app-cell-btn.disabled:active { @@ -562,10 +523,6 @@ warning: orange .tt-header { font-size: 75%; - - /* this doesn't work, don't want to just turn it on, though: - font-color : gray; - */ font-style: italic; padding-left: 5px; } diff --git a/kbase-extension/static/kbase/css/bootstrapHelper.css b/kbase-extension/static/kbase/css/bootstrapHelper.css index cb7c20c76a..847d370611 100644 --- a/kbase-extension/static/kbase/css/bootstrapHelper.css +++ b/kbase-extension/static/kbase/css/bootstrapHelper.css @@ -77,7 +77,6 @@ } .panel.kb-panel-light .panel-body { - padding-top: 0; padding: 0; } @@ -88,7 +87,6 @@ .panel.kb-panel-container > .panel-heading { background-color: transparent; font-weight: bold; - xcolor: #2e618d; padding-left: 0; padding-bottom: 2px; border-bottom: 2px #ccc solid; diff --git a/kbase-extension/static/kbase/css/buttons.css b/kbase-extension/static/kbase/css/buttons.css index f99898a9b4..6472560e7e 100644 --- a/kbase-extension/static/kbase/css/buttons.css +++ b/kbase-extension/static/kbase/css/buttons.css @@ -3,50 +3,22 @@ styles */ .btn.kb-flat-btn { background-color: #fff; - xpadding: 1px 7px; - xfont-size: 24px; border: none; text-shadow: none !important; margin: 0; - - /* box-shadow: 0 0 3px #CECECE; */ - xmargin-right: 5px; + color: #666; } .kb-flat-btn-wrapper { /* don't add shadows here */ box-shadow: none; } -/* Set a plain default color -- should be overridden when building the button. */ -.btn.kb-flat-btn { - color: #666; -} - /* Text spacing */ .btn.kb-flat-btn .kb-nav-btn-txt { font-size: 10pt; margin-top: -5px; } -/* ?? - color nav icons -.navbar-buttons .fa::before { - color: #2196F3; -} -*/ - -.btn.kb-flat-btn:hover { - background-color: #f5f5f5; -} - -/* ?? - restore rounded corners -#kb-ipy-menu { - border-radius: 4px !important; - margin-right: 0; -} -*/ - .btn.kb-flat-btn:hover, .btn.kb-flat-btn:active { background-color: #ccc; diff --git a/kbase-extension/static/kbase/css/kbaseJobLog.css b/kbase-extension/static/kbase/css/kbaseJobLog.css index 6534beb422..414e6bbb74 100644 --- a/kbase-extension/static/kbase/css/kbaseJobLog.css +++ b/kbase-extension/static/kbase/css/kbaseJobLog.css @@ -39,8 +39,9 @@ color: #999; white-space: nowrap; - /* makes text unselectabe */ + /* makes text unselectable */ -moz-user-select: -moz-none; + -ms-user-select: none; -khtml-user-select: none; -webkit-user-select: none; -o-user-select: none; @@ -58,19 +59,12 @@ .kb-error .kblog-line-num { color: darkred; text-decoration: underline; - text-decoration-style: solid; - text-decoration-color: red; font-weight: bold; font-size: 12px; background-color: rgb(255, 245, 245); } -#kblog-msg { - margin-top: 5px; -} - +#kblog-msg, #kblog-err { margin-top: 5px; - - /* color: #660000; */ } diff --git a/kbase-extension/static/kbase/css/kbaseNarrative.css b/kbase-extension/static/kbase/css/kbaseNarrative.css index 5d89a1f7f4..1f8bb9cfd8 100644 --- a/kbase-extension/static/kbase/css/kbaseNarrative.css +++ b/kbase-extension/static/kbase/css/kbaseNarrative.css @@ -1,6 +1,6 @@ @import url("//fonts.googleapis.com/css?family=Roboto"); -.kb-dropzone div#upload-message { +.kb-dropzone #upload-message { font-family: Oxygen, Arial, sans-serif; font-weight: bold; } @@ -80,13 +80,13 @@ line-height: 18px; text-align: center; text-transform: uppercase; - color: #4379B1; + color: #4379b1; height: 35px; margin: 8px; padding: 8px; position: relative; top: -3px; - letter-spacing: .5pt; + letter-spacing: 0.5pt; border-radius: 4px; } @@ -214,9 +214,6 @@ .kb-data-list-drag-target.-drag-hover { background-color: #effceb; border-color: green; -} - -.kb-data-list-drag-target.-drag-hover { height: 90px; transition: all 0.25s ease; } @@ -426,10 +423,9 @@ span#searchspan { .btn { /* don't use drop-shadow on profile menu */ - box-shadow: none; -webkit-box-shadow: none; - moz-box-shadow: none; - xfont-size: 18px; + -moz-box-shadow: none; + box-shadow: none; } #signin-button .btn { @@ -524,7 +520,7 @@ p#site-title { #search-area { position: relative; - font: 18px "RobotoBlack", Arial, sans-serif; + font: 18px 'RobotoBlack', Arial, sans-serif; font-weight: normal; color: #686868; padding: 11px 11px; @@ -570,8 +566,6 @@ p#site-title { border-right: 5px solid #cecece; top: 70px; bottom: 0; - - /* overflow-y: auto; */ } .kb-side-overlay-container { @@ -784,7 +778,7 @@ p#site-title { } #data-pane p { - margin: 0 0; + margin: 0; } #data-pane p span { @@ -978,7 +972,6 @@ img.dataset-cell { background-image: url("../images/gears.png"); background-position: right; background-repeat: no-repeat; - #background-color: #f2f2f2; } .dataset-cell p, @@ -1075,7 +1068,6 @@ div.metadata { div.social { float: right; - display: block; width: 80px; padding: 0 10px; display: none; @@ -1168,10 +1160,6 @@ p span.notification { padding-bottom: 5px; } -#menubar .navbar { - margin-bottom: 5px; -} - #menubar .navbar .container { padding-left: 0; padding-right: 0; @@ -1207,19 +1195,16 @@ p span.notification { } #menubar .navbar { + margin-bottom: 5px; width: 100%; } div#notebook_panel { - -webkit-box-shadow: none; /* 0 -1px 0px rgba(0, 0, 0, 0.1); */ - -moz-box-shadow: none; /* 0 -1px 0px rgba(0, 0, 0, 0.1); */ - box-shadow: none; /* 0 -1px 0px rgba(0, 0, 0, 0.1); */ + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -/* #notebook { - padding-top: 1em; -} -*/ .version-stamp a { padding-right: 320px; text-align: right; @@ -1257,8 +1242,6 @@ div#notebook_panel { font-weight: bold; text-transform: uppercase; color: #2e618d; - - /* border-bottom: 1px solid #CECECE; */ } .kb-narr-side-panel .btn { @@ -1443,8 +1426,6 @@ div#notebook_panel { /* Container for func list */ .kb-function-body { height: 100%; - - /* overflow-y: auto; */ width: 100%; } @@ -1599,14 +1580,10 @@ div#notebook_panel { .kb-function-dim { background-color: #eee !important; - - /* border-color: #ddd !important; */ } .kb-function-dim .panel-heading { background-color: #eee !important; - - /* border-color: #000 !important; */ } .kb-function-cat-dim { @@ -1691,7 +1668,7 @@ div#notebook_panel { } .kb-cell-run h1 { - font-family: "Roboto"; + font-family: 'Roboto'; font-weight: normal; font-size: 12pt; line-height: 15px; @@ -1707,7 +1684,7 @@ div#notebook_panel { } .kb-cell-run h2 { - font-family: "Roboto"; + font-family: 'Roboto'; font-weight: normal; font-size: 11pt; line-height: 150%; @@ -1775,7 +1752,7 @@ td { } .kb-out-desc { - font-family: "Roboto"; + font-family: 'Roboto'; font-weight: normal; font-size: 12pt; line-height: 15px; @@ -1786,7 +1763,7 @@ td { } .kb-err-desc { - font-family: "Roboto"; + font-family: 'Roboto'; font-weight: normal; font-size: 12pt; line-height: 15px; @@ -1808,7 +1785,7 @@ td { .kb-func-timestamp { color: #555; font-size: 10pt; - font-family: "Roboto"; + font-family: 'Roboto'; margin-top: -3px; padding-right: 1em; } @@ -2008,15 +1985,12 @@ control with padding, and then scooting the icon back into its column. font-size: 15px; } -.kb-method-parameter-hint { - padding-left: 7px; -} - .kb-parameter-data-selection { font-weight: bold; } .kb-method-parameter-hint { + padding-left: 7px; color: #777; text-align: left; margin-top: 3px; @@ -2102,7 +2076,7 @@ control with padding, and then scooting the icon back into its column. } .kb-app-panel-description { - font-family: "Roboto"; + font-family: 'Roboto'; font-weight: normal; font-size: 12pt; line-height: 15px; @@ -2115,8 +2089,6 @@ control with padding, and then scooting the icon back into its column. line-height: 14px; color: #a63232; text-align: left; - - /* pading-left:30px; */ margin: 10px; } @@ -2137,8 +2109,6 @@ control with padding, and then scooting the icon back into its column. font-size: 16pt; line-height: 18px; color: #555; - - /* background:#f2dede; */ text-align: left; padding-left: 20px; margin-top: 20px; @@ -2152,14 +2122,10 @@ control with padding, and then scooting the icon back into its column. .kb-app-step-running { border: 3px solid #2196f3; z-index: auto; - - /* animation: pulse 1s ease infinite; - -webkit-animation: pulse 1s ease infinite; */ - - /* opacity: 0.7; */ } /* -- "next steps" text and links -- */ + .kb-app-next { border-top: 2px solid #cecece; } @@ -2234,9 +2200,9 @@ button.kb-app-run { border: none; padding: 10px 20px; font-size: 13px; - box-shadow: 1px 1px 1px #ccc; -webkit-box-shadow: 1px 1px 1px #ccc; - moz-box-shadow: 1px 1px 1px #ccc; + -moz-box-shadow: 1px 1px 1px #ccc; + box-shadow: 1px 1px 1px #ccc; } button.kb-app-run:hover { @@ -2258,9 +2224,9 @@ button.kb-method-run { border: none; padding: 10px 20px; font-size: 13px; - box-shadow: 1px 1px 1px #ccc; -webkit-box-shadow: 1px 1px 1px #ccc; - moz-box-shadow: 1px 1px 1px #ccc; + -moz-box-shadow: 1px 1px 1px #ccc; + box-shadow: 1px 1px 1px #ccc; } button.kb-method-run:hover { @@ -2450,8 +2416,6 @@ button.kb-data-obj { width: 90px; text-align: right; color: rgba(0, 0, 0, 0.5); - - /* padding: 0 0 5px 0; */ } .kb-data-obj-panel-info dl dt::after { @@ -2460,8 +2424,6 @@ button.kb-data-obj { .kb-data-obj-panel-info dl dd { margin: 0 0 0 100px; - - /* padding: 0 0 5px 0; */ } .kb-data-obj-panel-verlist span { @@ -2581,7 +2543,7 @@ button.kb-data-obj { .narrative-card-palette-icon { position: relative; - color: "#888"; + color: #888; left: 15px; top: -50px; } @@ -2625,10 +2587,9 @@ button.kb-data-obj { border-left-width: 5px; border-left-color: #fff; color: #333; + -webkit-box-shadow: 1px 1px 1px 1px #fff; + -moz-box-shadow: 1px 1px 1px 1px #fff; box-shadow: 1px 1px 1px 1px #fff; - - --webkit-box-shadow: 1px 1px 1px 1px #fff; - --moz-box-shadow: 1px 1px 1px 1px #fff; } .kb-function-dim .kb-data-list-obj-row { @@ -2640,9 +2601,9 @@ button.kb-data-obj { border-left-style: solid; border-left-width: 5px; border-left-color: #4bb856; - box-shadow: 1px 1px 1px 1px #aaa; -webkit-box-shadow: 1px 1px 1px 1px #aaa; - moz-box-shadow: 1px 1px 1px 1px #aaa; + -moz-box-shadow: 1px 1px 1px 1px #aaa; + box-shadow: 1px 1px 1px 1px #aaa; } .palette { @@ -2653,9 +2614,9 @@ button.kb-data-obj { border-left-style: solid; border-left-width: 5px; border-left-color: #4bb856; - box-shadow: 1px 1px 1px 1px #aaa; -webkit-box-shadow: 1px 1px 1px 1px #aaa; - moz-box-shadow: 1px 1px 1px 1px #aaa; + -moz-box-shadow: 1px 1px 1px 1px #aaa; + box-shadow: 1px 1px 1px 1px #aaa; } .kb-data-list-obj-row-main { @@ -2670,9 +2631,9 @@ button.kb-data-obj { font-size: 18px; border: none; text-shadow: none !important; - box-shadow: none; -webkit-box-shadow: none; - moz-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; margin: 0; } @@ -2681,9 +2642,9 @@ button.kb-data-obj { background-color: #4379b1; color: #fff; border: none; - box-shadow: 1px 1px 3px #aaa; -webkit-box-shadow: 1px 1px 3px #aaa; - moz-box-shadow: 1px 1px 3px #aaa; + -moz-box-shadow: 1px 1px 3px #aaa; + box-shadow: 1px 1px 3px #aaa; text-align: center; width: 30pt; height: 30pt; @@ -2723,9 +2684,9 @@ button.kb-data-obj { font-size: 14px; font-family: "Roboto", Helvetica, Arial, sans-serif; font-weight: 400; - box-shadow: 1px 1px 3px #aaa; -webkit-box-shadow: 1px 1px 3px #aaa; - moz-box-shadow: 1px 1px 3px #aaa; + -moz-box-shadow: 1px 1px 3px #aaa; + box-shadow: 1px 1px 3px #aaa; } .kb-data-list-add-data-text-button:hover { @@ -2740,9 +2701,9 @@ button.kb-data-obj { border: none; padding: 5px 10px; font-size: 13px; - box-shadow: 1px 1px 3px #aaa; -webkit-box-shadow: 1px 1px 3px #aaa; - moz-box-shadow: 1px 1px 3px #aaa; + -moz-box-shadow: 1px 1px 3px #aaa; + box-shadow: 1px 1px 3px #aaa; margin: 5px; } @@ -2763,9 +2724,9 @@ button.kb-data-obj { border: none; padding: 5px 10px; font-size: 13px; - box-shadow: 1px 1px 3px #aaa; -webkit-box-shadow: 1px 1px 3px #aaa; - moz-box-shadow: 1px 1px 3px #aaa; + -moz-box-shadow: 1px 1px 3px #aaa; + box-shadow: 1px 1px 3px #aaa; margin: 5px; } @@ -2844,7 +2805,7 @@ button.kb-data-obj { .kb-data-list-name { color: #2e618d; font-size: 11pt; - font-family: "Oyxgen", Arial, sans-serif; + font-family: 'Oyxgen', Arial, sans-serif; font-weight: bold; margin: 2px; cursor: pointer; @@ -2895,9 +2856,6 @@ button.kb-data-obj { font-size: 10pt; margin: 2px; margin-left: 10px; - - /* Not a link anymore, so we disable for now - cursor: pointer; */ } .kb-data-list-narrative-error { @@ -2911,8 +2869,6 @@ button.kb-data-obj { font-size: 10pt; margin: 2px; margin-left: 10px; - - /* cursor:pointer; */ } .kb-data-list-more { @@ -2929,9 +2885,9 @@ button.kb-data-obj { font-size: 12px; border: none; text-shadow: none !important; - box-shadow: none; -webkit-box-shadow: none; - moz-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; margin: 0; } @@ -3085,9 +3041,6 @@ button.kb-data-obj { .kbcb-app-card-title { font-size: 1.1em; - - /* max-height: 2.6em; - overflow:hidden; */ } .kbcb-app-card-module { @@ -3185,9 +3138,6 @@ button.kb-data-obj { .kbcb-app-page-title { font-size: 2em; - - /* max-height: 2.6em; - overflow:hidden; */ } .kbcb-app-page-module { @@ -3222,9 +3172,9 @@ button.kb-data-obj { .kb-share-user-permissions-dropdown { border-style: none; text-shadow: none !important; - box-shadow: none; -webkit-box-shadow: none; - moz-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; padding: 2px; width: auto; height: auto; @@ -3241,8 +3191,7 @@ button.kb-data-obj { } .kb-nar-manager-titles { - font-family: "Oxygen"; - font-weight: bold; + font-family: 'Oxygen'; color: #777; margin: 10px; margin-top: 20px; @@ -3257,11 +3206,6 @@ button.kb-data-obj { .kb-import-content { position: relative; margin: 0 0 0 0; - - /* overflow-x: hidden; - overflow-y: auto; */ - - /* height: 830px; */ display: block; } @@ -3345,11 +3289,6 @@ button.kb-data-obj { margin-bottom: 0; } -/* -.kb-import-item input[type="checkbox"] { - margin: 15px 30px 15px 0px; -} */ - .kb-import-item .kb-import-checkbox { font-size: 1.5em; padding: 15px 20px 15px 20px; @@ -3363,6 +3302,7 @@ button.kb-data-obj { .kb-import-info { display: inline-block; margin: 10px 20px 0 0; + font-weight: normal; } .kb-import-info span { @@ -3371,10 +3311,6 @@ button.kb-data-obj { color: #999; } -.kb-import-info { - font-weight: normal; -} - .kb-import-status { margin: 20px; } @@ -3410,15 +3346,10 @@ button.kb-data-obj { #kb-view-mode-narr div { display: inline-block; - - /* background-color: #2196F3; - color: #BBDEFB; */ color: #2196f3; - font-family: "Oxygen", Arial, sans-serif; + font-family: 'Oxygen', Arial, sans-serif; font-weight: bold; font-size: 16px; - - /* font-weight: bold; */ padding: 3px; margin-top: -3px; width: 147px; @@ -3493,12 +3424,6 @@ button.kb-data-obj { /* Override the default max-width of the narrative box */ -/* .container { */ - -/* max-width: 2000px !important; */ - -/* } */ - /* Styles for KNHX trees to remove its document.write nonsense that breaks asynchronous loading */ #popdiv { position: absolute; @@ -3515,5 +3440,3 @@ button.kb-data-obj { border: none; display: inline; } - -/* bootstrap sillines */ diff --git a/kbase-extension/static/kbase/css/kbaseNotify.css b/kbase-extension/static/kbase/css/kbaseNotify.css index bcebbfaead..4c01e03f91 100644 --- a/kbase-extension/static/kbase/css/kbaseNotify.css +++ b/kbase-extension/static/kbase/css/kbaseNotify.css @@ -1,4 +1,3 @@ - .kb-notify { position: relative; bottom: 10px; diff --git a/kbase-extension/static/kbase/css/kbaseStylesheet.css b/kbase-extension/static/kbase/css/kbaseStylesheet.css index 887f790d98..2809bb2036 100644 --- a/kbase-extension/static/kbase/css/kbaseStylesheet.css +++ b/kbase-extension/static/kbase/css/kbaseStylesheet.css @@ -128,13 +128,13 @@ body { strong, b { - font-family: 'Oxygen'; + font-family: 'Oxygen', Arial, sans-serif; font-weight: bold; } em, i { - font-family: 'Oxygen'; + font-family: 'Oxygen', Arial, sans-serif; font-style: italic; } @@ -142,7 +142,7 @@ strong em, em strong, b i, i b { - font-family: 'Oxygen'; + font-family: 'Oxygen', Arial, sans-serif; font-style: italic; font-weight: bold; } diff --git a/kbase-extension/static/kbase/css/landing-pages.css b/kbase-extension/static/kbase/css/landing-pages.css index 8cd9252a15..facbe2c01b 100644 --- a/kbase-extension/static/kbase/css/landing-pages.css +++ b/kbase-extension/static/kbase/css/landing-pages.css @@ -11,8 +11,6 @@ .nav > li > a:hover, .nav > li > a:focus { text-decoration: none; - - /* background-color: #fff !important; */ } /* END KBase navigation bar */ @@ -27,13 +25,17 @@ } #signin-button { - /* margin: 15px 7px 0 0; */ display: inline-block; padding: 0 15px 0 0; } /* bootstrap overrides */ -.wrapper { width: 95%; margin-left: auto; margin-right: auto; } + +.wrapper { + width: 95%; + margin-left: auto; + margin-right: auto; +} /* end bootstrap overrides */ @@ -92,10 +94,6 @@ table { padding: 6px; } -/* #select-box tr :hover { - background-color: #eee; -} */ - .selected-ws { background-color: #428bca; color: #fff; @@ -127,23 +125,6 @@ table { overflow-x: scroll; } -/* div::-webkit-scrollbar { - width: 10px; - height: 10px; -} - -div::-webkit-scrollbar-track { - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); - border-radius: 10px; - background: #ddd; -} - -div::-webkit-scrollbar-thumb { - border-radius: 10px; - background: #666; - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5); -} */ - /* ws browser */ .ws-selector { @@ -197,8 +178,6 @@ div::-webkit-scrollbar-thumb { -moz-box-shadow: 7px 7px 5px #888; -webkit-box-shadow: 7px 7px 5px #888; box-shadow: 7px 7px 5px #888; - - /* background: #95C07C; */ } .modal-cover-content { @@ -348,8 +327,6 @@ div::-webkit-scrollbar-thumb { .narrative-sidebar { position: fixed; width: 20%; - - /* float:left; */ } } @@ -368,21 +345,15 @@ div::-webkit-scrollbar-thumb { letter-spacing: 0; } -.view-header { - font: 1.5em/1.75em 'RobotoBlack', Arial, sans-serif; - font-weight: normal; - color: #898989; - letter-spacing: 0; -} - .active .btn-narr { background-color: #bbe8f9; text-align: left; padding-left: 20px; padding-right: 20px; - - /* border: 1px solid #A5D4E1; */ border: 1px solid #428bca; + + /* FIXME: why does the font change here?! */ + font-family: OxygenBold; font-size: 14px; } @@ -449,9 +420,6 @@ div::-webkit-scrollbar-thumb { /* for the footer */ #footer { - /* margin-top: 60px; - position: relative; - bottom: 0px; */ height: 58px; } @@ -482,9 +450,6 @@ div::-webkit-scrollbar-thumb { } #footer .disclaimer { - /* background-color: #f2dede; - border-top: 1px solid #ebccd1; - color: #a94442; */ background-color: #a94442; color: #fff; display: block; diff --git a/kbase-extension/static/kbase/css/narrative.css b/kbase-extension/static/kbase/css/narrative.css index c701ecf914..7d260627d1 100644 --- a/kbase-extension/static/kbase/css/narrative.css +++ b/kbase-extension/static/kbase/css/narrative.css @@ -7,10 +7,6 @@ z-index: 1000; } -body { - overflow: hidden; -} - .whiteout-pane { height: 100%; width: 100%; @@ -23,56 +19,40 @@ body { } html { - background-color: #a2a2a2; - - /* border: 1px solid #000; */ padding: 0; margin: 0; background-color: white; } body { + overflow: hidden; margin: 0 auto; padding: 0; line-height: 1.5em; - font: 1.375em "OxygenRegular", Arial, sans-serif; + font: 1.375em 'OxygenRegular', Arial, sans-serif; color: #333; background-color: #fff; - - /* width: 1170px; */ } /* header styling */ .notebook_app .navbar-kbase { - webkit-box-shadow: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; box-shadow: none; - moz-box-shadow: none; } header[role="banner"] { - /* overflow: auto; - padding: 7px 0 2px 0; - border-bottom: 1px solid #C0C0C0; - -moz-box-shadow: inset 0 0 2px #c2c2c2; - -webkit-box-shadow: inset 0 0 2px #c2c2c2; - box-shadow: inset 0 0 2px #c2c2c2; */ position: absolute; top: 0; width: 100%; background-color: #fff; border-bottom: 1px solid #e0e0e0; - - /* -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1); - -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1); - box-shadow: 0 1px 10px rgba(0,0,0,.1); */ z-index: 999; } nav[role="navigation"] ul { margin: 1.2em 0 0.5em 0; - - /* text-align: center; */ padding-left: 0; } @@ -85,7 +65,7 @@ nav[role="navigation"] ul li { nav[role="navigation"] ul li a { text-decoration: none; font-size: 1.2em; - font-family: "OxygenBold"; + font-family: 'OxygenBold'; padding: 7px 1em; background-color: #5c9531; color: #fff; @@ -217,30 +197,6 @@ p#site-title { margin-left: 5px; } -/* -nav { - padding: 26px 0 0 0; -} - -nav ul { - margin: 0 0 0 100px; -} - -nav ul li { - display: inline; - font: 18px 'RobotoBlack', Arial, sans-serif; - font-weight: normal; - color: #686868; - padding: 11px 7px; - margin: 0 15px; -} - -nav ul li.selected { - background-color: #F78F1E; - color: #fff; -} -*/ - .search-box { position: relative; display: inline; @@ -278,7 +234,7 @@ nav ul li.selected { #search-area { position: relative; - font: 18px "RobotoBlack", Arial, sans-serif; + font: 18px 'RobotoBlack', Arial, sans-serif; font-weight: normal; color: #686868; padding: 11px 11px; @@ -290,8 +246,8 @@ nav ul li.selected { } /* container for the left and center panes */ + #main-container { - /* width: 1170px; */ width: 100%; position: absolute; top: 55px; @@ -306,11 +262,6 @@ nav ul li.selected { } #content-column { - /* float: left; */ - - /* max-width: 1170px; -*/ - height: 100%; margin-left: 300px; } @@ -343,14 +294,6 @@ nav ul li.selected { /* left pane styling */ -/* #left-column { - width: 289px; - position: fixed; - left: 10px; - bottom: 0; - top: 53px; -} */ - #data-header { padding: 10px 0; color: #fff; @@ -452,20 +395,9 @@ nav ul li.selected { overflow: auto; } -/* .left-pane { - font-size: 14px; - position: relative; -} -*/ .left-pane { font-size: 14px; position: relative; - - /* width: 289px; - top: 428px; - bottom: 20px; - overflow: auto; -*/ } #kb-function-panel .kb-function-body { @@ -548,9 +480,6 @@ fieldset { } fieldset label { - /* display: block; -*/ - margin: 0 0 3px 0; font-weight: bold; font-size: 1em; @@ -585,7 +514,6 @@ img.dataset-cell { background-image: url("../images/gears.png"); background-position: right; background-repeat: no-repeat; - #background-color: #f2f2f2; } .dataset-cell p, @@ -682,7 +610,6 @@ div.metadata { div.social { float: right; - display: block; width: 80px; padding: 0 10px; display: none; @@ -696,7 +623,7 @@ p span.notification { } /** - * Bootstrap 3 submenu hack^H^H^H^H fix + * Bootstrap 3 submenu hack fix * http://stackoverflow.com/questions/18023493/bootstrap-3-dropdown-sub-menu-missing */ @@ -775,10 +702,6 @@ p span.notification { padding-bottom: 5px; } -#menubar .navbar { - margin-bottom: 5px; -} - #menubar .navbar .container { padding-left: 0; padding-right: 0; @@ -831,6 +754,7 @@ p span.notification { } #menubar .navbar { + margin-bottom: 5px; width: 100%; } diff --git a/kbase-extension/static/kbase/custom/custom.css b/kbase-extension/static/kbase/custom/custom.css index dfd55e4204..a3f96bd107 100644 --- a/kbase-extension/static/kbase/custom/custom.css +++ b/kbase-extension/static/kbase/custom/custom.css @@ -53,8 +53,6 @@ CSS should go in /kbase-extension/static/kbase/css/kbaseNarrative.css background-color: #fff; } -/* .btn * { color: black; } */ - .celltoolbar { height: auto; background: none; @@ -96,12 +94,13 @@ div.cell.selected { padding-left: 0; background-color: #e8efff; background: none; - transition: box-shadow 0.2s ease-in-out; - -moz-transition: box-shadow 0.2s ease-in-out; -webkit-transition: box-shadow 0.2s ease-in-out; - box-shadow: 0 1px 2px #aaa, 0 5px 5px #aaa; - -moz-box-shadow: 0 1px 2px #aaa, 0 5px 5px #aaa; + -moz-transition: box-shadow 0.2s ease-in-out; + -o-transition: box-shadow 0.2s ease-in-out; + transition: box-shadow 0.2s ease-in-out; -webkit-box-shadow: 0 1px 2px #aaa, 0 5px 5px #aaa; + -moz-box-shadow: 0 1px 2px #aaa, 0 5px 5px #aaa; + box-shadow: 0 1px 2px #aaa, 0 5px 5px #aaa; } div.cell.selected::before { @@ -123,15 +122,15 @@ div.cell.selected.kb-error { border-left: 5px solid #d9534f; } -div#notebook { +#notebook { padding: 0; } -span#notebook_name { +#notebook_name { color: #006698; } -span#notebook_name:hover { +#notebook_name:hover { cursor: pointer; background-color: #e0e0e0; } @@ -142,9 +141,9 @@ span#notebook_name:hover { } #notebook-container { - box-shadow: none; - -moz-box-shadow: none; -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; width: auto; min-width: 460px; position: fixed; @@ -165,7 +164,7 @@ span#notebook_name:hover { .btn-toolbar { margin-left: 0; - padding-left: -5px; + padding-left: 0; } .kb-narr-side-panel .btn-group .btn { From 0047567929830580dde36b13dca5e0eaba6416b3 Mon Sep 17 00:00:00 2001 From: ialarmedalien Date: Tue, 20 Oct 2020 09:24:44 -0700 Subject: [PATCH 2/2] Removing unneeded `html` stanza --- kbase-extension/static/kbase/css/narrative.css | 6 ------ 1 file changed, 6 deletions(-) diff --git a/kbase-extension/static/kbase/css/narrative.css b/kbase-extension/static/kbase/css/narrative.css index 7d260627d1..e36da085b5 100644 --- a/kbase-extension/static/kbase/css/narrative.css +++ b/kbase-extension/static/kbase/css/narrative.css @@ -18,12 +18,6 @@ z-index: 1001; } -html { - padding: 0; - margin: 0; - background-color: white; -} - body { overflow: hidden; margin: 0 auto;