alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Frontend] IN-PROGRESS Theming continues, sanding

Browse Source 
open #95
Fixed grid icon hover color;
Various color normalization;
This commit is contained in:
Charles Hacskaylo
2015-09-10 15:58:00 -07:00
parent d14c4e08b8
commit a840b59044
11 changed files with 275 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/commonUI/general/res/sass/_about.scss
View File

@@ -59,7 +59,7 @@
line-height: 120%;
a {
color: #84b3ff;
color: $colorAboutLink;
}
.s-description,
.s-info {
@@ -89,7 +89,7 @@
border-top: none;
}
em {
color: darken($colorBodyFg, 20%);
color: pushBack($colorBodyFg, 20%);
// margin-left: 2em;
&:first-child {
// margin-left: 0;

14
platform/commonUI/general/res/sass/_global.scss
View File

@@ -62,7 +62,6 @@ body, html {
}
em {
// color: rgba(white, 0.2); Removed this as a global setting
font-style: normal;
}
@@ -114,7 +113,7 @@ mct-container {
.codehilite {
@extend .code;
background-color: rgba(#fff, 0.1);
background-color: rgba($colorBodyFg, 0.1);
padding: 1em;
}
@@ -130,10 +129,6 @@ mct-container {
margin: 0;
}
.colorKey {
color: $colorKey;
}
.ds {
@include box-shadow(rgba(#000, 0.7) 0 4px 10px 2px);
}
@@ -143,13 +138,6 @@ mct-container {
display: none !important;
}
.paused {
&:not(.s-btn) {
border-color: $colorPausedBg !important;
color: $colorPausedBg !important;
}
}
.sep {
color: rgba(#fff, 0.2);
}

1
platform/commonUI/general/res/sass/_mixins.scss
View File

@@ -268,6 +268,7 @@
@mixin btnBase($bg: $colorBodyBg, $bgHov: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) {
@include user-select(none);
@include transition(background, .25s);
.icon {
color: $ic;
}

2
platform/commonUI/general/res/sass/_text.scss
View File

@@ -37,7 +37,7 @@
}
h1, h2, h3 {
color: #fff;
color: pullForward($colorBodyFg, 20%);
font-weight: normal !important;
margin-bottom: 1em;
}

53
platform/commonUI/general/res/sass/controls/_buttons.scss
View File

@@ -22,42 +22,6 @@
$baseRatio: 1.5;
$pad: $interiorMargin * $baseRatio;
/******* LAYOUT AND SIZING */
/*.l-btn {
@include user-select(none);
//line-height: 1.5em; // Was 1.25em
line-height: 150%;
padding: 0 $pad;
text-decoration: none;
&.lg,
&.create-btn {
$h: $ueTopBarH; // - $interiorMargin;
height: $h;
line-height: $h - 2;
padding: 0 $pad * 3;
}
&.create-btn {
font-size: 1em;
&:before {
content:"+";
font-family: symbolsfont;
}
.menu {
margin-left: $pad * -1;
}
>.ui-symbol {
//font-size: 1.1em; // Normalizing for new icomoon symbols font
}
}
&.sm {
padding: 0 $pad / $baseRatio;
}
&.vsm {
padding: 0 ($pad / $baseRatio) / 2;
}
}*/
/*********************************** STYLE STYLES */
.s-btn {
@include box-sizing(border-box);
@include user-select(none);
@@ -156,15 +120,10 @@ $pad: $interiorMargin * $baseRatio;
}
}
/*********************************** LAYOUT STYLES */
/*
span.s-btn,
span.s-btn span,
a.s-btn,
a.s-btn span,
a.s-btn,
a.s-btn span {
display: inline-block;
.paused {
&:not(.s-btn) {
border-color: $colorPausedBg !important;
color: $colorPausedBg !important;
}
}
*/

4
platform/commonUI/general/res/sass/items/_item.scss
View File

@@ -32,7 +32,7 @@
$iconMargin: 40px;
$iconD: ($d - ($iconMargin * 2)) * 0.85;
$transTime: 200ms;
@include btnSubtle($colorItemBg, pullForward($colorItemBg, 20%), $colorItemFg, $colorItemIcon);
@include btnSubtle($colorItemBg, pullForward($colorItemBg, 20%), $colorItemFg, $colorItemIc);
box-sizing: border-box;
cursor: pointer;
float: left;
@@ -90,7 +90,7 @@
//@include trans-prop-nice("color", $transTime);
@include absPosDefault($iconMargin, false);
//@include test(red);
color: $colorItemIcon;
//color: $colorItemIc;
text-align: center;
font-size: $iconD * 0.95; //6em;
line-height: $iconD;

2
platform/commonUI/general/res/sass/search/_search.scss
View File

@@ -80,7 +80,7 @@
.clear-icon,
.menu-icon {
cursor: pointer;
transition: color .25s;
@include transition(color, .25s);
}