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

[Frontend] IN-PROGRESS Theme changes continuing

Browse Source 
open #95
Menus sanded and normalized;
This commit is contained in:
Charles Hacskaylo
2015-09-09 17:25:10 -07:00
parent 32b895ba62
commit 3792dab0f9
6 changed files with 231 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,31 +145,6 @@
background-repeat: $repeatDir;
}
@mixin containerBase($bg: $colorBodyBg, $fg: $colorBodyFg) {
background-color: $bg;
@include border-radius($controlCr);
@include box-sizing(border-box);
color: $fg;
display: inline-block;
}
@mixin btnBase($bg: $colorBodyBg, $bgHov: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) {
@include user-select(none);
.icon {
color: $ic;
}
@include desktop {
@if $bgHov != none {
&:not(.disabled):hover {
background: $bgHov;
.icon {
color: lighten($ic, $ltGamma);
}
}
}
}
}
@mixin sliderTrack($bg: $scrollbarTrackColorBg) {
//$b: 1px solid lighten($bg, 30%);
@include border-radius(2px);
@@ -281,7 +256,32 @@
@return percentage($d);
}
/*********************************************** FORM ELEMENTS */
/*********************************************** CONTROLS, FORM ELEMENTS */
@mixin containerBase($bg: $colorBodyBg, $fg: $colorBodyFg) {
background-color: $bg;
@include border-radius($controlCr);
@include box-sizing(border-box);
color: $fg;
display: inline-block;
}
@mixin btnBase($bg: $colorBodyBg, $bgHov: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) {
@include user-select(none);
.icon {
color: $ic;
}
@include desktop {
@if $bgHov != none {
&:not(.disabled):hover {
background: $bgHov;
>.icon {
color: lighten($ic, $ltGamma);
}
}
}
}
}
@mixin input-base($bg: $colorBodyBg, $fg: $colorBodyFg) {
@include appearance(none);

13
platform/commonUI/general/res/sass/controls/_menus.scss
View File

@@ -69,8 +69,6 @@
$bg: $colorMenuBg;
$fg: $colorMenuFg;
$ic: $colorMenuIc;
$bgHover: $colorMenuHov;
$iconColor: $colorKey;
cursor: pointer;
position: relative;
.menu {
@@ -96,10 +94,10 @@
border: none;
}
&:hover {
background: $bgHover;
color: $colorKeyFg;
background: $colorMenuHovBg;
color: $colorMenuHovFg;
.icon {
color: lighten($iconColor, 20%);
color: $colorMenuHovIc;
}
}
.type-icon {
@@ -109,11 +107,12 @@
}
}
.menu,
.context-menu,
.super-menu {
pointer-events: auto;
ul li {
padding-left: 25px;
//padding-left: 25px;
a {
color: $fg;
}
@@ -124,7 +123,7 @@
left: $interiorMargin;
}
&:hover .icon {
color: lighten($ic, 5%);
//color: lighten($ic, 5%);
}
}
}