diff options
-rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 20 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/mobile.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 32 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 30 | ||||
-rw-r--r-- | app/views/groups/show.html.haml | 14 |
6 files changed, 88 insertions, 12 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 57f722c4818..a78b1f30e61 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -156,6 +156,26 @@ border-bottom: 1px solid $border-color; text-align: left; padding: 24px 0; + + .group-info { + p { + margin-bottom: 0; + } + } + + @media (max-width: $screen-xs-max) { + text-align: center; + + .avatar { + float: none; + } + } + } + + .group-info { + h1 { + display: inline; + } } } diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss index 7eb451c124e..33cbee85987 100644 --- a/app/assets/stylesheets/framework/mobile.scss +++ b/app/assets/stylesheets/framework/mobile.scss @@ -30,7 +30,7 @@ } .rss-btn { - display: none !important; + display: none; } .project-home-links { diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 40b24e96fa3..2ada2b9f2f2 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -198,13 +198,35 @@ .dropdown { margin-left: 7px; } - } - .nav-links { - border-bottom: none; + @media (max-width: $screen-md-max) { + float: none; + margin-bottom: 10px; - a { - padding-top: 2px; + .btn { + width: 20%; + } } + + @media (max-width: $screen-xs-max) { + text-align: center; + + .rss-btn, + .dropdown-new { + display: inline-block; + width: 48%; + } + } + } +} + +.nav-links { + border-bottom: none; + white-space: nowrap; + overflow-x: auto; + overflow-y: hidden; + + a { + padding-top: 2px; } } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 3b69e50aca7..7c695ba8f46 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -109,7 +109,7 @@ $red-light: #e52c5a; $red-normal: #d22852; $red-dark: darken($red-normal, 5%); -$black: #000000; +$black: #000; $black-transparent: rgba(0, 0, 0, 0.3); $border-white-light: #f1f2f4; diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 01f98479623..7a3a2ddd363 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -205,3 +205,33 @@ text-align: center; } } + +.user-profile { + @media (max-width: $screen-xs-max) { + .cover-block { + padding-top: 20px; + } + + .cover-controls { + position: static; + margin-bottom: 20px; + + .btn { + display: inline-block; + width: 48%; + } + } + } + + .cover-controls { + @media (max-width: $screen-xs-max) { + position: static; + margin-bottom: 20px; + + .btn { + display: inline-block; + width: 48%; + } + } + } +} diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index ffce7b1fc48..8c23a4ed1a4 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -8,12 +8,16 @@ .container-fluid = link_to group_icon(@group), target: '_blank' do = image_tag group_icon(@group), class: "avatar group-avatar s90" - .cover-title - %h1 @#{@group.path} + .group-info + .cover-title + %h1 + @#{@group.path} + %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) } + = visibility_level_icon(@group.visibility_level, fw: false) - - if @group.description.present? - .cover-desc.description - = markdown(@group.description, pipeline: :description) + - if @group.description.present? + .cover-desc.description + = markdown(@group.description, pipeline: :description) %div{ class: container_class } .top-area |