Download as
Browse Code »

Commit 85a0be14f654089f658815f056d9144b6be5ebc6

Authored by Dmitriy Zaporozhets
1 parent 57ab639c
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Hide navbar nav for tablets and phones, move visibility icon outside of layout 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 5 changed files with 43 additions and 39 deletions   Show diff stats
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @85a0be1
@@ -52,12 +52,14 @@ @@ -52,12 +52,14 @@
52 } 52 }
53 53
54 .visibility-level-label { 54 .visibility-level-label {
55 - font-size: 14px; 55 + font-size: 13px;
56 background: #f1f1f1; 56 background: #f1f1f1;
57 - padding: 8px 10px; 57 + padding: 8px;
58 border-radius: 4px; 58 border-radius: 4px;
59 margin-left: 10px; 59 margin-left: 10px;
60 color: #888; 60 color: #888;
  61 + position: absolute;
  62 + margin-left: -80px;
61 text-shadow: 0 1px 1px #FFF; 63 text-shadow: 0 1px 1px #FFF;
62 64
63 i { 65 i {
app/views/dashboard/projects.html.haml
  Diff comments   View file @85a0be1
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 All projects you have access to are listed here. Public projects are not included here unless you are a member 25 All projects you have access to are listed here. Public projects are not included here unless you are a member
26 %hr 26 %hr
27 .row 27 .row
28 - .col-md-3.col-sm-4 28 + .col-md-3.hidden-sm.hidden-xs
29 %ul.nav.nav-pills.nav-stacked 29 %ul.nav.nav-pills.nav-stacked
30 = nav_tab :scope, nil do 30 = nav_tab :scope, nil do
31 = link_to projects_dashboard_filter_path(scope: nil) do 31 = link_to projects_dashboard_filter_path(scope: nil) do
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 %i.icon-tag 81 %i.icon-tag
82 = label.name 82 = label.name
83 83
84 - .col-md-9.col-sm-8 84 + .col-md-9
85 %ul.bordered-list.my-projects.top-list 85 %ul.bordered-list.my-projects.top-list
86 - @projects.each do |project| 86 - @projects.each do |project|
87 %li.my-project-row 87 %li.my-project-row
app/views/help/index.html.haml
  Diff comments   View file @85a0be1
1 -.hero-unit 1 +.jumbotron
2 %h2 2 %h2
3 GitLab 3 GitLab
4 %span= Gitlab::VERSION 4 %span= Gitlab::VERSION
app/views/layouts/_head_panel.html.haml
  Diff comments   View file @85a0be1
@@ -7,34 +7,36 @@ @@ -7,34 +7,36 @@
7 %h1 GITLAB 7 %h1 GITLAB
8 %span.separator 8 %span.separator
9 %h1.project_name= title 9 %h1.project_name= title
10 - %ul.nav.navbar-nav  
11 - %li  
12 - %a  
13 - %div.gl-hide.turbolink-spinner  
14 - %i.icon-refresh.icon-spin  
15 - Loading...  
16 - %li  
17 - = render "layouts/search"  
18 - %li  
19 - = link_to public_root_path, title: "Public area", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do  
20 - %i.icon-globe  
21 - %li  
22 - = link_to user_snippets_path(current_user), title: "My snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do  
23 - %i.icon-paste  
24 - - if current_user.is_admin? 10 +
  11 + .hidden-xs.hidden-sm
  12 + %ul.nav.navbar-nav
25 %li 13 %li
26 - = link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do  
27 - %i.icon-cogs  
28 - - if current_user.can_create_project? 14 + %a
  15 + %div.gl-hide.turbolink-spinner
  16 + %i.icon-refresh.icon-spin
  17 + Loading...
29 %li 18 %li
30 - = link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project' do  
31 - %i.icon-plus  
32 - %li  
33 - = link_to profile_path, title: "Profile settings", class: 'has_bottom_tooltip', 'data-original-title' => 'Profile settings"' do  
34 - %i.icon-user  
35 - %li  
36 - = link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do  
37 - %i.icon-signout  
38 - %li  
39 - = link_to current_user, class: "profile-pic", id: 'profile-pic' do  
40 - = image_tag avatar_icon(current_user.email, 26), alt: 'User activity' 19 + = render "layouts/search"
  20 + %li
  21 + = link_to public_root_path, title: "Public area", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
  22 + %i.icon-globe
  23 + %li
  24 + = link_to user_snippets_path(current_user), title: "My snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
  25 + %i.icon-paste
  26 + - if current_user.is_admin?
  27 + %li
  28 + = link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do
  29 + %i.icon-cogs
  30 + - if current_user.can_create_project?
  31 + %li
  32 + = link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project' do
  33 + %i.icon-plus
  34 + %li
  35 + = link_to profile_path, title: "Profile settings", class: 'has_bottom_tooltip', 'data-original-title' => 'Profile settings"' do
  36 + %i.icon-user
  37 + %li
  38 + = link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do
  39 + %i.icon-signout
  40 + %li
  41 + = link_to current_user, class: "profile-pic", id: 'profile-pic' do
  42 + = image_tag avatar_icon(current_user.email, 26), alt: 'User activity'
app/views/projects/_home_panel.html.haml
  Diff comments   View file @85a0be1
1 - empty_repo = @project.empty_repo? 1 - empty_repo = @project.empty_repo?
2 .project-home-panel{:class => ("empty-project" if empty_repo)} 2 .project-home-panel{:class => ("empty-project" if empty_repo)}
  3 + .visibility-level-label
  4 + = visibility_level_icon(@project.visibility_level)
  5 + = visibility_level_label(@project.visibility_level)
3 .row 6 .row
4 - .col-md-6 7 + .col-sm-6
5 %h4.project-home-title 8 %h4.project-home-title
6 = @project.name_with_namespace 9 = @project.name_with_namespace
7 - %span.visibility-level-label  
8 - = visibility_level_icon(@project.visibility_level)  
9 - = visibility_level_label(@project.visibility_level)  
10 10
11 - .col-md-6 11 + .col-sm-6
12 - unless empty_repo 12 - unless empty_repo
13 .project-home-dropdown 13 .project-home-dropdown
14 = render "dropdown" 14 = render "dropdown"