11 files changed, 112 insertions, 16 deletions
diff --git a/.idea/typescript-compiler.xml b/.idea/typescript-compiler.xml
deleted file mode 100644
index 17ff836a..00000000
--- a/.idea/typescript-compiler.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="TypeScriptCompiler">
-    <option name="isCompilerEnabled" value="true" />
-    <option name="useConfig" value="true" />
-  </component>
-</project>
-\ No newline at end of file
diff --git a/app/.gitignore b/app/.gitignore
index b90d2f16..f3f33922 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,2 +1,3 @@
 /build
-fabric.properties
-\ No newline at end of file
+fabric.properties
+*_test.compact.css
diff --git a/app/src/main/assets/css/core/_colors.scss b/app/src/main/assets/css/core/_colors.scss
index 718c1e62..8dc964ba 100644
--- a/app/src/main/assets/css/core/_colors.scss
+++ b/app/src/main/assets/css/core/_colors.scss
@@ -1,11 +1,10 @@
 $transparent: transparent !default;
 
 //Keep above as first line so partials aren't compiled
+//Our default colors are test colors; production files should always import the actual colors
 
-//$text: #f0f;
-//$background: #f00;
-//$background2: rgba(#ff0, 0.1);
-
-$text: #fff !default;
-$background: #000 !default;
+$text: #d7b0d7 !default;
+$link: #8c8dd6 !default;
+$background: #451515 !default;
 $background2: rgba(lighten($background, 10%), 0.1) !default;
