diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-21 10:00:13 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-21 10:00:13 +0000 |
commit | b62368235b40743e5b010aa8fc6fc2058bf1effa (patch) | |
tree | cfe60e41e24d02b659475cd7514e1b6016a780de /app/assets/stylesheets/framework | |
parent | bc8e328fe4df7965e3ad80ee722cceb7c5b16261 (diff) | |
parent | d40f393d2c99e4a36d097471acf9379f12c34f19 (diff) | |
download | gitlab-ce-b62368235b40743e5b010aa8fc6fc2058bf1effa.tar.gz |
Merge branch '40063-markdown-editor-improvements' into 'master'
Hide toolbar in markdown preview mode
Closes #40063
See merge request gitlab-org/gitlab-ce!15994
Diffstat (limited to 'app/assets/stylesheets/framework')
-rw-r--r-- | app/assets/stylesheets/framework/markdown_area.scss | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss index 5389eb0a5f2..6b07ffdbd61 100644 --- a/app/assets/stylesheets/framework/markdown_area.scss +++ b/app/assets/stylesheets/framework/markdown_area.scss @@ -74,7 +74,7 @@ } .md-header-tab { - @media(max-width: $screen-xs-max) { + @media (max-width: $screen-xs-max) { flex: 1; width: 100%; border-bottom: 1px solid $border-color; @@ -82,16 +82,23 @@ } } -.md-header-toolbar { - margin-left: auto; +.nav-links { + li.md-header-toolbar { + margin-left: auto; + display: none; - @media(max-width: $screen-xs-max) { - flex: none; - display: flex; - justify-content: center; - width: 100%; - padding-top: $gl-padding-top; - padding-bottom: $gl-padding-top; + &.active { + display: block; + + @media (max-width: $screen-xs-max) { + flex: none; + display: flex; + justify-content: center; + width: 100%; + padding-top: $gl-padding-top; + padding-bottom: $gl-padding-top; + } + } } } @@ -175,7 +182,7 @@ margin-left: $gl-padding; margin-right: -5px; - @media(max-width: $screen-xs-max) { + @media (max-width: $screen-xs-max) { margin-left: 0; margin-right: 0; } @@ -239,7 +246,7 @@ } } -@media(max-width: $screen-xs-max) { +@media (max-width: $screen-xs-max) { .atwho-view-ul { width: 350px; } |