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
Splitter styles updated;
Tree styles updated;
This commit is contained in:
Charles Hacskaylo
2015-09-04 16:39:16 -07:00
parent 37c34c668c
commit ac41ed7d64
13 changed files with 265 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
platform/commonUI/themes/espresso/res/css/theme-espresso.css
View File

@@ -20,7 +20,7 @@
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
@@ -41,38 +41,38 @@ time, mark, audio, video {
font-size: 100%;
vertical-align: baseline; }
/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
html {
line-height: 1; }
/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
ol, ul {
list-style: none; }
/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
table {
border-collapse: collapse;
border-spacing: 0; }
/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
caption, th, td {
text-align: left;
font-weight: normal;
vertical-align: middle; }
/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
q, blockquote {
quotes: none; }
/* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
q:before, q:after, blockquote:before, blockquote:after {
content: "";
content: none; }
/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
a img {
border: none; }
/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
/* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */
article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary {
display: block; }
@@ -98,15 +98,6 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*********************************************** FORM ELEMENTS */
/*
@mixin invokeMenu($baseColor: $colorBodyFg) {
$c: $baseColor;
color: $c;
&:hover {
color: lighten($c, $ltGamma);
}
}
*/
/*****************************************************************************
* Open MCT Web, Copyright (c) 2014-2015, United States Government
* as represented by the Administrator of the National Aeronautics and Space
@@ -931,26 +922,29 @@ mct-container {
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
/* line 29, ../../../../general/res/sass/helpers/_splitter.scss */
/* line 26, ../../../../general/res/sass/helpers/_splitter.scss */
.split-layout .splitter {
background-color: #404040;
background-color: #454545;
-moz-box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px;
-webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px;
box-shadow: rgba(0, 0, 0, 0.4) 0 0 3px;
overflow: hidden;
position: absolute;
z-index: 1; }
/* line 36, ../../../../general/res/sass/helpers/_splitter.scss */
/* line 33, ../../../../general/res/sass/helpers/_splitter.scss */
.split-layout .splitter:hover {
background-color: none; }
/* line 38, ../../../../general/res/sass/helpers/_splitter.scss */
.split-layout.horizontal {
overflow: hidden; }
/* line 39, ../../../../general/res/sass/helpers/_splitter.scss */
/* line 41, ../../../../general/res/sass/helpers/_splitter.scss */
.split-layout.horizontal .pane {
left: 0;
right: 0; }
/* line 42, ../../../../general/res/sass/helpers/_splitter.scss */
/* line 44, ../../../../general/res/sass/helpers/_splitter.scss */
.split-layout.horizontal .pane.top {
bottom: auto; }
/* line 46, ../../../../general/res/sass/helpers/_splitter.scss */
/* line 47, ../../../../general/res/sass/helpers/_splitter.scss */
.split-layout.horizontal .pane.bottom {
top: auto; }
/* line 51, ../../../../general/res/sass/helpers/_splitter.scss */
@@ -980,7 +974,7 @@ mct-container {
pointer-events: none;
position: absolute;
z-index: 2;
border-top: 1px dotted #1a1a1a;
border-top: 1px dotted #0d0d0d;
top: 2px;
left: 5px;
right: 5px; }
@@ -990,26 +984,26 @@ mct-container {
-o-transition-property: "border-color";
-webkit-transition-property: "border-color";
transition-property: "border-color";
-moz-transition-duration: 50ms;
-o-transition-duration: 50ms;
-webkit-transition-duration: 50ms;
transition-duration: 50ms;
-moz-transition-duration: 25ms;
-o-transition-duration: 25ms;
-webkit-transition-duration: 25ms;
transition-duration: 25ms;
-moz-transition-timing-function: ease-in-out;
-o-transition-timing-function: ease-in-out;
-webkit-transition-timing-function: ease-in-out;
transition-timing-function: ease-in-out;
border-color: #0099cc; }
/* line 63, ../../../../general/res/sass/helpers/_splitter.scss */
/* line 61, ../../../../general/res/sass/helpers/_splitter.scss */
.split-layout.vertical .pane {
top: 0;
bottom: 0; }
/* line 66, ../../../../general/res/sass/helpers/_splitter.scss */
/* line 64, ../../../../general/res/sass/helpers/_splitter.scss */
.split-layout.vertical .pane.left {
right: auto; }
/* line 70, ../../../../general/res/sass/helpers/_splitter.scss */
/* line 67, ../../../../general/res/sass/helpers/_splitter.scss */
.split-layout.vertical .pane.right {
left: auto; }
/* line 75, ../../../../general/res/sass/helpers/_splitter.scss */
/* line 71, ../../../../general/res/sass/helpers/_splitter.scss */
.split-layout.vertical > .splitter {
bottom: 0;
cursor: col-resize;
@@ -1034,7 +1028,7 @@ mct-container {
pointer-events: none;
position: absolute;
z-index: 2;
border-left: 1px dotted #1a1a1a;
border-left: 1px dotted #0d0d0d;
left: 2px;
bottom: 5px;
top: 5px; }
@@ -1044,21 +1038,21 @@ mct-container {
-o-transition-property: "border-color";
-webkit-transition-property: "border-color";
transition-property: "border-color";
-moz-transition-duration: 50ms;
-o-transition-duration: 50ms;
-webkit-transition-duration: 50ms;
transition-duration: 50ms;
-moz-transition-duration: 25ms;
-o-transition-duration: 25ms;
-webkit-transition-duration: 25ms;
transition-duration: 25ms;
-moz-transition-timing-function: ease-in-out;
-o-transition-timing-function: ease-in-out;
-webkit-transition-timing-function: ease-in-out;
transition-timing-function: ease-in-out;
border-color: #0099cc; }
/* line 86, ../../../../general/res/sass/helpers/_splitter.scss */
/* line 80, ../../../../general/res/sass/helpers/_splitter.scss */
.browse-area .splitter {
top: 34px; }
/* line 90, ../../../../general/res/sass/helpers/_splitter.scss */
/* line 84, ../../../../general/res/sass/helpers/_splitter.scss */
.edit-area .splitter {
top: 0; }
@@ -1998,10 +1992,10 @@ label.checkbox.custom {
-o-transition-property: "border-color";
-webkit-transition-property: "border-color";
transition-property: "border-color";
-moz-transition-duration: 50ms;
-o-transition-duration: 50ms;
-webkit-transition-duration: 50ms;
transition-duration: 50ms;
-moz-transition-duration: 25ms;
-o-transition-duration: 25ms;
-webkit-transition-duration: 25ms;
transition-duration: 25ms;
-moz-transition-timing-function: ease-in-out;
-o-transition-timing-function: ease-in-out;
-webkit-transition-timing-function: ease-in-out;
@@ -2149,9 +2143,6 @@ label.checkbox.custom {
/* line 50, ../../../../general/res/sass/controls/_menus.scss */
.s-menu.create-btn .title-label {
font-size: 1rem; }
/* line 53, ../../../../general/res/sass/controls/_menus.scss */
.s-menu.create-btn:after {
color: rgba(255, 255, 255, 0.5); }
/* line 58, ../../../../general/res/sass/controls/_menus.scss */
.s-menu .menu {
left: 0;
@@ -2197,7 +2188,7 @@ label.checkbox.custom {
.menu-element .menu ul {
margin: 0;
padding: 0; }
/* line 324, ../../../../general/res/sass/_mixins.scss */
/* line 332, ../../../../general/res/sass/_mixins.scss */
.menu-element .menu ul li {
list-style-type: none;
margin: 0;
@@ -2702,7 +2693,7 @@ label.form-control.checkbox input {
position: absolute;
height: 100%;
width: 100%; }
/* line 290, ../../../../general/res/sass/_mixins.scss */
/* line 308, ../../../../general/res/sass/_mixins.scss */
.edit-main textarea.error {
background: rgba(255, 0, 0, 0.5); }
@@ -2745,7 +2736,7 @@ input[type="text"] {
color: #cccccc;
outline: none;
padding: 0 3px; }
/* line 290, ../../../../general/res/sass/_mixins.scss */
/* line 308, ../../../../general/res/sass/_mixins.scss */
input[type="text"].error {
background: rgba(255, 0, 0, 0.5); }
/* line 29, ../../../../general/res/sass/forms/_text-input.scss */
@@ -2893,7 +2884,7 @@ input[type="text"] {
max-height: 400px;
overflow: auto;
padding: 5px; }
/* line 290, ../../../../general/res/sass/_mixins.scss */
/* line 308, ../../../../general/res/sass/_mixins.scss */
.channel-selector .treeview.error {
background: rgba(255, 0, 0, 0.5); }
/* line 36, ../../../../general/res/sass/forms/_channel-selector.scss */
@@ -3050,7 +3041,7 @@ span.req {
padding: 0 3px;
background: #3b3b3b;
border-bottom: 1px solid #4d4d4d; }
/* line 290, ../../../../general/res/sass/_mixins.scss */
/* line 308, ../../../../general/res/sass/_mixins.scss */
.filter input.filter.error,
.filter input.t-filter-input.error,
.t-filter input.filter.error,
@@ -4166,7 +4157,7 @@ span.req {
ul.tree {
margin: 0;
padding: 0; }
/* line 324, ../../../../general/res/sass/_mixins.scss */
/* line 332, ../../../../general/res/sass/_mixins.scss */
ul.tree li {
list-style-type: none;
margin: 0;
@@ -4201,16 +4192,17 @@ ul.tree {
/* line 47, ../../../../general/res/sass/tree/_tree.scss */
.tree-item .view-control,
.search-result-item .view-control {
color: rgba(255, 255, 255, 0.3);
display: inline-block;
margin-left: 5px;
font-size: 0.75em;
width: 10px; }
@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) {
/* line 55, ../../../../general/res/sass/tree/_tree.scss */
/* line 56, ../../../../general/res/sass/tree/_tree.scss */
.tree-item .view-control:hover,
.search-result-item .view-control:hover {
color: #ffc700; } }
/* line 61, ../../../../general/res/sass/tree/_tree.scss */
/* line 62, ../../../../general/res/sass/tree/_tree.scss */
.tree-item .label,
.search-result-item .label {
display: block;
@@ -4223,7 +4215,7 @@ ul.tree {
width: auto;
height: auto;
line-height: 1.5rem; }
/* line 69, ../../../../general/res/sass/tree/_tree.scss */
/* line 70, ../../../../general/res/sass/tree/_tree.scss */
.tree-item .label .type-icon,
.search-result-item .label .type-icon {
text-shadow: rgba(0, 0, 0, 0.6) 0 1px 2px;
@@ -4237,14 +4229,14 @@ ul.tree {
line-height: 100%;
right: auto;
width: 16px; }
/* line 82, ../../../../general/res/sass/tree/_tree.scss */
/* line 83, ../../../../general/res/sass/tree/_tree.scss */
.tree-item .label .type-icon .icon.l-icon-link, .tree-item .label .type-icon .icon.l-icon-alert,
.search-result-item .label .type-icon .icon.l-icon-link,
.search-result-item .label .type-icon .icon.l-icon-alert {
text-shadow: black 0 1px 2px;
position: absolute;
z-index: 2; }
/* line 88, ../../../../general/res/sass/tree/_tree.scss */
/* line 89, ../../../../general/res/sass/tree/_tree.scss */
.tree-item .label .type-icon .icon.l-icon-alert,
.search-result-item .label .type-icon .icon.l-icon-alert {
color: #ff3c00;
@@ -4254,7 +4246,7 @@ ul.tree {
width: 8px;
top: 1px;
right: -2px; }
/* line 94, ../../../../general/res/sass/tree/_tree.scss */
/* line 95, ../../../../general/res/sass/tree/_tree.scss */
.tree-item .label .type-icon .icon.l-icon-link,
.search-result-item .label .type-icon .icon.l-icon-link {
color: #49dedb;
@@ -4264,7 +4256,7 @@ ul.tree {
width: 8px;
left: -3px;
bottom: 0px; }
/* line 102, ../../../../general/res/sass/tree/_tree.scss */
/* line 103, ../../../../general/res/sass/tree/_tree.scss */
.tree-item .label .title-label,
.search-result-item .label .title-label {
overflow: hidden;
@@ -4280,67 +4272,59 @@ ul.tree {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; }
/* line 113, ../../../../general/res/sass/tree/_tree.scss */
/* line 114, ../../../../general/res/sass/tree/_tree.scss */
.tree-item.loading,
.search-result-item.loading {
pointer-events: none; }
/* line 115, ../../../../general/res/sass/tree/_tree.scss */
/* line 116, ../../../../general/res/sass/tree/_tree.scss */
.tree-item.loading .label,
.search-result-item.loading .label {
opacity: 0.5; }
/* line 117, ../../../../general/res/sass/tree/_tree.scss */
/* line 118, ../../../../general/res/sass/tree/_tree.scss */
.tree-item.loading .label .title-label,
.search-result-item.loading .label .title-label {
font-style: italic; }
/* line 121, ../../../../general/res/sass/tree/_tree.scss */
/* line 122, ../../../../general/res/sass/tree/_tree.scss */
.tree-item.loading .wait-spinner,
.search-result-item.loading .wait-spinner {
margin-left: 14px; }
/* line 126, ../../../../general/res/sass/tree/_tree.scss */
/* line 127, ../../../../general/res/sass/tree/_tree.scss */
.tree-item.selected,
.search-result-item.selected {
background: #005177;
color: #fff; }
background: #006080;
color: #cccccc; }
/* line 130, ../../../../general/res/sass/tree/_tree.scss */
.tree-item.selected .view-control,
.search-result-item.selected .view-control {
color: #0099cc; }
/* line 133, ../../../../general/res/sass/tree/_tree.scss */
.tree-item.selected .label .type-icon,
.search-result-item.selected .label .type-icon {
color: #fff; }
color: #cccccc; }
@media screen and (min-device-width: 800px) and (min-device-height: 1025px), screen and (min-device-width: 1025px) and (min-device-height: 800px) {
/* line 141, ../../../../general/res/sass/tree/_tree.scss */
/* line 138, ../../../../general/res/sass/tree/_tree.scss */
.tree-item:not(.selected):hover,
.search-result-item:not(.selected):hover {
background: rgba(255, 255, 255, 0.1);
background: rgba(153, 153, 153, 0.1);
color: #cccccc; }
/* line 144, ../../../../general/res/sass/tree/_tree.scss */
.tree-item:not(.selected):hover .context-trigger,
.search-result-item:not(.selected):hover .context-trigger {
display: block; }
/* line 147, ../../../../general/res/sass/tree/_tree.scss */
.tree-item:not(.selected):hover .icon,
.search-result-item:not(.selected):hover .icon {
color: #33ccff; } }
/* line 154, ../../../../general/res/sass/tree/_tree.scss */
/* line 151, ../../../../general/res/sass/tree/_tree.scss */
.tree-item:not(.loading),
.search-result-item:not(.loading) {
cursor: pointer; }
/* line 158, ../../../../general/res/sass/tree/_tree.scss */
/* line 155, ../../../../general/res/sass/tree/_tree.scss */
.tree-item .context-trigger,
.search-result-item .context-trigger {
top: -1px;
position: absolute;
right: 3px; }
/* line 164, ../../../../general/res/sass/tree/_tree.scss */
/* line 161, ../../../../general/res/sass/tree/_tree.scss */
.tree-item .context-trigger .invoke-menu,
.search-result-item .context-trigger .invoke-menu {
font-size: 0.75em;
height: 0.9rem;
line-height: 0.9rem; }
/* line 173, ../../../../general/res/sass/tree/_tree.scss */
/* line 170, ../../../../general/res/sass/tree/_tree.scss */
.tree-item .label {
left: 15px; }

20
platform/commonUI/themes/espresso/res/sass/_constants.scss
View File

@@ -6,11 +6,12 @@ $colorKey: #0099cc;
$colorKeySelectedBg: #005177;
$colorKeyFg: #fff;
$contrastRatio: 7%;
$colorBtnBg: pullForward($colorBodyBg, $contrastRatio);
$contrastRatioPercent: 7%;
$colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent);
$colorBtnFg: $colorBodyFg;
$colorBtnIcon: $colorKey;
$colorInvokeMenu: #fff;
$contrastInvokeMenuPercent: 20%;
$colorAlt1: #ffc700;
$colorAlert: #ff3c00;
@@ -47,7 +48,7 @@ $colorThumbsBubbleFg: lighten($colorBodyFg, 10%);
$colorThumbsBubbleBg: lighten($colorBodyBg, 10%);
// Overlay
$colorOvrBlocker: rgba(black, 0.7);
$colorOvrBg: $colorBodyBg;
$colorOvrBg: pullForward($colorBodyBg, 10%);
$colorOvrFg: $colorBodyFg;
// Items
$colorItemBase: lighten($colorBodyBg, 5%);
@@ -63,6 +64,17 @@ $tabularColorHeaderBorder: $colorBodyBg;
// Tree
$colorItemTreeIcon: $colorKey;
$colorItemTreeIconHover: lighten($colorItemTreeIcon, 20%);
$colorItemTreeFg: $colorBodyFg;
$colorItemTreeSelectedBg: pushBack($colorKey, 15%);
$colorItemTreeSelectedFg: pullForward($colorBodyFg, 20%);
$colorItemTreeVC: rgba(#fff, 0.3);
$colorItemTreeSelectedVC: $colorItemTreeVC;
$colorItemTreeVCHover: $colorAlt1;
$shdwItemTreeIcon: 0.6;
// Scrollbar
$scrollbarTrackColorBg: rgba(#000, 0.4);
$scrollbarTrackColorBg: rgba(#000, 0.4);
// Splitter
$splitterShdw: rgba(black, 0.4) 0 0 3px;
$colorSplitterInterior: $colorBodyBg;
$colorSplitterHover: none;
$colorGrippyInteriorHover: $colorKey;