Skip to content

Commit

Permalink
Merge pull request #1879 from kbase/DATAUP-246_css_to_sass_css_clean_up
Browse files Browse the repository at this point in the history
DATAUP-246: CSS cleanup, pt II
  • Loading branch information
briehl committed Oct 22, 2020
2 parents 86f459d + 0047567 commit beef10e
Show file tree
Hide file tree
Showing 10 changed files with 87 additions and 362 deletions.
49 changes: 3 additions & 46 deletions kbase-extension/static/kbase/css/appCell.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand All @@ -105,17 +99,14 @@

.kb-app-cell .kb-app-parameter-row .message.-error {
background: #f2dede;
color: #f44336;
}

.kb-app-cell .kb-app-parameter-row .message {
text-align: center;
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 {
Expand Down Expand Up @@ -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 */
Expand All @@ -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;
}
Expand All @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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 {
Expand Down Expand Up @@ -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;
}
2 changes: 0 additions & 2 deletions kbase-extension/static/kbase/css/bootstrapHelper.css
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
}

.panel.kb-panel-light .panel-body {
padding-top: 0;
padding: 0;
}

Expand All @@ -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;
Expand Down
30 changes: 1 addition & 29 deletions kbase-extension/static/kbase/css/buttons.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 3 additions & 9 deletions kbase-extension/static/kbase/css/kbaseJobLog.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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; */
}

0 comments on commit beef10e

Please sign in to comment.