aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/assets
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-06-03 13:22:06 -0700
committerAllan Wang <me@allanwang.ca>2017-06-03 13:22:06 -0700
commit35185958b077880465696d686bd797895cd3ebd4 (patch)
tree431967b2b00d00c71b06fa7a7814e05524961ead /app/src/main/assets
parent5796566137995c8d244720f87ba85bce0e0d2f00 (diff)
downloadfrost-35185958b077880465696d686bd797895cd3ebd4.tar.gz
frost-35185958b077880465696d686bd797895cd3ebd4.tar.bz2
frost-35185958b077880465696d686bd797895cd3ebd4.zip
setup login activity
Diffstat (limited to 'app/src/main/assets')
-rw-r--r--app/src/main/assets/core/_base.scss17
-rw-r--r--app/src/main/assets/core/login.compact.css12
-rw-r--r--app/src/main/assets/core/login.scss23
3 files changed, 45 insertions, 7 deletions
diff --git a/app/src/main/assets/core/_base.scss b/app/src/main/assets/core/_base.scss
new file mode 100644
index 00000000..344b6696
--- /dev/null
+++ b/app/src/main/assets/core/_base.scss
@@ -0,0 +1,17 @@
+@mixin placeholder {
+ ::-webkit-input-placeholder {
+ @content
+ }
+
+ :-moz-placeholder {
+ @content
+ }
+
+ ::-moz-placeholder {
+ @content
+ }
+
+ :-ms-input-placeholder {
+ @content
+ }
+}
diff --git a/app/src/main/assets/core/login.compact.css b/app/src/main/assets/core/login.compact.css
index 765ac466..d0aa315e 100644
--- a/app/src/main/assets/core/login.compact.css
+++ b/app/src/main/assets/core/login.compact.css
@@ -1,3 +1,5 @@
+[data-sigil="m_login_upsell"] { display: none !important; }
+
body, #root, #header, .aclb, ._55wo, ._1upc, input { background: #000 !important; }
button::before, ._56be::before, .btnS, .touch::before { background: #111 !important; }
@@ -6,7 +8,15 @@ button::before, ._56be::before, .btnS, .touch::before { background: #111 !import
.touch .btnS { box-shadow: none !important; }
-input, ._43mh, .touch .btn, a, .fcg, button, ._52j9, ::-webkit-input-placeholder, ::-moz-placeholder, ::-ms-input-placeholder { color: #fff !important; }
+input, ._43mh, .touch .btn, a, .fcg, button, ._52j9 { 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; }
diff --git a/app/src/main/assets/core/login.scss b/app/src/main/assets/core/login.scss
index 81cb4c73..427640fc 100644
--- a/app/src/main/assets/core/login.scss
+++ b/app/src/main/assets/core/login.scss
@@ -1,11 +1,17 @@
@import "colors";
+@import "base";
-body, #root,#header,.aclb,._55wo,._1upc,input {
+//Get Android banner
+[data-sigil="m_login_upsell"] {
+ display: none !important;
+}
+
+body, #root, #header, .aclb, ._55wo, ._1upc, input {
background: $background !important;
}
button::before, ._56be::before, .btnS, .touch::before {
- background: $background2 !important;
+ background: $background2 !important;
}
._56bf, .touch .btn {
@@ -17,16 +23,21 @@ button::before, ._56be::before, .btnS, .touch::before {
box-shadow: none !important;
}
-input,._43mh, .touch .btn,a, .fcg, button, ._52j9, ::-webkit-input-placeholder,::-moz-placeholder ,::-ms-input-placeholder {
- color: $text !important
+input, ._43mh, .touch .btn, a, .fcg, button, ._52j9 {
+ color: $text !important;
}
+@include placeholder {
+ color: $text !important;
+}
+
+
// divider lines
._43mh::before, ._43mh::after {
- background: $text !important
+ background: $text !important;
}
._1rrd {
border: 1px solid $text !important;
- color: $text !important;
+ color: $text !important;
}