+$divider: rgba($text, 0.3) !default;
diff --git a/app/src/main/assets/css/core/_colors_amoled.scss b/app/src/main/assets/css/core/_colors_amoled.scss
new file mode 100644
index 00000000..cff5b65a
--- /dev/null
+++ b/app/src/main/assets/css/core/_colors_amoled.scss
@@ -0,0 +1,3 @@
+$text: #fff;
+$link: #B3E5FC;
+$background: #000;
diff --git a/app/src/main/assets/css/core/_colors_dark.scss b/app/src/main/assets/css/core/_colors_dark.scss
new file mode 100644
index 00000000..e89d69de
--- /dev/null
+++ b/app/src/main/assets/css/core/_colors_dark.scss
@@ -0,0 +1,3 @@
+$text: #000;
+$link: #B3E5FC;
+$background: #fafafa;
diff --git a/app/src/main/assets/css/core/_colors_glass.scss b/app/src/main/assets/css/core/_colors_glass.scss
new file mode 100644
index 00000000..c3406d73
--- /dev/null
+++ b/app/src/main/assets/css/core/_colors_glass.scss
@@ -0,0 +1,2 @@
+$text: #fff;
+$background: #80000000;
diff --git a/app/src/main/assets/css/core/_colors_light.scss b/app/src/main/assets/css/core/_colors_light.scss
new file mode 100644
index 00000000..7e791ac8
--- /dev/null
+++ b/app/src/main/assets/css/core/_colors_light.scss
@@ -0,0 +1,3 @@
+$text: #fff;
+$link: #263238;
+$background: #303030;
diff --git a/app/src/main/assets/css/themes/main.compact.css b/app/src/main/assets/css/themes/main.compact.css
new file mode 100644
index 00000000..b0328353
--- /dev/null
+++ b/app/src/main/assets/css/themes/main.compact.css
@@ -0,0 +1,23 @@
+body, #root, #header, .aclb, ._55wo, ._1upc, input, ._2f9r, ._59e9, ._d4i, .acw, ._3f50, ._uww, textarea { background: #451515 !important; }
+
+button::before, .touch ._56bt, ._56be::before, .btnS, .touch::before, ._5xo2, ._5u5a::before, ._4u3j, ._15ks, ._2v9s, ._4e8n { background: rgba(108, 33, 33, 0.1) !important; }
+
+input, ._43mh, .touch .btn, p, span, .fcg, button, ._52j9, ._52jb, ._52ja, ._5j35, ._rnk, ._24u0, ._1g06, ._14ye, textarea, .mentions-input, .mentions-placeholder, h1, h2, h3, h4, h5, h6 { color: #d7b0d7 !important; }
+
+a { color: #8c8dd6 !important; }
+
+._15kl::before { border-left: 1px solid rgba(215, 176, 215, 0.3) !important; }
+
+._1mx0 { border-top: 1px solid rgba(215, 176, 215, 0.3) !important; }
+
+._d4i, ._4e8n, ._uww { border: 1px solid rgba(215, 176, 215, 0.3) !important; }
+
+._4o58::after { border-color: rgba(215, 176, 215, 0.3) !important; }
+
+._2ip_ ._2zh4::before, ._2ip_ ._15kk::before, ._2ip_ ._15kk + ._4u3j::before { background: rgba(215, 176, 215, 0.3) !important; }
+
+._56bf, .touch .btn { border-radius: 0 !important; border: 0 !important; }
+
+.touch ._56bt { text-shadow: none !important; }
+
+.touch .btnS { box-shadow: none !important; }
diff --git a/app/src/main/assets/css/themes/main.scss b/app/src/main/assets/css/themes/main.scss
new file mode 100644
index 00000000..e5635d20
--- /dev/null
+++ b/app/src/main/assets/css/themes/main.scss
@@ -0,0 +1,70 @@
+@import "../core/colors";
+@import "../core/base";
+
+body, #root, #header, .aclb, ._55wo, ._1upc, input, ._2f9r, ._59e9,
+//friend cards
+._d4i,
+.acw, ._3f50,
+//comment box
+._uww, textarea {
+  background: $background !important;
+}
+
+button::before, .touch ._56bt, ._56be::before, .btnS, .touch::before,
+._5xo2, ._5u5a::before, ._4u3j, ._15ks, ._2v9s,
+//comment replies
+._4e8n {
+  background: $background2 !important;
+}
+
+input, ._43mh, .touch .btn, p, span, .fcg, button, ._52j9, ._52jb, ._52ja, ._5j35, ._rnk, ._24u0, ._1g06, ._14ye,
+textarea, .mentions-input, .mentions-placeholder,
+h1, h2, h3, h4, h5, h6 {
+  color: $text !important;
+}
+
+a {
+  color: $link !important;
+}
+
+
+//border between like and comment
+._15kl::before {
+  border-left: 1px solid $divider !important;
+}
+
+//above see more
+._1mx0 {
+  border-top: 1px solid $divider !important;
+}
+
+//friend card border
+._d4i,
+//comment replies
+._4e8n,
+//comment box
+._uww {
+  border: 1px solid $divider !important;
+}
+
+//link card bottom border
+._4o58::after {
+  border-color: $divider !important;
+}
+
+._2ip_ ._2zh4::before, ._2ip_ ._15kk::before, ._2ip_ ._15kk + ._4u3j::before {
+  background: $divider !important;
+}
+
+._56bf, .touch .btn {
+  border-radius: 0 !important;
+  border: 0 !important;
+}
+
+.touch ._56bt {
+  text-shadow: none !important;
+}
+
+.touch .btnS {
+  box-shadow: none !important;
+}
diff --git a/app/src/main/assets/js/menu_click.js b/app/src/main/assets/js/menu_click.js
index 5698cbf0..3bd0314f 100644
--- a/app/src/main/assets/js/menu_click.js
+++ b/app/src/main/assets/js/menu_click.js
@@ -1,6 +1,5 @@
 // we will handle click events
 document.onclick = function(e) {
-  e.preventDefault ? e.preventDefault() : e.returnValue = false;
   e = e || window.event;
   var element = e.target || e.srcElement;
   if (element.tagName !== 'A')
diff --git a/app/src/main/assets/js/menu_click.min.js b/app/src/main/assets/js/menu_click.min.js
index f404e360..d6c45a74 100644
--- a/app/src/main/assets/js/menu_click.min.js
+++ b/app/src/main/assets/js/menu_click.min.js
@@ -1 +1 @@
-document.onclick=function(c){c.preventDefault?c.preventDefault():c.returnValue=false;c=c||window.event;var b=c.target||c.srcElement;if(b.tagName!=="A"){b=b.parentNode}if(b.tagName==="A"){var a=b.href;console.log("Click Intercept");console.log(a);if(a!=="https://m.facebook.com/settings"&&a!=="https://m.facebook.com/settings#"&&a!=="https://m.facebook.com/settings#!/settings?soft=bookmarks"){Frost.loadUrl(a)}Frost.reloadBaseUrl()}};
-\ No newline at end of file
+document.onclick=function(c){c=c||window.event;var b=c.target||c.srcElement;if(b.tagName!=="A"){b=b.parentNode}if(b.tagName==="A"){var a=b.href;console.log("Click Intercept");console.log(a);if(a!=="https://m.facebook.com/settings"&&a!=="https://m.facebook.com/settings#"&&a!=="https://m.facebook.com/settings#!/settings?soft=bookmarks"){Frost.loadUrl(a)}Frost.reloadBaseUrl()}};
+\ No newline at end of file