From 37a8cf071cf0c3100cd114b9622969b896e3cfb2 Mon Sep 17 00:00:00 2001 From: Nikhil Date: Wed, 11 Dec 2019 15:56:00 -0800 Subject: [PATCH] https://github.com/nasa/openmct/issues/2577 (#2580) * https://github.com/nasa/openmct/issues/2577 * Remove notebook.scss import. Move to vue-styles.scss --- src/MCT.js | 2 -- src/plugins/themes/espresso-theme.scss | 2 +- src/plugins/themes/maelstrom-theme.scss | 2 +- src/plugins/themes/snow-theme.scss | 2 +- src/styles/core.scss | 40 ------------------------- src/styles/notebook.scss | 3 -- src/styles/sass-base.scss | 32 -------------------- src/styles/vue-styles.scss | 1 + 8 files changed, 4 insertions(+), 80 deletions(-) delete mode 100644 src/styles/core.scss delete mode 100644 src/styles/sass-base.scss diff --git a/src/MCT.js b/src/MCT.js index 9b2f145db5..3337afb29b 100644 --- a/src/MCT.js +++ b/src/MCT.js @@ -38,7 +38,6 @@ define([ './ui/router/ApplicationRouter', './ui/router/Browse', '../platform/framework/src/Main', - './styles/notebook.scss', './ui/layout/Layout.vue', '../platform/core/src/objects/DomainObjectImpl', '../platform/core/src/capabilities/ContextualDomainObject', @@ -65,7 +64,6 @@ define([ ApplicationRouter, Browse, Main, - NotebookStyles, Layout, DomainObjectImpl, ContextualDomainObject, diff --git a/src/plugins/themes/espresso-theme.scss b/src/plugins/themes/espresso-theme.scss index ad09eaf996..df9575918a 100644 --- a/src/plugins/themes/espresso-theme.scss +++ b/src/plugins/themes/espresso-theme.scss @@ -19,4 +19,4 @@ @import "~styles/plotly"; @import "~styles/legacy-messages"; -@import "~styles/vue-styles.scss"; \ No newline at end of file +@import "~styles/vue-styles.scss"; diff --git a/src/plugins/themes/maelstrom-theme.scss b/src/plugins/themes/maelstrom-theme.scss index f85bb9fbe6..573fb2832b 100644 --- a/src/plugins/themes/maelstrom-theme.scss +++ b/src/plugins/themes/maelstrom-theme.scss @@ -19,4 +19,4 @@ @import "~styles/plotly"; @import "~styles/legacy-messages"; -@import "~styles/vue-styles.scss"; \ No newline at end of file +@import "~styles/vue-styles.scss"; diff --git a/src/plugins/themes/snow-theme.scss b/src/plugins/themes/snow-theme.scss index df9c10d384..1af11c3cc5 100644 --- a/src/plugins/themes/snow-theme.scss +++ b/src/plugins/themes/snow-theme.scss @@ -19,4 +19,4 @@ @import "~styles/plotly"; @import "~styles/legacy-messages"; -@import "~styles/vue-styles.scss"; \ No newline at end of file +@import "~styles/vue-styles.scss"; diff --git a/src/styles/core.scss b/src/styles/core.scss deleted file mode 100644 index 3c9057d9f6..0000000000 --- a/src/styles/core.scss +++ /dev/null @@ -1,40 +0,0 @@ -/***************************************************************************** - * 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. - *****************************************************************************/ - -@import "vendor/normalize-min"; -@import "sass-base"; - -/******************** RENDERS CSS */ -@import "about"; -@import "glyphs"; -@import "global"; -@import "status"; -@import "controls"; -@import "layout"; -@import "forms"; -@import "table"; -@import "legacy"; -@import "legacy-plots"; -@import "plotly"; -@import "legacy-messages"; - -@import "vue-styles.scss"; diff --git a/src/styles/notebook.scss b/src/styles/notebook.scss index 3d1ef5ee48..fcdb72e0ef 100644 --- a/src/styles/notebook.scss +++ b/src/styles/notebook.scss @@ -21,9 +21,6 @@ *****************************************************************************/ /*********************************************** NOTEBOOK */ -@import "sass-base.scss"; - - .c-notebook { display: flex; flex-direction: column; diff --git a/src/styles/sass-base.scss b/src/styles/sass-base.scss deleted file mode 100644 index a9498f59dc..0000000000 --- a/src/styles/sass-base.scss +++ /dev/null @@ -1,32 +0,0 @@ -/***************************************************************************** - * 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. - *****************************************************************************/ - -// Imports only constants, mixins, etc. -// Meant for use as a single line import in Vue SFC's. -// Do not include anything that renders to CSS! -@import "constants"; -@import "constants-mobile.scss"; -//@import "constants-espresso"; // TEMP -@import "constants-snow"; // TEMP -//@import "constants-maelstrom"; -@import "mixins"; -@import "animations"; \ No newline at end of file diff --git a/src/styles/vue-styles.scss b/src/styles/vue-styles.scss index 7be6e05bcc..0a29abc358 100644 --- a/src/styles/vue-styles.scss +++ b/src/styles/vue-styles.scss @@ -41,3 +41,4 @@ @import "../ui/layout/status-bar/notification-banner.scss"; @import "../ui/preview/preview.scss"; @import "../ui/toolbar/components/toolbar-checkbox.scss"; +@import "./notebook.scss";