diff options
| author | Allan Wang <me@allanwang.ca> | 2017-06-17 19:35:09 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-06-17 19:35:09 -0700 |
| commit | 5b56ae501a1e092f8499667f146170d3f8ac535f (patch) | |
| tree | 15376c68e34a4ce043412beddff2d2c15b7ec1d8 /app/src/main/assets/css | |
| parent | 377c96d36418fa1a5709df5ebf4ef87c9cef46c5 (diff) | |
| download | frost-5b56ae501a1e092f8499667f146170d3f8ac535f.tar.gz frost-5b56ae501a1e092f8499667f146170d3f8ac535f.tar.bz2 frost-5b56ae501a1e092f8499667f146170d3f8ac535f.zip | |
Move theme colors to main scss files
Diffstat (limited to 'app/src/main/assets/css')
8 files changed, 20 insertions, 20 deletions
diff --git a/app/src/main/assets/css/core/_colors_amoled.scss b/app/src/main/assets/css/core/_colors_amoled.scss deleted file mode 100644 index 8bbf6d10..00000000 --- a/app/src/main/assets/css/core/_colors_amoled.scss +++ /dev/null @@ -1,4 +0,0 @@ -$text: #fff; -$link: #eee; -$background: #000; -$bg_transparent: #000; diff --git a/app/src/main/assets/css/core/_colors_dark.scss b/app/src/main/assets/css/core/_colors_dark.scss deleted file mode 100644 index 5fb495df..00000000 --- a/app/src/main/assets/css/core/_colors_dark.scss +++ /dev/null @@ -1,4 +0,0 @@ -$text: #fff; -$link: #eee; -$background: #303030; -$bg_transparent: #303030; diff --git a/app/src/main/assets/css/core/_colors_glass.scss b/app/src/main/assets/css/core/_colors_glass.scss deleted file mode 100644 index fc71b99d..00000000 --- a/app/src/main/assets/css/core/_colors_glass.scss +++ /dev/null @@ -1,4 +0,0 @@ -$text: #fff; -$link: #eee; -$background: rgba(#000, 0.3); -$bg_transparent: transparent; diff --git a/app/src/main/assets/css/core/_colors_light.scss b/app/src/main/assets/css/core/_colors_light.scss deleted file mode 100644 index 3870ece0..00000000 --- a/app/src/main/assets/css/core/_colors_light.scss +++ /dev/null @@ -1,4 +0,0 @@ -$text: #000; -$link: #111; -$background: #fafafa; -$bg_transparent: #fafafa; diff --git a/app/src/main/assets/css/themes/material_amoled.scss b/app/src/main/assets/css/themes/material_amoled.scss index 20ac414c..a0f93c7a 100644 --- a/app/src/main/assets/css/themes/material_amoled.scss +++ b/app/src/main/assets/css/themes/material_amoled.scss @@ -1,2 +1,6 @@ -@import "../core/colors_amoled"; +$text: #fff; +$link: #eee; +$background: #000; +$bg_transparent: #000; + @import "../core/main"; diff --git a/app/src/main/assets/css/themes/material_dark.scss b/app/src/main/assets/css/themes/material_dark.scss index ad6263d5..7bbf7ad0 100644 --- a/app/src/main/assets/css/themes/material_dark.scss +++ b/app/src/main/assets/css/themes/material_dark.scss @@ -1,2 +1,6 @@ -@import "../core/colors_dark"; +$text: #fff; +$link: #eee; +$background: #303030; +$bg_transparent: #303030; + @import "../core/main"; diff --git a/app/src/main/assets/css/themes/material_glass.scss b/app/src/main/assets/css/themes/material_glass.scss index 273a66a6..ce341b0a 100644 --- a/app/src/main/assets/css/themes/material_glass.scss +++ b/app/src/main/assets/css/themes/material_glass.scss @@ -1,2 +1,6 @@ -@import "../core/colors_glass"; +$text: #fff; +$link: #eee; +$background: rgba(#000, 0.3); +$bg_transparent: transparent; + @import "../core/main"; diff --git a/app/src/main/assets/css/themes/material_light.scss b/app/src/main/assets/css/themes/material_light.scss index 624a57a4..f0b35a00 100644 --- a/app/src/main/assets/css/themes/material_light.scss +++ b/app/src/main/assets/css/themes/material_light.scss @@ -1,2 +1,6 @@ -@import "../core/colors_light"; +$text: #000; +$link: #111; +$background: #fafafa; +$bg_transparent: #fafafa; + @import "../core/main"; |