Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Darkmatter] Create new darkmatter theme #7682

Merged
merged 45 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
bc4ad98
initial theme plugin setup, changes to layout frames
rukmini-bose Jun 21, 2023
335a29c
update visual tests
unlikelyzero Jul 12, 2023
bb11d6d
Changes to gauge, layout borders, and background
rukmini-bose Jul 8, 2023
df587ca
Make background image a DIY theme variable. Fixes made to gauges. Del…
rukmini-bose Jul 10, 2023
89d33ef
More changes to overall background colors. Added glass layer effect t…
rukmini-bose Jul 10, 2023
ac07a88
changes to menu
rukmini-bose Jul 11, 2023
11762bd
Fix to make theme easy to run
rukmini-bose Jul 11, 2023
081da4c
Fix tab colors and add glass background to menus
rukmini-bose Jul 11, 2023
f35e721
make highlightd corners longer
rukmini-bose Jul 11, 2023
d1bc48c
Initial changes to font styles
rukmini-bose Jul 12, 2023
4abdffc
Add temporary numeric font style. Test numeric font in gauges.
rukmini-bose Jul 12, 2023
9e9857e
Initial changes to alphanumerics in layouts
rukmini-bose Jul 13, 2023
270e3e7
Updated variables
rukmini-bose Mar 26, 2024
39cf1ca
update plugin.js file
rukmini-bose Mar 26, 2024
7a1e8ef
Fix highlighted corners on frames such that it uses outermost frame
rukmini-bose Mar 26, 2024
cbe857f
renaming theme plugin and rename branch
rukmini-bose Mar 29, 2024
3a917da
fix button colors to be more readable
rukmini-bose Mar 29, 2024
6913ea4
change background image
rukmini-bose Apr 1, 2024
d52470b
Merge branch 'master' into darkmatter-theme
rukmini-bose Apr 1, 2024
fcbff2d
Fix bad merges from other theme files. Fix gauge and alphanumerics su…
rukmini-bose Apr 1, 2024
83bba7d
more fixes
rukmini-bose Apr 1, 2024
0b6de22
Fix where mixin is used such that when an object's frame is hidden, h…
rukmini-bose Apr 2, 2024
6a8328f
remove blur from meter gauges
rukmini-bose Apr 4, 2024
524726f
Merge branch 'master' into darkmatter-theme
rukmini-bose Apr 10, 2024
fe4d3b0
Add comment about this theme being in beta mode
rukmini-bose Apr 10, 2024
38cd0ba
Delete draft .scss file that is no longer needed
rukmini-bose Apr 10, 2024
09b7b2c
Fix major accessibility issues
rukmini-bose Apr 10, 2024
c2275b6
Fix PR review comments
rukmini-bose Apr 15, 2024
bce4638
✨ fix: Correct import file name for DarkMatter theme.
ozyx Apr 15, 2024
8cf6412
Fix other theme code that was failing e2e tests
rukmini-bose Apr 15, 2024
696ebfc
Revert index.html
rukmini-bose Apr 15, 2024
66f498f
Fix linting error
rukmini-bose Apr 15, 2024
5aa76e4
Fix for failing percy test regarding padding
rukmini-bose Apr 15, 2024
2d0fab5
Fix for failing percy test regarding padding part 2
rukmini-bose Apr 15, 2024
22124df
Fix for failing percy test regarding padding part 3
rukmini-bose Apr 15, 2024
cc1f575
Remove mixin that may be causing percy issue
rukmini-bose Apr 15, 2024
bd00800
Another fix to resolve percy issue
rukmini-bose Apr 15, 2024
32edd30
Add back some code that was deleted during debugging, and create new …
rukmini-bose Apr 16, 2024
57238ff
Fix gradient clipping in inspector
rukmini-bose Apr 16, 2024
3357d40
Restructure all constants-.scss files
rukmini-bose Apr 22, 2024
039e1ce
Change bg image to be square and NASA official picture
rukmini-bose Apr 22, 2024
43d21f0
Final fixes to darkmatter variable layouts
rukmini-bose Apr 22, 2024
915f00a
Merge branch 'master' into darkmatter-theme
rukmini-bose Apr 22, 2024
830ec23
Address PR comments
rukmini-bose Apr 23, 2024
4bc0cea
Change darkmatter to darkmatterTheme
rukmini-bose Apr 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,8 @@
"checksnapshots",
"specced",
"composables",
"countup"
"countup",
"darkmatter"
],
"dictionaries": ["npm", "softwareTerms", "node", "html", "css", "bash", "en_US", "en-gb", "misc"],
"ignorePaths": [
Expand Down
3 changes: 2 additions & 1 deletion .webpack/webpack.common.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ const config = {
couchDBChangesFeed: './src/plugins/persistence/couch/CouchChangesFeed.js',
inMemorySearchWorker: './src/api/objects/InMemorySearchWorker.js',
espressoTheme: './src/plugins/themes/espresso-theme.scss',
snowTheme: './src/plugins/themes/snow-theme.scss'
snowTheme: './src/plugins/themes/snow-theme.scss',
darkmatterTheme: './src/plugins/themes/darkmatter-theme.scss'
},
output: {
globalObject: 'this',
Expand Down
7 changes: 7 additions & 0 deletions e2e/playwright-visual-a11y.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ const config = {
browserName: 'chromium',
theme: 'snow'
}
},
{
name: 'darkmatter-theme', //Runs the same visual tests but with darkmatter-theme
use: {
browserName: 'chromium',
theme: 'darkmatter-theme'
}
}
],
reporter: [
Expand Down
1 change: 1 addition & 0 deletions src/plugins/displayLayout/components/telemetry-view.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
}

