diff options
author | Anthony Bellew <anthonyreflected@gmail.com> | 2017-01-03 11:51:35 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-03 11:51:35 -0700 |
commit | de154dbd5dbb04d083f5a66dc288d9fef7006c01 (patch) | |
tree | 88a1715021c33add55501351dbf74950deeac481 /app/assets/stylesheets/components.scss | |
parent | c3e9ba6a66bfcb9e33edebc73adea0a17d7f02a6 (diff) | |
parent | e6657d7342ee1ce08973bf1e5ab89e423eb8b760 (diff) |
Merge pull request #1 from Gargron/master
Catchup merge
Diffstat (limited to 'app/assets/stylesheets/components.scss')
-rw-r--r-- | app/assets/stylesheets/components.scss | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss index 9f2d1217f..832b9e9b1 100644 --- a/app/assets/stylesheets/components.scss +++ b/app/assets/stylesheets/components.scss @@ -147,6 +147,12 @@ } } +@media screen and (max-height: 800px) { + .account__header__avatar, .account__header__content { + display: none; + } +} + .account__header__content { word-wrap: break-word; font-weight: 300; @@ -332,6 +338,7 @@ .column { width: 330px; + position: relative; } .drawer { @@ -542,13 +549,19 @@ width: 100%; height: 100px; resize: none; - border: none; color: #282c37; - padding: 10px; + padding: 7px; font-family: 'Roboto'; font-size: 14px; margin: 0; resize: vertical; + + border: 3px dashed transparent; + transition: border-color 0.3s ease; + + &.file-drop { + border-color: #aaa; + } } .autosuggest-textarea__suggestions { @@ -575,3 +588,13 @@ color: #fff; } } + +.getting-started__illustration { + width: 330px; + height: 235px; + background: image-url('mastodon-getting-started.png') no-repeat 0 0; + position: absolute; + pointer-events: none; + bottom: 0; + left: 0; +} |