Skip to content

Commit 6c1a0f4

Browse files
committed
styles test
1 parent ccc7b20 commit 6c1a0f4

4 files changed

Lines changed: 1115 additions & 248 deletions

File tree

buildprocess/webpack.config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ module.exports = function (devMode) {
142142
modules: ["node_modules"]
143143
}
144144
};
145+
config.resolve.alias["terriajs-variables"] = require.resolve(
146+
"../lib/Styles/variables.scss"
147+
);
145148

146149
return configureWebpackForPlugins(
147150
configureWebpackForTerriaJS({

lib/Styles/variables.scss

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,6 @@
1-
@use "~terriajs/lib/Sass/common/_variables.scss";
2-
3-
// To customise the look of your map, uncomment and change values here and in lib/Views/global.scss
4-
/*
5-
6-
// If your logo is big, set this to give it more room.
7-
//$logo-height: 120px;
8-
9-
// If using a non-standard font, remember to include an @import statement in global.scss
10-
$font-base: 'Josefin Sans', sans-serif;
11-
$font-pop: $font-base; // If you just want to use one font throughout, do this.
12-
13-
// These variables are for buttons and text.
14-
// "color-secondary" should be a lighter color than "color-primary" but still readable contrasted with white.
15-
$color-primary: maroon;
16-
$color-secondary: hsl(60,80%,60%); // or: lighten($color-primary, 20%);
17-
18-
// These variables set background panel colors
19-
$dark: hsl(0,30%,30%);
20-
$dark-with-overlay: hsl(0,30%,30%);;
21-
$dark-lighter: hsl(0,30%,50%);
22-
23-
// You might find it helpful to define these and use them.
24-
$color-primary-light:lighten($color-primary,10%);
25-
$color-primary-dark:darken($color-primary,10%);
26-
$dark-darker: hsl(0,30%,15%);
27-
*/
28-
29-
$focus-border-light-color: variables.$text-light;
30-
$focus-border-dark-color: variables.$text-dark;
31-
$focus-border-width: 2px;
32-
$focus-border: solid $focus-border-width $focus-border-light-color;
33-
$focus-border-dark: solid $focus-border-width $focus-border-dark-color;
1+
@forward "~terriajs/lib/Sass/common/_variables.scss" with (
2+
$dark: red,
3+
$grey-lighter: blue,
4+
$dark-lighter: green,
5+
$text-dark: green
6+
);

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"semver": "^5.0.0",
7777
"style-loader": "^4.0.0",
7878
"svg-sprite-loader": "^6.0.11",
79-
"terriajs": "8.8.0",
79+
"terriajs": "8.9.0",
8080
"terriajs-cesium": "8.0.2",
8181
"terriajs-plugin-api": "0.0.1-alpha.16",
8282
"terriajs-plugin-sample": "0.0.1-alpha.7",

0 commit comments

Comments
 (0)