diff options
author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2015-12-23 09:00:59 -0500 |
---|---|---|
committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2015-12-23 09:00:59 -0500 |
commit | 265750c80d8e8d1e9858b7b5f434f4aefbd351f7 (patch) | |
tree | 73e883468441ab00750393d6884f26adda91d824 /app | |
parent | 48ecb614e795668f40e03174c98ad7fb4adef7a2 (diff) | |
download | gitlab-ce-265750c80d8e8d1e9858b7b5f434f4aefbd351f7.tar.gz |
adds css for `left-top-menu`. Also hides buttons in certain for factors.
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/framework/common.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/mobile.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 9 | ||||
-rw-r--r-- | app/views/dashboard/_projects_head.html.haml | 4 |
4 files changed, 17 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 8b6c15a9c2d..e864da15591 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -374,9 +374,9 @@ table { } } -.center-top-menu { +.center-top-menu, .left-top-menu { @include nav-menu; - text-align: left; + text-align: center; margin-top: 5px; margin-bottom: $gl-padding; height: auto; @@ -409,6 +409,10 @@ table { } } +.left-top-menu { + text-align: left; +} + .center-middle-menu { @include nav-menu; padding: 0; diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss index 6f44c323732..c00709fb6bb 100644 --- a/app/assets/stylesheets/framework/mobile.scss +++ b/app/assets/stylesheets/framework/mobile.scss @@ -81,7 +81,7 @@ display: none; } - .center-top-menu { + .center-top-menu, .left-top-menu { li a { font-size: 14px; padding: 19px 10px; diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index c379057698d..37197f61bc4 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -338,7 +338,7 @@ ul.nav.nav-projects-tabs { .top-area { border-bottom: 1px solid #EEE; - ul.center-top-menu { + ul.left-top-menu { display: inline-block; width: 50%; margin-bottom: 0px; @@ -350,12 +350,19 @@ ul.nav.nav-projects-tabs { display: inline-block; float: right; padding-top: 7px; + text-align: right; .btn-green { margin-top: -2px; margin-left: 10px; } } + + @media (max-width: $screen-xs-max) { + .projects-search-form { + padding-top: 15px; + } + } } .fork-namespaces { diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml index a977b241971..f4a3e3162bf 100644 --- a/app/views/dashboard/_projects_head.html.haml +++ b/app/views/dashboard/_projects_head.html.haml @@ -1,7 +1,7 @@ = content_for :flash_message do = render 'shared/project_limit' .top-area - %ul.center-top-menu + %ul.left-top-menu = nav_link(page: [dashboard_projects_path, root_path]) do = link_to dashboard_projects_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do Your Projects @@ -13,7 +13,7 @@ Explore Projects .projects-search-form - = search_field_tag :filter_projects, nil, placeholder: 'Filter by name...', class: 'projects-list-filter form-control', spellcheck: false + = search_field_tag :filter_projects, nil, placeholder: 'Filter by name...', class: 'projects-list-filter form-control hidden-xs', spellcheck: false - if current_user.can_create_project? = link_to new_project_path, class: 'btn btn-green' do %i.fa.fa-plus |