From aa01ec691ef2638da7c22bf3cbd1a9c5e213ca1f Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Tue, 13 Jun 2017 23:36:33 -0700 Subject: Add more css --- app/src/main/assets/css/core/_colors.scss | 3 +- app/src/main/assets/css/core/_colors_amoled.scss | 1 + app/src/main/assets/css/core/_colors_dark.scss | 5 +-- app/src/main/assets/css/core/_colors_glass.scss | 4 ++- app/src/main/assets/css/core/_colors_light.scss | 5 +-- app/src/main/assets/css/themes/main.compact.css | 22 ++++++++++--- app/src/main/assets/css/themes/main.scss | 41 +++++++++++++++++------- 7 files changed, 59 insertions(+), 22 deletions(-) (limited to 'app/src/main/assets/css') diff --git a/app/src/main/assets/css/core/_colors.scss b/app/src/main/assets/css/core/_colors.scss index 8dc964ba..e7a6faa7 100644 --- a/app/src/main/assets/css/core/_colors.scss +++ b/app/src/main/assets/css/core/_colors.scss @@ -1,4 +1,4 @@ -$transparent: transparent !default; +$bg_transparent: rgba(#f0f, 0.02) !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 @@ -7,4 +7,5 @@ $text: #d7b0d7 !default; $link: #8c8dd6 !default; $background: #451515 !default; $background2: rgba(lighten($background, 10%), 0.1) !default; +$bg_opaque: rgba($background, 1.0) !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 index cff5b65a..4855161e 100644 --- a/app/src/main/assets/css/core/_colors_amoled.scss +++ b/app/src/main/assets/css/core/_colors_amoled.scss @@ -1,3 +1,4 @@ $text: #fff; $link: #B3E5FC; $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 index e89d69de..6087833e 100644 --- a/app/src/main/assets/css/core/_colors_dark.scss +++ b/app/src/main/assets/css/core/_colors_dark.scss @@ -1,3 +1,4 @@ -$text: #000; +$text: #fff; $link: #B3E5FC; -$background: #fafafa; +$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 index c3406d73..8c274814 100644 --- a/app/src/main/assets/css/core/_colors_glass.scss +++ b/app/src/main/assets/css/core/_colors_glass.scss @@ -1,2 +1,4 @@ $text: #fff; -$background: #80000000; +$link: #B3E5FC; +$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 index 7e791ac8..699e6228 100644 --- a/app/src/main/assets/css/core/_colors_light.scss +++ b/app/src/main/assets/css/core/_colors_light.scss @@ -1,3 +1,4 @@ -$text: #fff; +$text: #000; $link: #263238; -$background: #303030; +$background: #fafafa; +$bg_transparent: #fafafa; diff --git a/app/src/main/assets/css/themes/main.compact.css b/app/src/main/assets/css/themes/main.compact.css index b0328353..4697ccf1 100644 --- a/app/src/main/assets/css/themes/main.compact.css +++ b/app/src/main/assets/css/themes/main.compact.css @@ -1,14 +1,28 @@ -body, #root, #header, .aclb, ._55wo, ._1upc, input, ._2f9r, ._59e9, ._d4i, .acw, ._3f50, ._uww, textarea { background: #451515 !important; } +#viewport { background: #451515 !important; } + +body, #root, #header, .aclb, ._55wo, ._1upc, input, ._2f9r, ._59e9, ._d4i, .acw, ._3f50, ._uww, textarea, ._15n_, ._skt, ._5f28, ._14_j, ._3bg5, ._53_-, ._52x1 { background: rgba(255, 0, 255, 0.02) !important; } + +.jewel, .flyout { 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; } +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, h1, h2, h3, h4, h5, h6 { color: #d7b0d7 !important; } + +::-webkit-input-placeholder { color: #d7b0d7 !important; } + +:-moz-placeholder { color: #d7b0d7 !important; } + +::-moz-placeholder { color: #d7b0d7 !important; } + +:-ms-input-placeholder { color: #d7b0d7 !important; } a { color: #8c8dd6 !important; } -._15kl::before { border-left: 1px solid rgba(215, 176, 215, 0.3) !important; } +._15kl::before, ._5j35::after { border-left: 1px solid rgba(215, 176, 215, 0.3) !important; } + +._1mx0, ._15n_, ._52x1 { border-top: 1px solid rgba(215, 176, 215, 0.3) !important; } -._1mx0 { border-top: 1px solid rgba(215, 176, 215, 0.3) !important; } +._15ny::after, ._ap1, ._52x1 { border-bottom: 1px solid rgba(215, 176, 215, 0.3) !important; } ._d4i, ._4e8n, ._uww { border: 1px solid rgba(215, 176, 215, 0.3) !important; } diff --git a/app/src/main/assets/css/themes/main.scss b/app/src/main/assets/css/themes/main.scss index e5635d20..d4bba560 100644 --- a/app/src/main/assets/css/themes/main.scss +++ b/app/src/main/assets/css/themes/main.scss @@ -1,48 +1,60 @@ @import "../core/colors"; @import "../core/base"; +#viewport { + background: $background !important; +} + body, #root, #header, .aclb, ._55wo, ._1upc, input, ._2f9r, ._59e9, -//friend cards ._d4i, .acw, ._3f50, -//comment box -._uww, textarea { - background: $background !important; +._uww, textarea, ._15n_, ._skt, ._5f28, ._14_j, ._3bg5, ._53_-, ._52x1 { + background: $bg_transparent !important; +} + +.jewel, .flyout { + background: $bg_opaque !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, +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, h1, h2, h3, h4, h5, h6 { color: $text !important; } +@include placeholder { + color: $text !important; +} + a { color: $link !important; } - //border between like and comment -._15kl::before { +._15kl::before, +._5j35::after { border-left: 1px solid $divider !important; } //above see more -._1mx0 { +._1mx0, +._15n_, ._52x1 { border-top: 1px solid $divider !important; } +._15ny::after, ._ap1, ._52x1 { + border-bottom: 1px solid $divider !important; +} + //friend card border ._d4i, -//comment replies ._4e8n, -//comment box ._uww { border: 1px solid $divider !important; } @@ -68,3 +80,8 @@ a { .touch .btnS { box-shadow: none !important; } + +//menu spinner +[data-sigil="m-loading-indicator-animate m-loading-indicator-root"] { + display: none !important; +} -- cgit v1.2.3