diff --git a/LICENSES.md b/LICENSES.md index e7ab92507b..b6044d3ac4 100644 --- a/LICENSES.md +++ b/LICENSES.md @@ -309,30 +309,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI --- -### Modernizr - -#### Info - -* Link: http://modernizr.com - -* Version: 2.6.2 - -* Author: Faruk Ateş - -* Description: Browser/device capability finding - -#### License - -Copyright (c) 2009–2015 - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ---- - ### Normalize.css #### Info diff --git a/example/generator/bundle.js b/example/generator/bundle.js index 0c68e4509c..0a055a1bae 100644 --- a/example/generator/bundle.js +++ b/example/generator/bundle.js @@ -126,7 +126,7 @@ define([ { "name": "Period", "control": "textfield", - "cssclass": "l-small l-numeric", + "cssclass": "l-input-sm l-numeric", "key": "period", "required": true, "property": [ diff --git a/platform/commonUI/general/bundle.js b/platform/commonUI/general/bundle.js index 02512fc9fd..3e7f558e8b 100644 --- a/platform/commonUI/general/bundle.js +++ b/platform/commonUI/general/bundle.js @@ -177,10 +177,6 @@ define([ { "stylesheetUrl": "css/normalize.min.css", "priority": "mandatory" - }, - { - "stylesheetUrl": "css/reset.css", - "priority": "mandatory" } ], "templates": [ @@ -523,16 +519,6 @@ define([ } ], "licenses": [ - { - "name": "Modernizr", - "version": "2.6.2", - "description": "Browser/device capability finding", - "author": "Faruk Ateş", - "website": "http://modernizr.com", - "copyright": "Copyright (c) 2009–2015", - "license": "license-mit", - "link": "http://modernizr.com/license/" - }, { "name": "Normalize.css", "version": "1.1.2", diff --git a/platform/commonUI/general/res/sass/_global.scss b/platform/commonUI/general/res/sass/_global.scss index f5e151d0b6..27c08551df 100644 --- a/platform/commonUI/general/res/sass/_global.scss +++ b/platform/commonUI/general/res/sass/_global.scss @@ -84,6 +84,8 @@ p { margin-bottom: $interiorMarginLg; } +ol, ul { padding-left: 0; } + mct-container { display: block; } diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 0376064759..bc20fe9e1c 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -45,7 +45,6 @@ /********************************* FORMS */ @import "forms/elems"; -@import "forms/selects"; @import "forms/channel-selector"; @import "forms/datetime"; @import "forms/validation"; diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 67864fbf4c..a2bb0b73bb 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -74,6 +74,12 @@ .l-composite-control { vertical-align: middle; + &:not(.l-inline) { + margin-bottom: $interiorMargin; + } + &.l-inline { + display: inline-block; + } &.l-checkbox { .composite-control-label { line-height: 18px; @@ -108,12 +114,14 @@ font-size: 0.7rem; } +/******************************************************** CUSTOM CHECKBOXES */ label.checkbox.custom, label.radio.custom { $bg: pullForward($colorBodyBg, 10%); $d: $formRowCtrlsH; cursor: pointer; display: inline-block; + line-height: 120%; margin-right: $interiorMargin * 4; padding-left: $d + $interiorMargin; position: relative; @@ -161,7 +169,40 @@ label.radio.custom { label.checkbox.custom input:checked ~ em:before { content: "\32"; } label.radio.custom input:checked ~ em:before { content: "\e619"; } +.s-menu-btn label.checkbox.custom { + margin-left: 5px; +} + +.item .checkbox { + &.checked label { + box-shadow: none; + border-bottom: none; + } +} + +label.form-control.checkbox { + input { + margin-right: $interiorMargin; + vertical-align: top; + } +} + +/******************************************************** INPUTS */ +input[type="text"], +input[type="search"] { + @include nice-input(); + &.numeric { + text-align: right; + } +} + +.l-input-lg input[type="text"] { width: 100% !important; } +.l-input-med input[type="text"] { width: 200px !important; } +.l-input-sm input[type="text"] { width: 50px !important; } +.l-numeric input[type="text"] { text-align: right; } + .input-labeled { + // Used in toolbar margin-left: $interiorMargin; label { display: inline-block; @@ -175,28 +216,36 @@ label.radio.custom input:checked ~ em:before { content: "\e619"; } } } -.s-menu-btn label.checkbox.custom { - margin-left: 5px; -} - -.item .checkbox { - &.checked label { - box-shadow: none; - border-bottom: none; +/******************************************************** SELECTS */ +.select { + @include btnSubtle($colorSelectBg); + @if $shdwBtns != none { + margin: 0 0 2px 0; // Needed to avoid dropshadow from being clipped by parent containers } -} - -.context-available, -.s-icon-btn { - $c: $colorKey; - color: $c; - &:hover { - color: lighten($c, 10%); + padding: 0 $interiorMargin; + overflow: hidden; + position: relative; + line-height: $formInputH; + select { + @include appearance(none); + box-sizing: border-box; + background: none; + color: $colorSelectFg; + cursor: pointer; + border: none !important; + padding: 4px 25px 2px 0px; + width: 130%; + option { + margin: $interiorMargin 0; // Firefox + } + } + &:after { + @include contextArrow(); + pointer-events: none; + color: rgba($colorSelectFg, percentToDecimal($contrastInvokeMenuPercent)); + position: absolute; + right: $interiorMargin; top: 0; } -} - -.view-switcher { - @include trans-prop-nice-fade($controlFadeMs); } /******************************************************** OBJECT-HEADER */ @@ -330,7 +379,6 @@ body.desktop .object-header { } /******************************************************** SLIDERS */ - .slider { $knobH: 100%; .slot { @@ -424,7 +472,7 @@ body.desktop .object-header { border-top: 1px solid $colorInteriorBorder } .l-time-selects { - line-height: $formInputH; + line-height: inherit; } } @@ -478,11 +526,31 @@ body.desktop .object-header { } } -/******************************************************** BROWSER ELEMENTS */ +/******************************************************** TEXTAREA */ +textarea { + @include nice-textarea($colorInputBg, $colorInputFg); + position: absolute; + height: 100%; + width: 100%; +} +/******************************************************** MISC */ +.context-available, +.s-icon-btn { + $c: $colorKey; + color: $c; + &:hover { + color: lighten($c, 10%); + } +} + +.view-switcher { + @include trans-prop-nice-fade($controlFadeMs); +} + +/******************************************************** BROWSER ELEMENTS */ body.desktop { ::-webkit-scrollbar { - border-radius: 2px; box-sizing: border-box; box-shadow: inset $scrollbarTrackShdw; background-color: $scrollbarTrackColorBg; @@ -491,15 +559,15 @@ body.desktop { } ::-webkit-scrollbar-thumb { - $bg: $scrollbarThumbColor; - $hc: $scrollbarThumbColorHov; - $gr: 5%; - @include background-image(linear-gradient(lighten($bg, $gr), $bg 20px)); - border-radius: 2px; box-sizing: border-box; - &:hover { - @include background-image(linear-gradient(lighten($hc, $gr), $hc 20px)); - } + background: $scrollbarThumbColor; + &:hover { background: $scrollbarThumbColorHov; } + } + + .overlay ::-webkit-scrollbar-thumb { + $lr: 15%; + background: $scrollbarThumbColorOverlay; + &:hover { background: $scrollbarThumbColorOverlayHov; } } ::-webkit-scrollbar-corner { diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index 12fea8c41f..d84dc4c032 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -51,9 +51,6 @@ .title-label { font-size: 1rem; } - //&:after { - // color: rgba($colorInvokeMenu, 0.5); - //} } .menu { @@ -113,10 +110,10 @@ .menu, .context-menu, -.super-menu { +.super-menu, +.s-menu-btn .menu { pointer-events: auto; ul li { - //padding-left: 25px; a { color: $colorMenuFg; } @@ -126,9 +123,6 @@ .type-icon { left: $interiorMargin; } - &:hover .icon { - //color: lighten($colorMenuIc, 5%); - } } } @@ -146,7 +140,7 @@ height: $d; width: $d; &:before { - font-size: 7px !important;// $d/2; + font-size: 7px !important; height: $d; width: $d; line-height: $d; @@ -173,7 +167,6 @@ .pane { box-sizing: border-box; &.left { - //@include test(); border-right: 1px solid pullForward($colorMenuBg, 10%); left: 0; padding-right: $interiorMargin; @@ -190,7 +183,6 @@ } } &.right { - //@include test(red); left: auto; right: 0; padding: $interiorMargin * 5; @@ -216,7 +208,6 @@ margin-bottom: 0.5em; } &.description { - //color: lighten($colorMenuBg, 30%); color: $colorCreateMenuText; font-size: 0.8em; line-height: 1.5em; @@ -258,4 +249,4 @@ left: auto; right: 0; width: auto; -} \ No newline at end of file +} diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss index bea8a7d3dd..cabf4287d5 100644 --- a/platform/commonUI/general/res/sass/forms/_elems.scss +++ b/platform/commonUI/general/res/sass/forms/_elems.scss @@ -55,7 +55,6 @@ >.controls { box-sizing: border-box; font-size: 0.8rem; - min-height: $formInputH; } >.label { @@ -140,13 +139,6 @@ } } -label.form-control.checkbox { - input { - margin-right: $interiorMargin; - vertical-align: top; - } -} - .hint, .s-hint { font-size: 0.9em; @@ -166,31 +158,4 @@ label.form-control.checkbox { color: lighten($colorFormInvalid, 30%); padding: $interiorMargin; } -} - -input[type="text"], -input[type="search"] { - @include nice-input(); - &.numeric { - text-align: right; - } -} - -.l-input-med input[type="text"] { - width: 200px !important; -} - -.l-input-sm input[type="text"] { - width: 50px !important; -} - -.l-numeric input[type="text"] { - text-align: right; -} - -textarea { - @include nice-textarea($colorInputBg, $colorInputFg); - position: absolute; - height: 100%; - width: 100%; } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/forms/_selects.scss b/platform/commonUI/general/res/sass/forms/_selects.scss deleted file mode 100644 index 73fe1a547e..0000000000 --- a/platform/commonUI/general/res/sass/forms/_selects.scss +++ /dev/null @@ -1,51 +0,0 @@ -/***************************************************************************** - * Open MCT Web, Copyright (c) 2014-2015, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT Web is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT Web includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -.select { - @include btnSubtle($colorSelectBg); - @if $shdwBtns != none { - margin: 0 0 2px 0; // Needed to avoid dropshadow from being clipped by parent containers - } - padding: 0 $interiorMargin; - overflow: hidden; - position: relative; - line-height: $formInputH; - select { - @include appearance(none); - box-sizing: border-box; - background: none; - color: $colorSelectFg; - cursor: pointer; - border: none !important; - padding: 4px 25px 2px 0px; - width: 130%; - option { - margin: $interiorMargin 0; // Firefox - } - } - &:after { - @include contextArrow(); - pointer-events: none; - color: rgba($colorSelectFg, percentToDecimal($contrastInvokeMenuPercent)); - position: absolute; - right: $interiorMargin; top: 0; - } -} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/forms/_validation.scss b/platform/commonUI/general/res/sass/forms/_validation.scss index e82a7fdd3a..abbee079c5 100644 --- a/platform/commonUI/general/res/sass/forms/_validation.scss +++ b/platform/commonUI/general/res/sass/forms/_validation.scss @@ -23,9 +23,13 @@ > .label { padding-right: $reqSymbolM; // Keep room for validation element &::after { - float: right; + position: absolute; + right: $interiorMargin; font-family: symbolsfont; font-size: $reqSymbolFontSize; + height: 100%; + line-height: 200%; + } } &.invalid, diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index d49a2ee97c..bfacefa951 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -35,7 +35,6 @@ z-index: 100; } > .holder { - //$i: 15%; @include containerSubtle($colorOvrBg, $colorOvrFg); border-radius: $basicCr * 3; color: $colorOvrFg; @@ -57,15 +56,8 @@ right: $m; bottom: $m; left: $m; - - //.top-bar, - //.editor, - //.bottom-bar { - // @include absPosDefault(); - //} } } - .title { @include ellipsize(); font-size: 1.2em; @@ -120,7 +112,6 @@ bottom: 0; left: 0; overflow: visible; - //font-size: 1em; height: $ovrFooterH; } @@ -132,11 +123,14 @@ margin: .5em 0; width: 100%; } + + .select { + box-shadow: $shdwBtnsOverlay; + } } .t-dialog-sm .overlay > .holder { // Used for blocker and in-progress dialogs, modal alerts, etc. - //@include test(red); $h: 225px; min-height: $h; height: $h; diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index 3ed6cc276e..9c201db6df 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -27,6 +27,7 @@ $colorBtnIcon: $colorKey; $colorInvokeMenu: #fff; $contrastInvokeMenuPercent: 20%; $shdwBtns: rgba(black, 0.2) 0 1px 2px; +$shdwBtnsOverlay: rgba(black, 0.5) 0 1px 5px; $sliderColorBase: $colorKey; $sliderColorRangeHolder: rgba(black, 0.1); $sliderColorRange: rgba($sliderColorBase, 0.3); @@ -173,6 +174,8 @@ $scrollbarTrackShdw: rgba(#000, 0.7) 0 1px 5px; $scrollbarTrackColorBg: rgba(#000, 0.4); $scrollbarThumbColor: lighten($colorBodyBg, 10%); $scrollbarThumbColorHov: lighten($scrollbarThumbColor, 2%); +$scrollbarThumbColorOverlay: lighten($colorOvrBg, 10%); +$scrollbarThumbColorOverlayHov: lighten($scrollbarThumbColorOverlay, 2%); // Splitter $splitterD: 25px; // splitterD and HandleD should both be odd, or even diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index 4390bd092c..9206b3632b 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -27,6 +27,7 @@ $colorBtnIcon: #eee; $colorInvokeMenu: #000; $contrastInvokeMenuPercent: 40%; $shdwBtns: none; +$shdwBtnsOverlay: none; $sliderColorBase: $colorKey; $sliderColorRangeHolder: rgba(black, 0.07); $sliderColorRange: rgba($sliderColorBase, 0.2); @@ -170,9 +171,11 @@ $shdwItemTreeIcon: none; // Scrollbar $scrollbarTrackSize: 10px; $scrollbarTrackShdw: rgba(#000, 0.2) 0 1px 2px; -$scrollbarTrackColorBg: rgba(#000, 0.1); -$scrollbarThumbColor: darken($colorBodyBg, 50%);// +$scrollbarTrackColorBg: rgba(#000, 0.2); +$scrollbarThumbColor: darken($colorBodyBg, 50%); $scrollbarThumbColorHov: $colorKey; +$scrollbarThumbColorOverlay: darken($colorOvrBg, 50%); +$scrollbarThumbColorOverlayHov: $scrollbarThumbColorHov; // Splitter $splitterD: 24px; diff --git a/platform/core/bundle.js b/platform/core/bundle.js index 8f7b9f865b..3c56e7e51b 100644 --- a/platform/core/bundle.js +++ b/platform/core/bundle.js @@ -248,7 +248,7 @@ define([ "property": "name", "pattern": "\\S+", "required": true, - "cssclass": "l-med" + "cssclass": "l-input-lg" } ] }, diff --git a/platform/features/clock/bundle.js b/platform/features/clock/bundle.js index 1d22a3f8a0..dbc6d42e03 100644 --- a/platform/features/clock/bundle.js +++ b/platform/features/clock/bundle.js @@ -182,7 +182,8 @@ define([ "value": "hh:mm:ss", "name": "hh:mm:ss" } - ] + ], + "cssclass": "l-inline" }, { "control": "select", @@ -195,7 +196,8 @@ define([ "value": "clock24", "name": "24hr" } - ] + ], + "cssclass": "l-inline" } ] } @@ -223,6 +225,7 @@ define([ { "key": "timerFormat", "control": "select", + "name": "Display Format", "options": [ { "value": "long", diff --git a/platform/features/layout/bundle.js b/platform/features/layout/bundle.js index 493a910b97..37a7990b99 100644 --- a/platform/features/layout/bundle.js +++ b/platform/features/layout/bundle.js @@ -278,12 +278,12 @@ define([ { "name": "Horizontal grid (px)", "control": "textfield", - "cssclass": "l-small l-numeric" + "cssclass": "l-input-sm l-numeric" }, { "name": "Vertical grid (px)", "control": "textfield", - "cssclass": "l-small l-numeric" + "cssclass": "l-input-sm l-numeric" } ], "key": "layoutGrid", diff --git a/platform/features/pages/bundle.js b/platform/features/pages/bundle.js index 70119db5bd..03ee4c5a07 100644 --- a/platform/features/pages/bundle.js +++ b/platform/features/pages/bundle.js @@ -49,7 +49,8 @@ define([ "name": "URL", "control": "textfield", "pattern": "^(ftp|https?)\\:\\/\\/\\w+(\\.\\w+)*(\\:\\d+)?(\\/\\S*)*$", - "required": true + "required": true, + "cssclass": "l-input-lg" } ] }