aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/assets/css/core
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-06-15 17:02:52 -0700
committerAllan Wang <me@allanwang.ca>2017-06-15 17:02:52 -0700
commit0d1f0e215b1890f2f5d45373b2746b7ef91da494 (patch)
tree9153570f548e1199e6358ef7017f973ec07b7598 /app/src/main/assets/css/core
parent15d8a70a6c7596bb9f59a4383df7dccbba3a7012 (diff)
downloadfrost-0d1f0e215b1890f2f5d45373b2746b7ef91da494.tar.gz
frost-0d1f0e215b1890f2f5d45373b2746b7ef91da494.tar.bz2
frost-0d1f0e215b1890f2f5d45373b2746b7ef91da494.zip
Theme remaining activities
Diffstat (limited to 'app/src/main/assets/css/core')
-rw-r--r--app/src/main/assets/css/core/login.compact.css25
-rw-r--r--app/src/main/assets/css/core/login.scss48
-rw-r--r--app/src/main/assets/css/core/main.compact.css8
-rw-r--r--app/src/main/assets/css/core/main.scss6
4 files changed, 7 insertions, 80 deletions
diff --git a/app/src/main/assets/css/core/login.compact.css b/app/src/main/assets/css/core/login.compact.css
deleted file mode 100644
index 436b1875..00000000
--- a/app/src/main/assets/css/core/login.compact.css
+++ /dev/null
@@ -1,25 +0,0 @@
-[data-sigil="m_login_upsell"] { display: none !important; }
-
-body, #root, #header, .aclb, ._55wo, ._1upc, input, ._2f9r { background: #000 !important; }
-
-button::before, .touch ._56bt, ._56be::before, .btnS, .touch::before, ._5xo2, ._5u5a::before { background: rgba(26, 26, 26, 0.1) !important; }
-
-._56bf, .touch .btn { border-radius: 0 !important; border: 0 !important; }
-
-.touch ._56bt { text-shadow: none !important; }
-
-.touch .btnS { box-shadow: none !important; }
-
-input, ._43mh, .touch .btn, a, .fcg, button, ._52j9, ._52jb, h1, h2, h3, h4, h5, h6 { color: #fff !important; }
-
-::-webkit-input-placeholder { color: #fff !important; }
-
-:-moz-placeholder { color: #fff !important; }
-
-::-moz-placeholder { color: #fff !important; }
-
-:-ms-input-placeholder { color: #fff !important; }
-
-._43mh::before, ._43mh::after { background: #fff !important; }
-
-._1rrd { border: 1px solid #fff !important; color: #fff !important; }
diff --git a/app/src/main/assets/css/core/login.scss b/app/src/main/assets/css/core/login.scss
deleted file mode 100644
index 00627838..00000000
--- a/app/src/main/assets/css/core/login.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-@import "colors";
-@import "base";
-
-//Get Android banner
-[data-sigil="m_login_upsell"] {
- display: none !important;
-}
-
-body, #root, #header, .aclb, ._55wo, ._1upc, input, ._2f9r {
- background: $background !important;
-}
-
-button::before, .touch ._56bt, ._56be::before, .btnS, .touch::before,
-._5xo2, ._5u5a::before {
- background: $background2 !important;
-}
-
-._56bf, .touch .btn {
- border-radius: 0 !important;
- border: 0 !important;
-}
-
-.touch ._56bt {
- text-shadow: none !important;
-}
-
-.touch .btnS {
- box-shadow: none !important;
-}
-
-input, ._43mh, .touch .btn, a, .fcg, button, ._52j9, ._52jb, h1, h2, h3, h4, h5, h6 {
- color: $text !important;
-}
-
-@include placeholder {
- color: $text !important;
-}
-
-
-// divider lines
-._43mh::before, ._43mh::after {
- background: $text !important;
-}
-
-._1rrd {
- border: 1px solid $text !important;
- color: $text !important;
-}
diff --git a/app/src/main/assets/css/core/main.compact.css b/app/src/main/assets/css/core/main.compact.css
index cf0689de..6c6115dd 100644
--- a/app/src/main/assets/css/core/main.compact.css
+++ b/app/src/main/assets/css/core/main.compact.css
@@ -4,9 +4,9 @@ body, #root, #header, ._55wo, ._1upc, input, ._2f9r, ._59e9, ._5pz4, ._5lp4, ._5
.jewel, .flyout, ._13e_, ._5-lw, ._5c0e, .jx-result, ._336p { background: #451515 !important; }
-button, button::before, .touch ._56bt, ._56be::before, .btnS, .touch::before, ._5xo2, ._5u5a::before, ._4u3j, ._15ks, ._2v9s, ._5hua, ._59tt, ._41ft, .jx-tokenizer, ._4e8n, ._5pxa._3uj9, ._4qax, .aclb, ._4756 { background: rgba(147, 45, 45, 0.2) !important; }
+button, button::before, .touch ._56bt, ._56be::before, .btnS, .touch::before, ._5xo2, ._5u5a::before, ._4u3j, ._15ks, ._2v9s, ._5hua, ._59tt, ._41ft, .jx-tokenizer, ._4e8n, ._5pxa._3uj9, ._4qax, .aclb, ._4756 { background: rgba(217, 129, 129, 0.2) !important; }
-body, input, ._43mh, .touch .btn, p, span, .fcg, button, ._52j9, ._52jb, ._52ja, ._5j35, ._rnk, ._24u0, ._1g06, ._14ye, textarea, .mentions-input, .mentions-placeholder, .fcw, ._5-7t, .fcl, ._4qas, .thread-title, ._46pa, ._336p, h1, h2, h3, h4, h5, h6 { color: #d7b0d7 !important; }
+body, input, ._43mh, .touch .btn, p, span, .fcg, button, ._52j9, ._52jb, ._52ja, ._5j35, ._rnk, ._24u0, ._1g06, ._14ye, textarea, .mentions-input, .mentions-placeholder, .fcw, ._5-7t, .fcl, ._4qas, .thread-title, ._46pa, ._336p, ._1rrd, h1, h2, h3, h4, h5, h6 { color: #d7b0d7 !important; }
::-webkit-input-placeholder { color: #d7b0d7 !important; }
@@ -24,11 +24,11 @@ a, ._5fpq { color: #8c8dd6 !important; }
._15ny::after, ._ap1, ._52x1, ._59tu, ._usq, ._13e_, ._59f6._55so::before, ._4gj3, .jx-result, ._5lp5, ._5pz4, ._5lp4, ._5lp5, ._3on6, ._5h6z, ._5h6x { border-bottom: 1px solid rgba(215, 176, 215, 0.3) !important; }
-._d4i, ._4e8n, ._uww, .mentions-placeholder, .mentions-shadow, .mentions-measurer, ._5whq, ._59tt, ._41ft::after, .jx-tokenizer, ._3uqf, ._4756 { border: 1px solid rgba(215, 176, 215, 0.3) !important; }
+._d4i, ._4e8n, ._uww, .mentions-placeholder, .mentions-shadow, .mentions-measurer, ._5whq, ._59tt, ._41ft::after, .jx-tokenizer, ._3uqf, ._4756, ._1rrd { border: 1px solid rgba(215, 176, 215, 0.3) !important; }
._4o58::after, .acw, .aclb, ._4qax { border-color: rgba(215, 176, 215, 0.3) !important; }
-._2ip_ ._2zh4::before, ._2ip_ ._15kk::before, ._2ip_ ._15kk + ._4u3j::before, ._58a0:before { background: rgba(215, 176, 215, 0.3) !important; }
+._2ip_ ._2zh4::before, ._2ip_ ._15kk::before, ._2ip_ ._15kk + ._4u3j::before, ._58a0:before, ._43mh::before, ._43mh::after { background: rgba(215, 176, 215, 0.3) !important; }
._56bf, .touch .btn { border-radius: 0 !important; border: 0 !important; }
diff --git a/app/src/main/assets/css/core/main.scss b/app/src/main/assets/css/core/main.scss
index bf633148..2eca556e 100644
--- a/app/src/main/assets/css/core/main.scss
+++ b/app/src/main/assets/css/core/main.scss
@@ -25,7 +25,7 @@ button, button::before, .touch ._56bt, ._56be::before, .btnS, .touch::before,
}
body, input, ._43mh, .touch .btn, p, span, .fcg, button, ._52j9, ._52jb, ._52ja, ._5j35, ._rnk, ._24u0, ._1g06, ._14ye,
-textarea, .mentions-input, .mentions-placeholder, .fcw, ._5-7t, .fcl, ._4qas, .thread-title, ._46pa, ._336p,
+textarea, .mentions-input, .mentions-placeholder, .fcw, ._5-7t, .fcl, ._4qas, .thread-title, ._46pa, ._336p, ._1rrd,
h1, h2, h3, h4, h5, h6 {
color: $text !important;
}
@@ -58,7 +58,7 @@ a,
//friend card border
._d4i,
-._4e8n, ._uww, .mentions-placeholder, .mentions-shadow, .mentions-measurer, ._5whq, ._59tt, ._41ft::after, .jx-tokenizer, ._3uqf, ._4756 {
+._4e8n, ._uww, .mentions-placeholder, .mentions-shadow, .mentions-measurer, ._5whq, ._59tt, ._41ft::after, .jx-tokenizer, ._3uqf, ._4756, ._1rrd {
border: 1px solid $divider !important;
}
@@ -68,7 +68,7 @@ a,
border-color: $divider !important;
}
-._2ip_ ._2zh4::before, ._2ip_ ._15kk::before, ._2ip_ ._15kk + ._4u3j::before, ._58a0:before {
+._2ip_ ._2zh4::before, ._2ip_ ._15kk::before, ._2ip_ ._15kk + ._4u3j::before, ._58a0:before, ._43mh::before, ._43mh::after {
background: $divider !important;
}