diff --git a/src/plugins/displayLayout/components/SubobjectView.vue b/src/plugins/displayLayout/components/SubobjectView.vue index 64d6976042..90f134dd5d 100644 --- a/src/plugins/displayLayout/components/SubobjectView.vue +++ b/src/plugins/displayLayout/components/SubobjectView.vue @@ -23,7 +23,7 @@
-
{{ item.domainObject.name }}
@@ -48,42 +48,40 @@ &__header { display: flex; align-items: center; - flex: 0 0 auto; - margin-bottom: $interiorMargin; - > [class*="__"] { + &__start, + &__end { display: flex; - align-items: center; - } - - > * + * { - margin-left: $interiorMargin; - } - - [class*="__start"] { flex: 1 1 auto; - overflow: hidden; } - [class*="__end"] { - //justify-content: flex-end; - flex: 0 0 auto; + &__end { + justify-content: flex-end; + } - [class*="button"] { - font-size: 0.7em; + &__name { + @include headerFont(1em); + display: flex; + &:before { + margin-right: $interiorMarginSm; } } + + .no-frame & { + display: none; + } } &__name { @include ellipsize(); + @include headerFont(1.2em); flex: 0 1 auto; - font-size: 1.2em; &:before { // Object type icon flex: 0 0 auto; margin-right: $interiorMarginSm; + opacity: 0.5; } } diff --git a/src/plugins/folderView/components/GridItem.vue b/src/plugins/folderView/components/GridItem.vue index 561dc0db0e..5f9ea195bf 100644 --- a/src/plugins/folderView/components/GridItem.vue +++ b/src/plugins/folderView/components/GridItem.vue @@ -57,8 +57,7 @@ &__name { @include ellipsize(); color: $colorItemFg; - font-size: 1.2em; - font-weight: 400; + @include headerFont(1.2em); margin-bottom: $interiorMarginSm; } diff --git a/src/plugins/tabs/components/tabs.vue b/src/plugins/tabs/components/tabs.vue index ecaf8d6140..1a461d9185 100644 --- a/src/plugins/tabs/components/tabs.vue +++ b/src/plugins/tabs/components/tabs.vue @@ -66,6 +66,7 @@ &__object-name { flex: 0 0 auto; + @include headerFont(); font-size: 1.2em !important; margin: $interiorMargin 0 $interiorMarginLg 0; } diff --git a/src/styles-new/_constants-espresso.scss b/src/styles-new/_constants-espresso.scss index b0ca616ba7..1759453aa8 100644 --- a/src/styles-new/_constants-espresso.scss +++ b/src/styles-new/_constants-espresso.scss @@ -22,7 +22,25 @@ /************************************************** ESPRESSO THEME CONSTANTS */ -@import "constants"; +// Fonts +$heroFont: "Helvetica Neue", Helvetica, Arial, sans-serif; +$headerFont: $heroFont; +$bodyFont: $heroFont; + +@mixin heroFont($size: 1em) { + font-family: $heroFont; + font-size: $size; +} + +@mixin headerFont($size: 1em) { + font-family: $headerFont; + font-size: $size; +} + +@mixin bodyFont($size: 1em) { + font-family: $bodyFont; + font-size: $size; +} // Functions @function buttonBg($c: $colorBtnBg) { @@ -257,7 +275,7 @@ $colorItemTreeSelectedBg: darken($colorKey, 15%); $colorItemTreeSelectedFg: $colorBodyBg; $colorItemTreeEditingBg: $editColor; $colorItemTreeEditingFg: $editColorFg; -$colorItemTreeVC: $colorBodyFg; +$colorItemTreeVC: rgba($colorBodyFg, 0.5); $colorItemTreeVCHover: $colorKey; $shdwItemTreeIcon: none; diff --git a/src/styles-new/_constants-maelstrom.scss b/src/styles-new/_constants-maelstrom.scss new file mode 100644 index 0000000000..57840434b9 --- /dev/null +++ b/src/styles-new/_constants-maelstrom.scss @@ -0,0 +1,370 @@ +/***************************************************************************** + * 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. + *****************************************************************************/ + +/************************************************** MAELSTROM2 THEME CONSTANTS */ + +// Fonts +@import url('https://fonts.googleapis.com/css?family=Chakra+Petch:400,600,700|Michroma|Teko:400,700'); + +$heroFont: 'Teko', sans-serif; +$headerFont: 'Michroma', sans-serif; +$bodyFont: 'Chakra Petch', sans-serif; + +@mixin heroFont($size: 1em) { + font-family: $heroFont; + font-size: $size; +} + +@mixin headerFont($size: 1em) { + font-family: $headerFont; + font-size: $size * 0.8; // This font is comparatively large, so reduce it a bit + text-transform: uppercase; + word-spacing: 0.25em; +} + +@mixin bodyFont($size: 1em) { + font-family: $bodyFont; + font-size: $size; +} + +// Functions +@function buttonBg($c: $colorBtnBg) { + @return linear-gradient(lighten($c, 5%), $c); +} + +// Constants +$fontBaseSize: 12px; +$smallCr: 2px; +$controlCr: 3px; +$basicCr: 4px; + +// Base colors +$colorBodyBg: #393939; +$colorBodyFg: #ccc; +$colorGenBg: #222; +$colorHeadBg: #262626; +$colorHeadFg: $colorBodyFg; +$colorStatusBarBg: $colorHeadBg; +$colorStatusBarFg: $colorBodyFg; +$colorStatusBarFgHov: #aaa; +$colorKey: #0099cc; +$colorKeyFg: #fff; +$colorKeyHov: #00c0f6; +$colorKeyFilter: invert(36%) sepia(76%) saturate(2514%) hue-rotate(170deg) brightness(99%) contrast(101%); +$colorKeyFilterHov: invert(63%) sepia(88%) saturate(3029%) hue-rotate(154deg) brightness(101%) contrast(100%); +$colorKeySelectedBg: $colorKey; +$colorInteriorBorder: rgba($colorBodyFg, 0.2); +$colorA: #ccc; +$colorAHov: #fff; + +// Layout +$shellMainPad: 4px 0; +$shellPanePad: $interiorMargin, 7px; + +// Status colors, mainly used for messaging and item ancillary symbols +$colorStatusFg: #999; +$colorStatusDefault: #ccc; +$colorStatusInfo: #60ba7b; +$colorStatusInfoFilter: invert(58%) sepia(44%) saturate(405%) hue-rotate(85deg) brightness(102%) contrast(92%); +$colorStatusAlert: #ffb66c; +$colorStatusAlertFilter: invert(78%) sepia(26%) saturate(1160%) hue-rotate(324deg) brightness(107%) contrast(101%); +$colorStatusError: #da0004; +$colorStatusErrorFilter: invert(10%) sepia(96%) saturate(4360%) hue-rotate(351deg) brightness(111%) contrast(115%); +$colorStatusBtnBg: #666; // Where is this used? + +// States +$colorPausedBg: #ff9900; +$colorPausedFg: #fff; +$colorOk: #33cc33; + +// Base variations +$colorBodyBgSubtle: lighten($colorBodyBg, 5%); +$colorBodyBgSubtleHov: darken($colorKey, 50%); +$colorKeySubtle: darken($colorKey, 10%); + +// Time Colors +$colorTime: #618cff; +$colorTimeBg: $colorTime; +$colorTimeFg: lighten($colorTimeBg, 30%); +$colorTimeHov: lighten($colorTime, 10%); +$colorTimeSubtle: darken($colorTime, 20%); +$colorTOI: $colorBodyFg; // was $timeControllerToiLineColor +$colorTOIHov: $colorTime; // was $timeControllerToiLineColorHov + +/************************************************** EDITING */ +// Base Colors +$dlSpread: 20%; +$editColor: #00c7c3; +$editColorBg: darken($editColor, $dlSpread); +$editColorFg: lighten($editColor, $dlSpread); +$editColorHov: lighten($editColor, 20%); +// Canvas +$editCanvasColorBg: #002524; +$editCanvasColorGrid: darken($editCanvasColorBg, 2%); +// Selectable +$editSelectableColor: #006563; +$editSelectableColorFg: lighten($editSelectableColor, 20%); +$editSelectableColorHov: lighten($editSelectableColor, 10%); +// Selectable selected +$editSelectableColorSelected: $editSelectableColorHov; +$editSelectableColorSelectedFg: lighten($editSelectableColorSelected, 30%); +$editSelectableColorFg: darken($editSelectableColor, 40%); +$editSelectableBorder: 1px dotted $editSelectableColor; +$editSelectableBorderHov: 1px dotted $editColor; +$editSelectableBorderSelected: 1px solid $editColor; +$editMoveableSelectedShdw: rgba($editColor, 0.5) 0 0 10px; +$editBorderDrilledIn: 1px dashed #9971ff; +$colorGridLines: rgba($editColor, 0.2); + +/************************************************** BROWSING */ +$browseBorderSelectableHov: 1px dotted rgba($colorBodyFg, 0.2); +$browseShdwSelectableHov: rgba($colorBodyFg, 0.2) 0 0 3px; +$browseBorderSelected: 1px solid rgba($colorBodyFg, 0.6); + +// Icons +$colorIconAlias: #4af6f3; +$colorIconAliasForKeyFilter: #aaa; + +// Holders +$colorTabsHolderBg: rgba(black, 0.2); + +// Buttons and Controls +$colorBtnBg: lighten($colorBodyBg, 10%); +$colorBtnBgHov: lighten($colorBtnBg, 10%); +$colorBtnFg: lighten($colorBodyFg, 10%); +$colorBtnReverseFg: lighten($colorBtnFg, 10%); +$colorBtnReverseBg: lighten($colorBtnBg, 10%); +$colorBtnFgHov: $colorBtnFg; +$colorBtnMajorBg: $colorKey; +$colorBtnMajorBgHov: $colorKeyHov; +$colorBtnMajorFg: $colorKeyFg; +$colorBtnMajorFgHov: darken($colorBtnMajorFg, 10%); +$colorBtnCautionBg: #f16f6f; +$colorBtnCautionBgHov: #f1504e; +$colorBtnCautionFg: $colorBtnFg; +$colorClickIcon: $colorKey; +$colorClickIconBgHov: rgba($colorKey, 0.6); +$colorClickIconFgHov: $colorKeyHov; +$colorDropHint: $colorKey; +$colorDropHintBg: darken($colorDropHint, 10%); +$colorDropHintBgHov: $colorDropHint; +$colorDropHintFg: lighten($colorDropHint, 40%); + +// Menus +$colorMenuBg: lighten($colorBodyBg, 15%); +$colorMenuFg: lighten($colorBodyFg, 30%); +$colorMenuIc: lighten($colorKey, 15%); +$colorMenuHovBg: $colorMenuIc; +$colorMenuHovFg: lighten($colorMenuFg, 10%); +$colorMenuHovIc: $colorMenuHovFg; +$colorMenuElementHilite: lighten($colorMenuBg, 10%); +$shdwMenu: rgba(black, 0.5) 0 1px 5px; +$shdwMenuText: none; +$menuItemPad: $interiorMargin, floor($interiorMargin * 1.25); + +// Palettes and Swatches +$paletteItemBorderOuterColorSelected: black; +$paletteItemBorderInnerColorSelected: white; +$paletteItemBorderInnerColor: rgba($paletteItemBorderOuterColorSelected, 0.3); + +// Form colors +$colorCheck: $colorKey; +$colorFormRequired: $colorKey; +$colorFormValid: $colorOk; +$colorFormError: #990000; +$colorFormInvalid: #ff2200; +$colorFormFieldErrorBg: $colorFormError; +$colorFormFieldErrorFg: rgba(#fff, 0.6); +$colorFormLines: rgba(#000, 0.1); +$colorFormSectionHeader: rgba(#000, 0.05); +$colorInputBg: rgba(black, 0.2); +$colorInputFg: $colorBodyFg; +$colorInputPlaceholder: darken($colorBodyFg, 20%); +$colorFormText: darken($colorBodyFg, 10%); +$colorInputIcon: darken($colorBodyFg, 25%); +$colorFieldHint: lighten($colorBodyFg, 40%); +$shdwInput: inset rgba(black, 0.4) 0 0 1px; +$shdwInputHov: inset rgba(black, 0.7) 0 0 2px; +$shdwInputFoc: inset rgba(black, 0.8) 0 0.25px 3px; + +// Inspector +$colorInspectorBg: lighten($colorBodyBg, 5%); +$colorInspectorFg: $colorBodyFg; +$colorInspectorPropName: darken($colorBodyFg, 20%); +$colorInspectorPropVal: lighten($colorInspectorFg, 15%); +$colorInspectorSectionHeaderBg: lighten($colorInspectorBg, 5%); +$colorInspectorSectionHeaderFg: lighten($colorInspectorBg, 40%); + +// Overlay +$overlayColorBg: $colorMenuBg; +$overlayColorFg: $colorMenuFg; +$overlayCr: $interiorMarginLg; +$overlayBrightnessAdjust: brightness(1.3); + +// Indicator colors +$colorIndicatorAvailable: $colorKey; +$colorIndicatorDisabled: #444; +$colorIndicatorOn: $colorOk; +$colorIndicatorOff: #666; + +// Limits and staleness colors// +$colorTelemFresh: lighten($colorBodyFg, 20%); +$colorTelemStale: darken($colorBodyFg, 20%); +$styleTelemStale: italic; +$colorLimitYellowBg: rgba(#ffaa00, 0.3); +$colorLimitYellowIc: #ffaa00; +$colorLimitRedBg: rgba(red, 0.3); +$colorLimitRedIc: red; + +// Bubble colors +$colorInfoBubbleBg: $colorMenuBg; +$colorInfoBubbleFg: #666; + +// Items +$colorItemBg: buttonBg($colorBtnBg); +$colorItemBgHov: buttonBg(lighten($colorBtnBg, 5%)); +$colorListItemBg: transparent; +$colorListItemBgHov: rgba($colorKey, 0.1); +$colorItemFg: $colorBtnFg; +$colorItemFgDetails: darken($colorItemFg, 20%); +$shdwItemText: none; + +// Tabular +$colorTabBorder: lighten($colorBodyBg, 10%); +$colorTabBodyBg: $colorBodyBg; +$colorTabBodyFg: lighten($colorBodyFg, 20%); +$colorTabHeaderBg: lighten($colorBodyBg, 10%); +$colorTabHeaderFg: lighten($colorBodyFg, 20%); +$colorTabHeaderBorder: $colorBodyBg; + +// Plot +$colorPlotBg: rgba(black, 0.05); +$colorPlotFg: $colorBodyFg; +$colorPlotHash: black; +$opacityPlotHash: 0.2; +$stylePlotHash: dashed; +$colorPlotAreaBorder: $colorInteriorBorder; +$colorPlotLabelFg: darken($colorPlotFg, 20%); +$legendCollapsedNameMaxW: 50%; +$legendHoverValueBg: rgba($colorBodyFg, 0.2); + +// Tree +$colorTreeBg: transparent; +$colorItemTreeHoverBg: lighten($colorBodyBg, 10%); +$colorItemTreeHoverFg: lighten($colorBodyFg, 10%); +$colorItemTreeIcon: $colorKey; // Used +$colorItemTreeIconHover: $colorItemTreeIcon; // Used +$colorItemTreeFg: $colorBodyFg; +$colorItemTreeSelectedBg: darken($colorKey, 15%); +$colorItemTreeSelectedFg: $colorBodyBg; +$colorItemTreeEditingBg: $editColor; +$colorItemTreeEditingFg: $editColorFg; +$colorItemTreeVC: rgba($colorBodyFg, 0.5); +$colorItemTreeVCHover: $colorKey; +$shdwItemTreeIcon: none; + +// Images +$colorThumbHoverBg: $colorItemTreeHoverBg; + +// Scrollbar +$scrollbarTrackSize: 7px; +$scrollbarTrackShdw: rgba(#000, 0.2) 0 1px 2px; +$scrollbarTrackColorBg: rgba(#000, 0.2); +$scrollbarThumbColor: darken($colorBodyBg, 50%); +$scrollbarThumbColorHov: $colorKey; +$scrollbarThumbColorMenu: lighten($colorMenuBg, 10%); +$scrollbarThumbColorMenuHov: lighten($scrollbarThumbColorMenu, 2%); + +// Splitter +$splitterHandleD: 2px; +$splitterHandleHitMargin: 4px; +$colorSplitterBaseBg: $colorBodyBg; +$colorSplitterBg: lighten($colorSplitterBaseBg, 10%); +$colorSplitterFg: $colorBodyBg; +$colorSplitterHover: $colorKey; +$colorSplitterActive: $colorKey; +$splitterBtnD: (16px, 35px); // height, width +$splitterBtnColorBg: $colorBtnBg; +$splitterBtnColorFg: #999; +$splitterBtnLabelColorFg: #666; +$splitterCollapsedBtnColorBg: #222; +$splitterCollapsedBtnColorFg: #666; +$splitterCollapsedBtnColorBgHov: $colorKey; +$splitterCollapsedBtnColorFgHov: $colorKeyFg; + +// Mobile +$colorMobilePaneLeft: darken($colorBodyBg, 2%); +$colorMobilePaneLeftTreeItemBg: rgba($colorBodyFg, 0.1); +$colorMobilePaneLeftTreeItemFg: $colorItemTreeFg; +$colorMobileSelectListTreeItemBg: rgba(#000, 0.05); + +// About Screen +$colorAboutLink: $colorKeySubtle; + +// Loading +$colorLoadingFg: #776ba2; +$colorLoadingBg: rgba($colorLoadingFg, 0.1); + +// Transitions +$transIn: all 50ms ease-in-out; +$transOut: all 250ms ease-in-out; +$transInBounce: all 200ms cubic-bezier(.47,.01,.25,1.5); +$transInBounceBig: all 300ms cubic-bezier(.2,1.6,.6,3); + +// Discrete items, like Notebook entries, Widget rules +$createBtnTextTransform: uppercase; + +@mixin discreteItem() { + background: rgba($colorBodyFg,0.1); + border: none; + border-radius: $controlCr; + + .c-input-inline:hover { + background: $colorBodyBg; + } +} + +@mixin discreteItemInnerElem() { + border: 1px solid rgba(#fff, 0.1); + border-radius: $controlCr; +} + +@mixin themedButton($c: $colorBtnBg) { + background: linear-gradient(lighten($c, 5%), $c); + box-shadow: rgba(black, 0.5) 0 0.5px 2px; +} + +/**************************************************** OVERRIDES */ +.c-frame { + &:not(.no-frame) { + $bc: #666; + $bLR: 3px solid transparent; + $br: 20px; + background: none !important; + border-radius: $br; + border-top: 4px solid $bc !important; + border-bottom: 2px solid $bc !important; + border-left: $bLR !important;; + border-right: $bLR !important;; + padding: 5px 10px 10px 10px !important; + } +} \ No newline at end of file diff --git a/src/styles-new/_constants-snow.scss b/src/styles-new/_constants-snow.scss index 7b2dd7083d..c3a7000c8b 100644 --- a/src/styles-new/_constants-snow.scss +++ b/src/styles-new/_constants-snow.scss @@ -22,7 +22,25 @@ /****************************************************** SNOW THEME CONSTANTS */ -@import "constants"; +// Fonts +$heroFont: "Helvetica Neue", Helvetica, Arial, sans-serif; +$headerFont: $heroFont; +$bodyFont: $heroFont; + +@mixin heroFont($size: 1em) { + font-family: $heroFont; + font-size: $size; +} + +@mixin headerFont($size: 1em) { + font-family: $headerFont; + font-size: $size; +} + +@mixin bodyFont($size: 1em) { + font-family: $bodyFont; + font-size: $size; +} // Functions @function buttonBg($c: $colorBtnBg) { @@ -257,7 +275,7 @@ $colorItemTreeSelectedBg: lighten($colorKey, 15%); $colorItemTreeSelectedFg: $colorBodyBg; $colorItemTreeEditingBg: $editColor; $colorItemTreeEditingFg: $editColorFg; -$colorItemTreeVC: $colorBodyFg; +$colorItemTreeVC: rgba($colorBodyFg, 0.5); $colorItemTreeVCHover: $colorKey; $shdwItemTreeIcon: none; diff --git a/src/styles-new/_constants.scss b/src/styles-new/_constants.scss index 6dfc57e24b..62e8c90b43 100644 --- a/src/styles-new/_constants.scss +++ b/src/styles-new/_constants.scss @@ -22,9 +22,26 @@ /************************** PATHS */ // Paths need to be relative to /platform/commonUI/theme//css/ directory -$dirFonts: 'fonts/'; $dirImgs: 'images/'; +@font-face { + // Use https://icomoon.io/app with `Icomoon.Open MCT Symbols 2018.json` to generate font files + font-family: 'symbolsfont'; + src: url('fonts/Open-MCT-Symbols-16px.woff') format('woff'), + url('fonts/Open-MCT-Symbols-16px.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + +@font-face { + // Use https://icomoon.io/app with icomoon-project-openmct-symbols-12px.json to generate font files + font-family: 'symbolsfont-12px'; + src: url('fonts/openmct-symbols-12px.woff') format('woff'), + url('fonts/openmct-symbols-12px.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + /************************** TIMINGS */ $controlFadeMs: 100ms; $browseToEditAnimMs: 400ms; diff --git a/src/styles-new/_global.scss b/src/styles-new/_global.scss index a0fd4de34d..bfc3a0edc1 100644 --- a/src/styles-new/_global.scss +++ b/src/styles-new/_global.scss @@ -20,29 +20,6 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ -/************************** FONTS */ -@font-face { - // Use https://icomoon.io/app with `Icomoon.Open MCT Symbols 2018.json` to generate font files - font-family: 'symbolsfont'; - src: url($dirFonts + 'Open-MCT-Symbols-16px.woff') format('woff'), - url($dirFonts + 'Open-MCT-Symbols-16px.ttf') format('truetype'), - url($dirFonts + 'Open-MCT-Symbols-16px.svg') format('svg'); - font-weight: normal; - font-style: normal; -} - -@font-face { - // 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'); - src: url($dirFonts + 'openmct-symbols-12px.eot?#iefix') format('embedded-opentype'), - url($dirFonts + 'openmct-symbols-12px.woff') format('woff'), - url($dirFonts + 'openmct-symbols-12px.ttf') format('truetype'), - url($dirFonts + 'openmct-symbols-12px.svg') format('svg'); - font-weight: normal; - font-style: normal; -} - /******************************* RESETS */ *, :before, @@ -116,9 +93,7 @@ body, html { body { -webkit-font-smoothing: subpixel-antialiased; -moz-osx-font-smoothing: grayscale; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: $fontBaseSize; - font-weight: normal; + @include bodyFont($fontBaseSize); background-color: $colorBodyBg; color: $colorBodyFg; } diff --git a/src/styles-new/fonts/Open-MCT-Symbols-16px.svg b/src/styles-new/fonts/Open-MCT-Symbols-16px.svg deleted file mode 100755 index 3eb5550305..0000000000 --- a/src/styles-new/fonts/Open-MCT-Symbols-16px.svg +++ /dev/null @@ -1,132 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/styles-new/fonts/openmct-symbols-12px.eot b/src/styles-new/fonts/openmct-symbols-12px.eot deleted file mode 100755 index 5921e80b54..0000000000 Binary files a/src/styles-new/fonts/openmct-symbols-12px.eot and /dev/null differ diff --git a/src/styles-new/fonts/openmct-symbols-12px.svg b/src/styles-new/fonts/openmct-symbols-12px.svg deleted file mode 100755 index db11c140f0..0000000000 --- a/src/styles-new/fonts/openmct-symbols-12px.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - \ No newline at end of file diff --git a/src/styles-new/sass-base.scss b/src/styles-new/sass-base.scss index f4cf83282e..4be4f47a8d 100644 --- a/src/styles-new/sass-base.scss +++ b/src/styles-new/sass-base.scss @@ -24,6 +24,7 @@ // Meant for use as a single line import in Vue SFC's. // Do not include anything that renders to CSS! @import "constants"; -//@import "constants-espresso"; // TEMP -@import "constants-snow"; // TEMP +@import "constants-espresso"; // TEMP +//@import "constants-snow"; // TEMP +//@import "constants-maelstrom"; @import "mixins"; \ No newline at end of file diff --git a/src/ui/components/layout/BrowseBar.vue b/src/ui/components/layout/BrowseBar.vue index 30d2a8a107..8416513a42 100644 --- a/src/ui/components/layout/BrowseBar.vue +++ b/src/ui/components/layout/BrowseBar.vue @@ -183,7 +183,7 @@ align-items: center; display: flex; flex: 0 1 auto; - font-size: 1.4em; + @include headerFont(1.4em); min-width: 0; &:before {