diff --git a/src/styles-new/_global.scss b/src/styles-new/_global.scss index 531878a499..115cc0fdae 100644 --- a/src/styles-new/_global.scss +++ b/src/styles-new/_global.scss @@ -1,8 +1,7 @@ /************************** FONTS */ @font-face { /* - * Use https://icomoon.io/app with icomoon-project-openmct-symbols-16px.json - * to generate font files + * Use https://icomoon.io/app with icomoon-project-openmct-symbols-16px.json to generate font files */ font-family: 'symbolsfont'; src: url($dirFonts + 'openmct-symbols-16px.eot'); @@ -16,8 +15,7 @@ @font-face { /* - * Use https://icomoon.io/app with icomoon-project-openmct-symbols-12px.json - * to generate font files + * Use https://icomoon.io/app with icomoon-project-openmct-symbols-12px.json to generate font files */ font-family: 'symbolsfont-12px'; src: url($dirFonts + 'openmct-symbols-12px.eot'); @@ -29,6 +27,15 @@ font-style: normal; } +/******************************* RESETS */ +* { + box-sizing: border-box; +} + +div { + position: relative; +} + /************************** HTML ENTITIES */ a { //color: $colorA; @@ -44,7 +51,7 @@ body, html { //background-color: $colorBodyBg; //color: $colorBodyFg; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 12px; + font-size: 13px; font-weight: normal; height: 100%; width: 100%; @@ -74,9 +81,9 @@ h1 { margin-top: 0; } -//p { -// margin-bottom: $interiorMarginLg; -//} +p { + margin-bottom: $interiorMarginLg; +} ol, ul { list-style: none; diff --git a/src/styles-new/_mixins.scss b/src/styles-new/_mixins.scss new file mode 100644 index 0000000000..545b4fcdf2 --- /dev/null +++ b/src/styles-new/_mixins.scss @@ -0,0 +1,83 @@ +/***************************************************************************** + * Open MCT, Copyright (c) 2014-2018, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT 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 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. + *****************************************************************************/ + +@mixin ancillaryIcon($d, $c) { + // Used for small icons used in combination with larger icons, + // like the link and alert icons in tree items. + color: $c; + font-size: $d; + line-height: $d; + height: $d; + width: $d; +} + +@mixin bgDiagonalStripes($c: yellow, $a: 0.1, $d: 40px) { + @include background-image(linear-gradient(-45deg, + rgba($c, $a) 25%, transparent 25%, + transparent 50%, rgba($c, $a) 50%, + rgba($c, $a) 75%, transparent 75%, + transparent 100% + )); + background-repeat: repeat; + background-size: $d $d; +} + +@mixin bgStripes($c: yellow, $a: 0.1, $bgsize: 5px, $angle: 90deg) { + @include background-image(linear-gradient($angle, + rgba($c, $a) 25%, transparent 25%, + transparent 50%, rgba($c, $a) 50%, + rgba($c, $a) 75%, transparent 75%, + transparent 100% + )); + background-repeat: repeat; + background-size: $bgsize $bgsize; +} + +@mixin bgVertStripes($c: yellow, $a: 0.1, $d: 40px) { + @include background-image(linear-gradient(-90deg, + rgba($c, $a) 0%, rgba($c, $a) 50%, + transparent 50%, transparent 100% + )); + background-repeat: repeat; + background-size: $d $d; +} + + +@function percentToDecimal($p) { + @return $p / 100%; +} + +@function decimalToPercent($d) { + @return percentage($d); +} + +@mixin ellipsize() { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +@mixin reverseEllipsis() { + @include ellipsize(); + direction: rtl; + unicode-bidi:bidi-override; +} \ No newline at end of file diff --git a/src/ui/components/layout/Layout.vue b/src/ui/components/layout/Layout.vue index c7dc241521..b42cf193c2 100644 --- a/src/ui/components/layout/Layout.vue +++ b/src/ui/components/layout/Layout.vue @@ -1,20 +1,108 @@