ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-21 22:17:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

https://github.com/nasa/openmct/issues/2577 (#2580)

Browse Source 
* https://github.com/nasa/openmct/issues/2577
* Remove notebook.scss import. Move to vue-styles.scss
This commit is contained in:
Nikhil 2019-12-11 15:56:00 -08:00 committed by Andrew Henry
parent 490cb2225d
commit 37a8cf071c
8 changed files with 4 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/MCT.js
View File

@ -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,

2
src/plugins/themes/espresso-theme.scss
View File

@ -19,4 +19,4 @@
@import "~styles/plotly";
@import "~styles/legacy-messages";
@import "~styles/vue-styles.scss";
@import "~styles/vue-styles.scss";

2
src/plugins/themes/maelstrom-theme.scss
View File

@ -19,4 +19,4 @@
@import "~styles/plotly";
@import "~styles/legacy-messages";
@import "~styles/vue-styles.scss";
@import "~styles/vue-styles.scss";

2
src/plugins/themes/snow-theme.scss
View File

@ -19,4 +19,4 @@
@import "~styles/plotly";
@import "~styles/legacy-messages";
@import "~styles/vue-styles.scss";
@import "~styles/vue-styles.scss";

40
src/styles/core.scss
View File

@ -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";

3
src/styles/notebook.scss
View File

@ -21,9 +21,6 @@
*****************************************************************************/
/*********************************************** NOTEBOOK */
@import "sass-base.scss";
.c-notebook {
display: flex;
flex-direction: column;

32
src/styles/sass-base.scss
View File

@ -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";

1
src/styles/vue-styles.scss
View File

@ -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";