&__value {
@include telemetryView();
@include isLimit();
}

Expand Down
11 changes: 7 additions & 4 deletions src/plugins/gauge/gauge.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,12 @@ $meterNeedleBorderRadius: 5px;
fill: $colorGaugeValue;
}
&__needle-value {
fill: $colorGaugeValue;
fill: $colorGaugeNeedle;

}
&__current-value-text {
fill: $colorGaugeTextValue;
font-family: $heroFont;
font-family: $numericFont;
}

&__units-text,
Expand Down Expand Up @@ -125,7 +126,8 @@ $meterNeedleBorderRadius: 5px;
// Filled area
position: absolute;
background: $colorGaugeValue;
z-index: 1;
box-shadow: $gaugeMeterValueShadow 0px 2px 10px 1px;
//z-index: 3;
}

&__value-needle {
Expand All @@ -135,6 +137,7 @@ $meterNeedleBorderRadius: 5px;
content: '';
display: block;
background: $colorGaugeValue;

}
}

Expand All @@ -158,7 +161,7 @@ $meterNeedleBorderRadius: 5px;

&__current-value-text {
fill: $colorGaugeTextValue;
font-family: $heroFont;
font-family: $numericFont;
}

.c-gauge__curval {
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ import SummaryWidget from './summaryWidget/plugin.js';
import Tabs from './tabs/plugin.js';
import TelemetryMean from './telemetryMean/plugin.js';
import TelemetryTablePlugin from './telemetryTable/plugin.js';
import DarkMatter from './themes/darkmatter.js';
import Espresso from './themes/espresso.js';
import Snow from './themes/snow.js';
import TimeConductorPlugin from './timeConductor/plugin.js';
Expand Down Expand Up @@ -125,7 +126,6 @@ plugins.Plot = PlotPlugin;
plugins.BarChart = BarChartPlugin;
plugins.ScatterPlot = ScatterPlotPlugin;
plugins.TelemetryTable = TelemetryTablePlugin;

plugins.SummaryWidget = SummaryWidget;
plugins.TelemetryMean = TelemetryMean;
plugins.URLIndicator = URLIndicatorPlugin;
Expand All @@ -145,6 +145,7 @@ plugins.OpenInNewTabAction = OpenInNewTabAction;
plugins.ReloadAction = ReloadAction;
plugins.ClearData = ClearData;
plugins.WebPage = WebPagePlugin;
plugins.DarkmatterTheme = DarkMatter;
plugins.Espresso = Espresso;
plugins.Snow = Snow;
plugins.Condition = ConditionPlugin;
Expand Down
44 changes: 44 additions & 0 deletions src/plugins/themes/darkmatter-theme.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2024, 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 '../../styles/vendor/normalize-min';
rukmini-bose marked this conversation as resolved.
Show resolved Hide resolved
@import '../../styles/constants';
@import '../../styles/constants-mobile.scss';

@import '../../styles/constants-darkmatter';

@import '../../styles/mixins';
@import '../../styles/animations';
@import '../../styles/about';
@import '../../styles/glyphs';
@import '../../styles/global';
@import '../../styles/status';
@import '../../styles/limits';
@import '../../styles/controls';
@import '../../styles/forms';
@import '../../styles/table';
@import '../../styles/legacy';
@import '../../styles/legacy-plots';
@import '../../styles/plotly';
@import '../../styles/legacy-messages';

@import '../../styles/vue-styles.scss';
30 changes: 30 additions & 0 deletions src/plugins/themes/darkmatter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2024, 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.
*****************************************************************************/
// Note: This darkmatter theme is in Beta and is not yet ready for prime time. It needs some more tweaking.
rukmini-bose marked this conversation as resolved.
Show resolved Hide resolved

import { installTheme } from './installTheme.js';

export default function plugin() {
return function install(openmct) {
installTheme(openmct, 'darkmatter');
};
}
22 changes: 22 additions & 0 deletions src/plugins/themes/espresso-theme.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2024, 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 '../../styles/vendor/normalize-min';
@import '../../styles/constants';
@import '../../styles/constants-mobile.scss';
Expand Down
22 changes: 22 additions & 0 deletions src/plugins/themes/espresso.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2024, 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 { installTheme } from './installTheme.js';

export default function plugin() {
Expand Down
22 changes: 22 additions & 0 deletions src/plugins/themes/snow-theme.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2024, 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 '../../styles/vendor/normalize-min';
@import '../../styles/constants';
@import '../../styles/constants-mobile.scss';
Expand Down
22 changes: 22 additions & 0 deletions src/plugins/themes/snow.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
/*****************************************************************************
* Open MCT, Copyright (c) 2014-2024, 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 { installTheme } from './installTheme.js';

export default function plugin() {
Expand Down
Loading
Loading