From 5b56ae501a1e092f8499667f146170d3f8ac535f Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 17 Jun 2017 19:35:09 -0700
Subject: Move theme colors to main scss files

---
 app/src/main/assets/css/core/_colors_amoled.scss    | 4 ----
 app/src/main/assets/css/core/_colors_dark.scss      | 4 ----
 app/src/main/assets/css/core/_colors_glass.scss     | 4 ----
 app/src/main/assets/css/core/_colors_light.scss     | 4 ----
 app/src/main/assets/css/themes/material_amoled.scss | 6 +++++-
 app/src/main/assets/css/themes/material_dark.scss   | 6 +++++-
 app/src/main/assets/css/themes/material_glass.scss  | 6 +++++-
 app/src/main/assets/css/themes/material_light.scss  | 6 +++++-
 8 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 app/src/main/assets/css/core/_colors_amoled.scss
 delete mode 100644 app/src/main/assets/css/core/_colors_dark.scss
 delete mode 100644 app/src/main/assets/css/core/_colors_glass.scss
 delete mode 100644 app/src/main/assets/css/core/_colors_light.scss

(limited to 'app/src/main/assets')

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";
-- 
cgit v1.2.3