From 5a991076ea4733b2abcc5322f0620c1d59ade466 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Mon, 31 Aug 2015 12:34:34 -0700 Subject: [PATCH 1/2] [Frontend] CSS and markup tweaks to enable flex layout open #93 Layout frame and imagery markup modified; --- .../general/res/css/theme-espresso.css | 178 +++++++++--------- .../general/res/sass/features/_imagery.scss | 5 - .../res/sass/user-environ/_layout.scss | 7 + .../imagery/res/templates/imagery.html | 2 +- 4 files changed, 98 insertions(+), 94 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 87add64e54..46bc99f786 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -121,7 +121,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, @@ -142,38 +142,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; } @@ -562,8 +562,15 @@ mct-container { .bar.abs .right .icon.major, .btn-menu span.bar.l-click-area .right .icon.major { margin-left: 15px; } + /* line 89, ../sass/user-environ/_layout.scss */ + .bar.abs .l-flex .left, .btn-menu span.bar.l-click-area .l-flex .left, + .bar.abs .l-flex .right, + .btn-menu span.bar.l-click-area .l-flex .right, .bar.abs.l-flex .left, .btn-menu span.bar.l-flex.l-click-area .left, + .bar.abs.l-flex .right, + .btn-menu span.bar.l-flex.l-click-area .right { + width: auto; } -/* line 91, ../sass/user-environ/_layout.scss */ +/* line 98, ../sass/user-environ/_layout.scss */ .user-environ .browse-area, .user-environ .edit-area, .user-environ .editor { @@ -571,23 +578,23 @@ mct-container { right: 10px; bottom: 35px; left: 10px; } -/* line 102, ../sass/user-environ/_layout.scss */ +/* line 109, ../sass/user-environ/_layout.scss */ .user-environ .browse-area > .contents, .user-environ .edit-area > .contents { left: 0; right: 0; } -/* line 108, ../sass/user-environ/_layout.scss */ +/* line 115, ../sass/user-environ/_layout.scss */ .user-environ .edit-area { top: 45px; } - /* line 111, ../sass/user-environ/_layout.scss */ + /* line 118, ../sass/user-environ/_layout.scss */ .user-environ .edit-area .tool-bar { bottom: auto; height: 30px; line-height: 25px; } - /* line 116, ../sass/user-environ/_layout.scss */ + /* line 123, ../sass/user-environ/_layout.scss */ .user-environ .edit-area .work-area { top: 40px; } -/* line 121, ../sass/user-environ/_layout.scss */ +/* line 128, ../sass/user-environ/_layout.scss */ .user-environ .ue-bottom-bar { overflow: hidden; position: absolute; @@ -599,20 +606,20 @@ mct-container { height: auto; top: auto; height: 25px; } - /* line 126, ../sass/user-environ/_layout.scss */ + /* line 133, ../sass/user-environ/_layout.scss */ .user-environ .ue-bottom-bar .status-holder { z-index: 1; } - /* line 130, ../sass/user-environ/_layout.scss */ + /* line 137, ../sass/user-environ/_layout.scss */ .user-environ .ue-bottom-bar .app-logo { left: auto; width: 105px; z-index: 2; } -/* line 138, ../sass/user-environ/_layout.scss */ +/* line 145, ../sass/user-environ/_layout.scss */ .cols { overflow: hidden; *zoom: 1; } - /* line 140, ../sass/user-environ/_layout.scss */ + /* line 147, ../sass/user-environ/_layout.scss */ .cols .col { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -623,111 +630,111 @@ mct-container { margin-left: 1.5%; padding-left: 5px; position: relative; } - /* line 148, ../sass/user-environ/_layout.scss */ + /* line 155, ../sass/user-environ/_layout.scss */ .cols .col:first-child { margin-left: 0; padding-left: 0; } - /* line 155, ../sass/user-environ/_layout.scss */ + /* line 162, ../sass/user-environ/_layout.scss */ .cols.cols-2 .col-1 { min-width: 250px; width: 48.5%; } - /* line 161, ../sass/user-environ/_layout.scss */ + /* line 168, ../sass/user-environ/_layout.scss */ .cols.cols-2-ff .col-100px { width: 100px; } - /* line 168, ../sass/user-environ/_layout.scss */ + /* line 175, ../sass/user-environ/_layout.scss */ .cols.cols-6 .col-1 { min-width: 83.33333px; width: 15.16667%; } - /* line 174, ../sass/user-environ/_layout.scss */ + /* line 181, ../sass/user-environ/_layout.scss */ .cols.cols-16 .col-1 { min-width: 31.25px; width: 4.75%; } - /* line 177, ../sass/user-environ/_layout.scss */ + /* line 184, ../sass/user-environ/_layout.scss */ .cols.cols-16 .col-2 { min-width: 62.5px; width: 11%; } - /* line 180, ../sass/user-environ/_layout.scss */ + /* line 187, ../sass/user-environ/_layout.scss */ .cols.cols-16 .col-7 { min-width: 218.75px; width: 42.25%; } - /* line 186, ../sass/user-environ/_layout.scss */ + /* line 193, ../sass/user-environ/_layout.scss */ .cols.cols-32 .col-2 { min-width: 31.25px; width: 4.75%; } - /* line 189, ../sass/user-environ/_layout.scss */ + /* line 196, ../sass/user-environ/_layout.scss */ .cols.cols-32 .col-15 { min-width: 234.375px; width: 45.375%; } - /* line 193, ../sass/user-environ/_layout.scss */ + /* line 200, ../sass/user-environ/_layout.scss */ .cols .l-row { overflow: hidden; *zoom: 1; padding: 5px 0; } -/* line 201, ../sass/user-environ/_layout.scss */ +/* line 208, ../sass/user-environ/_layout.scss */ .browse-mode .split-layout .split-pane-component.pane.left { min-width: 150px; max-width: 800px; width: 25%; } -/* line 214, ../sass/user-environ/_layout.scss */ +/* line 221, ../sass/user-environ/_layout.scss */ .edit-mode .split-layout .split-pane-component.pane.right .split-pane-component.pane.bottom { min-height: 50px; max-height: 80%; } -/* line 222, ../sass/user-environ/_layout.scss */ +/* line 229, ../sass/user-environ/_layout.scss */ .pane { position: absolute; } - /* line 225, ../sass/user-environ/_layout.scss */ + /* line 232, ../sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder { bottom: auto; top: 0; height: 24px; } - /* line 228, ../sass/user-environ/_layout.scss */ + /* line 235, ../sass/user-environ/_layout.scss */ .pane.treeview.left .create-btn-holder .wrapper.menu-element { position: absolute; bottom: 5px; } - /* line 233, ../sass/user-environ/_layout.scss */ + /* line 240, ../sass/user-environ/_layout.scss */ .pane.treeview.left .search-holder { top: 34px; } - /* line 236, ../sass/user-environ/_layout.scss */ + /* line 243, ../sass/user-environ/_layout.scss */ .pane.treeview.left .tree-holder { overflow: auto; top: 64px; } - /* line 243, ../sass/user-environ/_layout.scss */ + /* line 250, ../sass/user-environ/_layout.scss */ .pane.items .object-browse-bar .left.abs, .pane.items .object-browse-bar .btn-menu span.left.l-click-area, .btn-menu .pane.items .object-browse-bar span.left.l-click-area, .pane.items .object-browse-bar .right.abs, .pane.items .object-browse-bar .btn-menu span.right.l-click-area, .btn-menu .pane.items .object-browse-bar span.right.l-click-area { top: auto; } - /* line 254, ../sass/user-environ/_layout.scss */ + /* line 261, ../sass/user-environ/_layout.scss */ .pane.items .object-holder { top: 34px; } - /* line 258, ../sass/user-environ/_layout.scss */ + /* line 265, ../sass/user-environ/_layout.scss */ .pane .object-holder { overflow: auto; } -/* line 266, ../sass/user-environ/_layout.scss */ +/* line 273, ../sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane { margin-top: 5px; } - /* line 269, ../sass/user-environ/_layout.scss */ + /* line 276, ../sass/user-environ/_layout.scss */ .split-layout.horizontal > .pane:first-child { margin-top: 0; } -/* line 276, ../sass/user-environ/_layout.scss */ +/* line 283, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane { margin-left: 5px; } - /* line 279, ../sass/user-environ/_layout.scss */ + /* line 286, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane > .holder { left: 0; right: 0; } - /* line 283, ../sass/user-environ/_layout.scss */ + /* line 290, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child { margin-left: 0; } - /* line 285, ../sass/user-environ/_layout.scss */ + /* line 292, ../sass/user-environ/_layout.scss */ .split-layout.vertical > .pane:first-child .holder { right: 3px; } -/* line 294, ../sass/user-environ/_layout.scss */ +/* line 301, ../sass/user-environ/_layout.scss */ .object-browse-bar .btn, .object-browse-bar .t-btn, .object-browse-bar .view-switcher, @@ -741,12 +748,12 @@ mct-container { line-height: 200%; vertical-align: top; } -/* line 311, ../sass/user-environ/_layout.scss */ +/* line 318, ../sass/user-environ/_layout.scss */ .object-browse-bar .view-switcher, .top-bar .view-switcher { margin-right: 20px; } -/* line 316, ../sass/user-environ/_layout.scss */ +/* line 323, ../sass/user-environ/_layout.scss */ .object-browse-bar { overflow: visible; position: absolute; @@ -762,27 +769,27 @@ mct-container { height: 24px; line-height: 24px; white-space: nowrap; } - /* line 324, ../sass/user-environ/_layout.scss */ + /* line 331, ../sass/user-environ/_layout.scss */ .object-browse-bar .left { padding-right: 20px; } - /* line 326, ../sass/user-environ/_layout.scss */ + /* line 333, ../sass/user-environ/_layout.scss */ .object-browse-bar .left .l-back { display: inline-block; float: left; margin-right: 10px; } -/* line 334, ../sass/user-environ/_layout.scss */ +/* line 341, ../sass/user-environ/_layout.scss */ .l-flex { display: flex; display: -webkit-flex; flex-flow: row nowrap; -webkit-flex-flow: row nowrap; } - /* line 337, ../sass/user-environ/_layout.scss */ + /* line 344, ../sass/user-environ/_layout.scss */ .l-flex .left { flex: 1 1 0; -webkit-flex: 1 1 0; } -/* line 343, ../sass/user-environ/_layout.scss */ +/* line 350, ../sass/user-environ/_layout.scss */ .vscroll { overflow-y: auto; } @@ -3320,8 +3327,6 @@ label.checkbox.custom { .l-image-main-wrapper, .l-image-main, .l-image-main-controlbar, -.l-image-main-controlbar .left, -.l-image-main-controlbar .right, .l-image-thumbs-wrapper { overflow: false; position: absolute; @@ -3333,82 +3338,79 @@ label.checkbox.custom { height: auto; } /*************************************** MAIN LAYOUT */ -/* line 11, ../sass/features/_imagery.scss */ +/* line 9, ../sass/features/_imagery.scss */ .l-image-main-wrapper { min-height: 100px; min-width: 150px; } - /* line 18, ../sass/features/_imagery.scss */ + /* line 16, ../sass/features/_imagery.scss */ .l-image-main-wrapper .l-image-main { background-color: rgba(255, 255, 255, 0.1); bottom: 27px; } - /* line 22, ../sass/features/_imagery.scss */ + /* line 20, ../sass/features/_imagery.scss */ .l-image-main-wrapper .l-image-main-controlbar { top: auto; height: 22px; } -/* line 28, ../sass/features/_imagery.scss */ +/* line 26, ../sass/features/_imagery.scss */ .l-image-thumbs-wrapper { top: auto; height: 168px; } -/* line 34, ../sass/features/_imagery.scss */ +/* line 32, ../sass/features/_imagery.scss */ .l-date, .l-time, .l-timezone { display: inline-block; } /*************************************** MAIN IMAGE */ -/* line 42, ../sass/features/_imagery.scss */ +/* line 40, ../sass/features/_imagery.scss */ .l-image-main, .l-image-thumb-item .l-thumb { background-size: contain; background-position: center; background-repeat: no-repeat; } -/* line 53, ../sass/features/_imagery.scss */ +/* line 51, ../sass/features/_imagery.scss */ .l-image-main-controlbar { font-size: 0.8em; line-height: 22px; } - /* line 57, ../sass/features/_imagery.scss */ + /* line 55, ../sass/features/_imagery.scss */ .l-image-main-controlbar .left, .l-image-main-controlbar .right { direction: rtl; overflow: hidden; } - /* line 61, ../sass/features/_imagery.scss */ + /* line 59, ../sass/features/_imagery.scss */ .l-image-main-controlbar .left { - text-align: left; - width: 75% !important; } - /* line 66, ../sass/features/_imagery.scss */ + text-align: left; } + /* line 63, ../sass/features/_imagery.scss */ .l-image-main-controlbar .right { - min-width: 40px; - width: 25% !important; z-index: 2; } - /* line 72, ../sass/features/_imagery.scss */ + /* line 67, ../sass/features/_imagery.scss */ .l-image-main-controlbar .l-date, .l-image-main-controlbar .l-time { color: #fff; } - /* line 76, ../sass/features/_imagery.scss */ + /* line 71, ../sass/features/_imagery.scss */ .l-image-main-controlbar .l-mag { direction: ltr; display: inline-block; } - /* line 80, ../sass/features/_imagery.scss */ + /* line 75, ../sass/features/_imagery.scss */ .l-image-main-controlbar .l-mag:before { content: "\000049"; } - /* line 84, ../sass/features/_imagery.scss */ + /* line 79, ../sass/features/_imagery.scss */ .l-image-main-controlbar .s-mag { color: #666666; } - /* line 87, ../sass/features/_imagery.scss */ + /* line 82, ../sass/features/_imagery.scss */ .l-image-main-controlbar .l-btn.show-thumbs { display: none; } -/* line 92, ../sass/features/_imagery.scss */ +/* line 87, ../sass/features/_imagery.scss */ .s-image-main { border: 1px solid transparent; } - /* line 94, ../sass/features/_imagery.scss */ + /* line 89, ../sass/features/_imagery.scss */ .s-image-main.paused { border-color: #c56f01; } /*************************************** THUMBS */ -/* line 101, ../sass/features/_imagery.scss */ +/* line 96, ../sass/features/_imagery.scss */ .l-image-thumbs-wrapper { direction: rtl; overflow-x: auto; @@ -3417,7 +3419,7 @@ label.checkbox.custom { white-space: nowrap; z-index: 70; } -/* line 111, ../sass/features/_imagery.scss */ +/* line 106, ../sass/features/_imagery.scss */ .l-image-thumb-item { -moz-transition: background-color 0.25s; -o-transition: background-color 0.25s; @@ -3436,30 +3438,30 @@ label.checkbox.custom { text-align: left; width: 122px; white-space: normal; } - /* line 116, ../sass/features/_imagery.scss */ + /* line 111, ../sass/features/_imagery.scss */ .l-image-thumb-item .l-thumb, .l-image-thumb-item .l-date, .l-image-thumb-item .l-time { display: inline-block; } - /* line 121, ../sass/features/_imagery.scss */ + /* line 116, ../sass/features/_imagery.scss */ .l-image-thumb-item .l-date, .l-image-thumb-item .l-time { padding: 2px 3px; } - /* line 133, ../sass/features/_imagery.scss */ + /* line 128, ../sass/features/_imagery.scss */ .l-image-thumb-item:hover { background: rgba(255, 255, 255, 0.2); } - /* line 135, ../sass/features/_imagery.scss */ + /* line 130, ../sass/features/_imagery.scss */ .l-image-thumb-item:hover .l-date, .l-image-thumb-item:hover .l-time { color: #fff; } - /* line 140, ../sass/features/_imagery.scss */ + /* line 135, ../sass/features/_imagery.scss */ .l-image-thumb-item.selected { background: #005177; } - /* line 142, ../sass/features/_imagery.scss */ + /* line 137, ../sass/features/_imagery.scss */ .l-image-thumb-item.selected .l-date, .l-image-thumb-item.selected .l-time { color: #fff; } - /* line 147, ../sass/features/_imagery.scss */ + /* line 142, ../sass/features/_imagery.scss */ .l-image-thumb-item .l-thumb { background-color: rgba(255, 255, 255, 0.1); height: 120px; @@ -3467,13 +3469,13 @@ label.checkbox.custom { margin-top: 0; } /*************************************** WHEN IN FRAME */ -/* line 157, ../sass/features/_imagery.scss */ +/* line 152, ../sass/features/_imagery.scss */ .frame .t-imagery .l-image-main-wrapper { bottom: 0; } - /* line 159, ../sass/features/_imagery.scss */ + /* line 154, ../sass/features/_imagery.scss */ .frame .t-imagery .l-image-main-wrapper .l-image-main-controlbar { font-size: 0.7em; } -/* line 168, ../sass/features/_imagery.scss */ +/* line 163, ../sass/features/_imagery.scss */ .frame .t-imagery .l-image-thumbs-wrapper { display: none; } diff --git a/platform/commonUI/general/res/sass/features/_imagery.scss b/platform/commonUI/general/res/sass/features/_imagery.scss index fa0b092fbf..c86556fd04 100644 --- a/platform/commonUI/general/res/sass/features/_imagery.scss +++ b/platform/commonUI/general/res/sass/features/_imagery.scss @@ -1,8 +1,6 @@ .l-image-main-wrapper, .l-image-main, .l-image-main-controlbar, -.l-image-main-controlbar .left, -.l-image-main-controlbar .right, .l-image-thumbs-wrapper { @include absPosDefault(0, false); } @@ -61,12 +59,9 @@ .left { //@include test(red); text-align: left; - width: 75% !important; } .right { //@include test(green); - min-width: 40px; - width: 25% !important; z-index: 2; } .l-date, diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 04b582d123..d5e89c27fb 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -84,6 +84,13 @@ margin-left: $interiorMargin * 3; } } + .l-flex, + &.l-flex { + .left, + .right { + width: auto; + } + } } } diff --git a/platform/features/imagery/res/templates/imagery.html b/platform/features/imagery/res/templates/imagery.html index 80f0813b2b..2b1f8f969e 100644 --- a/platform/features/imagery/res/templates/imagery.html +++ b/platform/features/imagery/res/templates/imagery.html @@ -33,7 +33,7 @@ > -
+
Date: Mon, 31 Aug 2015 12:54:52 -0700 Subject: [PATCH 2/2] [Frontend] Super-minor cleanups in .scss files open #93 --- platform/commonUI/general/res/css/theme-espresso.css | 1 - platform/commonUI/general/res/sass/_main.scss | 1 - .../commonUI/general/res/sass/themes/_theme-espresso.scss | 4 +++- platform/commonUI/general/res/sass/tree.scss | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 46bc99f786..38c9695ec6 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -99,7 +99,6 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ /* CONSTANTS */ -/***************************************************************************** /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 347087f24f..43947dcc51 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -1,4 +1,3 @@ -/***************************************************************************** /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space diff --git a/platform/commonUI/general/res/sass/themes/_theme-espresso.scss b/platform/commonUI/general/res/sass/themes/_theme-espresso.scss index d165be8929..edda0a1489 100644 --- a/platform/commonUI/general/res/sass/themes/_theme-espresso.scss +++ b/platform/commonUI/general/res/sass/themes/_theme-espresso.scss @@ -19,4 +19,6 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* CONSTANTS */ \ No newline at end of file +/* CONSTANTS */ +//$colorBodyBg: #fff; +//$colorBodyFg: #666; \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/tree.scss b/platform/commonUI/general/res/sass/tree.scss index 5a28f94641..881b105a7a 100644 --- a/platform/commonUI/general/res/sass/tree.scss +++ b/platform/commonUI/general/res/sass/tree.scss @@ -21,8 +21,6 @@ *****************************************************************************/ @import "compass"; @import "compass/css3"; -@import "compass/css3/border-radius"; -@import "compass/css3/opacity"; @import "compass/utilities"; @import "constants";