diff options
| author | Reverite <github@reverite.sh> | 2019-05-23 22:22:54 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-05-23 22:22:54 -0700 |
| commit | 93492d29e36e2bed11a1a742e2e0750716df5062 (patch) | |
| tree | e475c56449c2c7e478e629cadbff41c9bb2fee3d /app/javascript/flavours | |
| parent | d873e4f3d5878a2b2800758cbe3b9c870c228d51 (diff) | |
| parent | 72bf354e979a9b8c14c41bf34c47060d5ff4d232 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/javascript/flavours')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/components/emoji.scss | 1 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/components/status.scss | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/emoji.scss b/app/javascript/flavours/glitch/styles/components/emoji.scss index dd386d698..160e9d811 100644 --- a/app/javascript/flavours/glitch/styles/components/emoji.scss +++ b/app/javascript/flavours/glitch/styles/components/emoji.scss @@ -17,6 +17,7 @@ box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4); border-radius: 4px; margin-top: 5px; + z-index: 2; .emoji-mart-scroll { transition: opacity 200ms ease; diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index 62f0a815f..327694a7e 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -40,11 +40,11 @@ h1, h2 { font-weight: 700; - font-size: 18px; + font-size: 1.2em; } h2 { - font-size: 16px; + font-size: 1.1em; } h3, h4, h5 { |