diff options
author | ThibG <thib@sitedethib.com> | 2019-01-02 20:03:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-02 20:03:32 +0100 |
commit | 0acd51acdc1e670bf57f58671cb8e30743782c63 (patch) | |
tree | f5ff0b5c3b1e8fd94691264f2bc147e5fa233ecb /app/javascript/flavours/glitch/styles | |
parent | b300948526d967aaf5608c93546ee0d54940c0ef (diff) | |
parent | e77ceb1b29547ed89b4110b3cc3edc9ac325b620 (diff) |
Merge pull request #878 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/styles')
-rw-r--r-- | app/javascript/flavours/glitch/styles/components/modal.scss | 2 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/styles/dashboard.scss | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss index dc26ca3b5..3598959e7 100644 --- a/app/javascript/flavours/glitch/styles/components/modal.scss +++ b/app/javascript/flavours/glitch/styles/components/modal.scss @@ -798,7 +798,7 @@ width: 100px; height: 100px; transform: translate(-50%, -50%); - background: url('~/images/reticle.png') no-repeat 0 0; + background: url('~images/reticle.png') no-repeat 0 0; border-radius: 50%; box-shadow: 0 0 0 9999em rgba($base-shadow-color, 0.35); } diff --git a/app/javascript/flavours/glitch/styles/dashboard.scss b/app/javascript/flavours/glitch/styles/dashboard.scss index 86cf6c61b..1f96e7368 100644 --- a/app/javascript/flavours/glitch/styles/dashboard.scss +++ b/app/javascript/flavours/glitch/styles/dashboard.scss @@ -30,15 +30,21 @@ } } - &__num { + &__num, + &__text { text-align: center; font-weight: 500; font-size: 24px; + line-height: 21px; color: $primary-text-color; font-family: $font-display, sans-serif; margin-bottom: 20px; } + &__text { + font-size: 18px; + } + &__label { font-size: 14px; color: $darker-text-color; |