diff options
Diffstat (limited to 'app/src/main/assets/css/core')
-rw-r--r-- | app/src/main/assets/css/core/_colors.scss | 2 | ||||
-rw-r--r-- | app/src/main/assets/css/core/_core_border.scss | 4 | ||||
-rw-r--r-- | app/src/main/assets/css/core/_core_messenger.scss | 20 | ||||
-rw-r--r-- | app/src/main/assets/css/core/_core_text.scss | 2 | ||||
-rw-r--r-- | app/src/main/assets/css/core/_svg.scss | 47 | ||||
-rw-r--r-- | app/src/main/assets/css/core/core.css | 20 | ||||
-rw-r--r-- | app/src/main/assets/css/core/core.scss | 1 |
7 files changed, 69 insertions, 27 deletions
diff --git a/app/src/main/assets/css/core/_colors.scss b/app/src/main/assets/css/core/_colors.scss index c6e90146..1411a857 100644 --- a/app/src/main/assets/css/core/_colors.scss +++ b/app/src/main/assets/css/core/_colors.scss @@ -4,6 +4,8 @@ $bg_transparent: rgba(#f0f, 0.02) !default; //Our default colors are test colors; production files should always import the actual colors $text: #d7b0d7 !default; +// must be visible with accent as the background +$accent_text: #76d7c2 !default; $link: #9266d5 !default; $accent: #3b5998 !default; $background: #451515 !default; diff --git a/app/src/main/assets/css/core/_core_border.scss b/app/src/main/assets/css/core/_core_border.scss index 27c06d82..c366bc14 100644 --- a/app/src/main/assets/css/core/_core_border.scss +++ b/app/src/main/assets/css/core/_core_border.scss @@ -4,7 +4,7 @@ border-left: 1px solid $divider !important; } -._4_d1 { +._4_d1, ._5cni { border-right: 1px solid $divider !important; } @@ -12,7 +12,7 @@ ._1mx0, ._1rbr, ._5yt8, ._idb, ._cld, ._1e8h, ._z-w, ._1ha, ._1n8h ._1oby, ._5f99, ._2t39, ._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after, ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9, -._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, +._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2, ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al { border-top: 1px solid $divider !important; } diff --git a/app/src/main/assets/css/core/_core_messenger.scss b/app/src/main/assets/css/core/_core_messenger.scss new file mode 100644 index 00000000..608fc23d --- /dev/null +++ b/app/src/main/assets/css/core/_core_messenger.scss @@ -0,0 +1,20 @@ +// Not all messenger related components are here; only the main ones. +// Borders for instance are merged into core_border + +// Other person's message bubble +._34ee { + background: $background2 !important; + color: $text !important; + +} + +// Your message bubble; order matters +._34em ._34ee { + background: $accent !important; + color: $accent_text !important; +} + +// Sticker page +._5as0, ._5cni, ._5as2 { + background: $bg_opaque !important; +}
\ No newline at end of file diff --git a/app/src/main/assets/css/core/_core_text.scss b/app/src/main/assets/css/core/_core_text.scss index 20d65224..154cee84 100644 --- a/app/src/main/assets/css/core/_core_text.scss +++ b/app/src/main/assets/css/core/_core_text.scss @@ -4,7 +4,7 @@ ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr, ._5xu2, ._3ml8, ._3mla, ._50vk, ._1m2u, ._31y7, ._4kcb, ._1lf6, ._1lf5, ._1lf4, ._1hiz, ._xod, ._5ag5, ._zmk, ._3t_h, ._5lm6, ._3clv, ._3zlc, ._36rd, -._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul, +._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul, ._3z10, ._43mh, .touch .btn, .fcg, button, ._52j9, ._52jb, ._52ja, ._5j35, ._rnk, ._24u0, ._1g06, ._14ye, .fcb, ._56cz._56c_, ._1gk_, ._55fj, ._45fu, ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd, diff --git a/app/src/main/assets/css/core/_svg.scss b/app/src/main/assets/css/core/_svg.scss index 7ed3beb2..8c714438 100644 --- a/app/src/main/assets/css/core/_svg.scss +++ b/app/src/main/assets/css/core/_svg.scss @@ -17,12 +17,10 @@ $video: '<svg xmlns="http://www.w3.org/2000/svg" fill="#{$text}" viewBox="0 0 50 $like: '<svg xmlns="http://www.w3.org/2000/svg" fill="#{$text}" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M1 21h4V9H1v12zm22-11c0-1.1-.9-2-2-2h-6.31l.95-4.57.03-.32c0-.41-.17-.79-.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1.9 2 2 2h9c.83 0 1.54-.5 1.84-1.22l3.02-7.05c.09-.23.14-.47.14-.73v-1.91l-.01-.01L23 10z"/></svg>'; $like_selected: '<svg xmlns="http://www.w3.org/2000/svg" fill="#{$accent}" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path d="M1 21h4V9H1v12zm22-11c0-1.1-.9-2-2-2h-6.31l.95-4.57.03-.32c0-.41-.17-.79-.44-1.06L14.17 1 7.59 7.59C7.22 7.95 7 8.45 7 9v10c0 1.1.9 2 2 2h9c.83 0 1.54-.5 1.84-1.22l3.02-7.05c.09-.23.14-.47.14-.73v-1.91l-.01-.01L23 10z"/></svg>'; -/* - * 2018/12/29 - * Previously ._15km ._15ko::before and ._15km ._15ko._77la::before; however, reaction changes no longer affect this element - * The robust measure seems to be the parent of a[data-sigil~="like-reaction-flyout"] along with [data-sigil~="like"] for an unliked post - * and [data-sigil~="unlike"] for a liked post - */ +// 2018/12/29 +// Previously ._15km ._15ko::before and ._15km ._15ko._77la::before; however, reaction changes no longer affect this element +// The robust measure seems to be the parent of a[data-sigil~="like-reaction-flyout"] along with [data-sigil~="like"] for an unliked post +// and [data-sigil~="unlike"] for a liked post ._15km ._15ko::before { @include background-svg($like); background-position: center !important; @@ -49,21 +47,28 @@ $share: '<svg xmlns="http://www.w3.org/2000/svg" fill="#{$text}" viewBox="0 0 24 $more_horiz: '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0z"/><path fill="#{$text}" d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z"/></svg>'; -$menus: ".sp_89zNula0Qh5", -".sp_MP2OtCXORz9", -".sp_NIWBacTn8LF", -// 2018/12/31 -".sp_9ZFVhnFyWsw"; - -$menu_collector: (); - -@each $menu in $menus { - $menu_collector: append($menu_collector, unquote('#{$menu}'), 'comma'); - $menu_collector: append($menu_collector, unquote('#{$menu}_2x'), 'comma'); - $menu_collector: append($menu_collector, unquote('#{$menu}_3x'), 'comma'); -} - -#{$menu_collector} { +//$menus: ".sp_89zNula0Qh5", +//".sp_MP2OtCXORz9", +//".sp_NIWBacTn8LF", +//// 2018/12/31 +//".sp_9ZFVhnFyWsw", +//// 2019/01/03 +//".sp_SJIJjSlGEIO"; +// +//$menu_collector: (); +// +//@each $menu in $menus { +// $menu_collector: append($menu_collector, unquote('#{$menu}'), 'comma'); +// $menu_collector: append($menu_collector, unquote('#{$menu}_2x'), 'comma'); +// $menu_collector: append($menu_collector, unquote('#{$menu}_3x'), 'comma'); +//} +// +//#{$menu_collector} { +// @include background-svg($more_horiz); +// background-position: center !important; +//} + +.story_body_container i.img[data-sigil*="story-popup-context"] { @include background-svg($more_horiz); background-position: center !important; }
\ No newline at end of file diff --git a/app/src/main/assets/css/core/core.css b/app/src/main/assets/css/core/core.css index 45b05359..1d48fa35 100644 --- a/app/src/main/assets/css/core/core.css +++ b/app/src/main/assets/css/core/core.css @@ -4,7 +4,7 @@ ._z-z, ._z-v, ._1e8d, ._36nl, ._36nm, ._2_11, ._2_rf, ._2ip_, ._403p, .cq, ._usr, ._5xu2, ._3ml8, ._3mla, ._50vk, ._1m2u, ._31y7, ._4kcb, ._1lf6, ._1lf5, ._1lf4, ._1hiz, ._xod, ._5ag5, ._zmk, ._3t_h, ._5lm6, ._3clv, ._3zlc, ._36rd, -._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul, +._31zk, ._31zl, ._3xsa, ._3xs9, ._2-4s, ._2fzz ul, ._3z10, ._43mh, .touch .btn, .fcg, button, ._52j9, ._52jb, ._52ja, ._5j35, ._rnk, ._24u0, ._1g06, ._14ye, .fcb, ._56cz._56c_, ._1gk_, ._55fj, ._45fu, ._18qg, ._1_ac, ._529p, ._4dwt ._1vh3, ._4a5f, ._23_t, ._2rzc, ._23_s, ._2rzd, @@ -124,14 +124,14 @@ button ._v89 ._54k8._1fl1 { border-left: 1px solid rgba(215, 176, 215, 0.3) !important; } -._4_d1 { +._4_d1, ._5cni { border-right: 1px solid rgba(215, 176, 215, 0.3) !important; } ._1mx0, ._1rbr, ._5yt8, ._idb, ._cld, ._1e8h, ._z-w, ._1ha, ._1n8h ._1oby, ._5f99, ._2t39, ._2pbp, ._5rou:first-child, ._egf:first-child, ._io2, ._3qdi ._48_m::after, ._15n_, ._3-2-, ._27ve, ._2s20, ._gui, ._2s21 > *::after, ._32qk, ._d00, ._d01, ._38o9, -._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, +._3u9t, ._55fj, .mEventProfileSection.useBorder td, ._3ils, ._5as0, ._5as2, ._52x1, ._3wjp, ._usq, ._2cul:before, ._13e_, .jewel .flyout, ._3bg5 ._52x6, ._56d8, .al { border-top: 1px solid rgba(215, 176, 215, 0.3) !important; } @@ -208,6 +208,20 @@ button ._v89 ._54k8._1fl1 { border-bottom: 1px solid #d7b0d7 !important; } +._34ee { + background: rgba(199, 70, 70, 0.35) !important; + color: #d7b0d7 !important; +} + +._34em ._34ee { + background: #3b5998 !important; + color: #76d7c2 !important; +} + +._5as0, ._5cni, ._5as2 { + background: #451515 !important; +} + *, *::after, *::before { text-shadow: none !important; box-shadow: none !important; diff --git a/app/src/main/assets/css/core/core.scss b/app/src/main/assets/css/core/core.scss index 8091e2a6..38086529 100644 --- a/app/src/main/assets/css/core/core.scss +++ b/app/src/main/assets/css/core/core.scss @@ -3,6 +3,7 @@ @import "core_text"; @import "core_bg"; @import "core_border"; +@import "core_messenger"; //GLOBAL overrides; use with caution *, *::after, *::before { |