Commit 85a0be14 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 57ab639c
...@@ -52,12 +52,14 @@ ...@@ -52,12 +52,14 @@
} }
.visibility-level-label { .visibility-level-label {
font-size: 14px; font-size: 13px;
background: #f1f1f1; background: #f1f1f1;
padding: 8px 10px; padding: 8px;
border-radius: 4px; border-radius: 4px;
margin-left: 10px; margin-left: 10px;
color: #888; color: #888;
position: absolute;
margin-left: -80px;
text-shadow: 0 1px 1px #FFF; text-shadow: 0 1px 1px #FFF;
i { i {
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
All projects you have access to are listed here. Public projects are not included here unless you are a member All projects you have access to are listed here. Public projects are not included here unless you are a member
%hr %hr
.row .row
.col-md-3.col-sm-4 .col-md-3.hidden-sm.hidden-xs
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
= nav_tab :scope, nil do = nav_tab :scope, nil do
= link_to projects_dashboard_filter_path(scope: nil) do = link_to projects_dashboard_filter_path(scope: nil) do
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
%i.icon-tag %i.icon-tag
= label.name = label.name
.col-md-9.col-sm-8 .col-md-9
%ul.bordered-list.my-projects.top-list %ul.bordered-list.my-projects.top-list
- @projects.each do |project| - @projects.each do |project|
%li.my-project-row %li.my-project-row
......
.hero-unit .jumbotron
%h2 %h2
GitLab GitLab
%span= Gitlab::VERSION %span= Gitlab::VERSION
......
...@@ -7,34 +7,36 @@ ...@@ -7,34 +7,36 @@
%h1 GITLAB %h1 GITLAB
%span.separator %span.separator
%h1.project_name= title %h1.project_name= title
%ul.nav.navbar-nav
%li .hidden-xs.hidden-sm
%a %ul.nav.navbar-nav
%div.gl-hide.turbolink-spinner
%i.icon-refresh.icon-spin
Loading...
%li
= render "layouts/search"
%li
= link_to public_root_path, title: "Public area", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
%i.icon-globe
%li
= link_to user_snippets_path(current_user), title: "My snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
%i.icon-paste
- if current_user.is_admin?
%li %li
= link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do %a
%i.icon-cogs %div.gl-hide.turbolink-spinner
- if current_user.can_create_project? %i.icon-refresh.icon-spin
Loading...
%li %li
= link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project' do = render "layouts/search"
%i.icon-plus %li
%li = link_to public_root_path, title: "Public area", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
= link_to profile_path, title: "Profile settings", class: 'has_bottom_tooltip', 'data-original-title' => 'Profile settings"' do %i.icon-globe
%i.icon-user %li
%li = link_to user_snippets_path(current_user), title: "My snippets", class: 'has_bottom_tooltip', 'data-original-title' => 'Public area' do
= link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do %i.icon-paste
%i.icon-signout - if current_user.is_admin?
%li %li
= link_to current_user, class: "profile-pic", id: 'profile-pic' do = link_to admin_root_path, title: "Admin area", class: 'has_bottom_tooltip', 'data-original-title' => 'Admin area' do
= image_tag avatar_icon(current_user.email, 26), alt: 'User activity' %i.icon-cogs
- if current_user.can_create_project?
%li
= link_to new_project_path, title: "New project", class: 'has_bottom_tooltip', 'data-original-title' => 'New project' do
%i.icon-plus
%li
= link_to profile_path, title: "Profile settings", class: 'has_bottom_tooltip', 'data-original-title' => 'Profile settings"' do
%i.icon-user
%li
= link_to destroy_user_session_path, class: "logout", method: :delete, title: "Logout", class: 'has_bottom_tooltip', 'data-original-title' => 'Logout' do
%i.icon-signout
%li
= link_to current_user, class: "profile-pic", id: 'profile-pic' do
= image_tag avatar_icon(current_user.email, 26), alt: 'User activity'
- empty_repo = @project.empty_repo? - empty_repo = @project.empty_repo?
.project-home-panel{:class => ("empty-project" if empty_repo)} .project-home-panel{:class => ("empty-project" if empty_repo)}
.visibility-level-label
= visibility_level_icon(@project.visibility_level)
= visibility_level_label(@project.visibility_level)
.row .row
.col-md-6 .col-sm-6
%h4.project-home-title %h4.project-home-title
= @project.name_with_namespace = @project.name_with_namespace
%span.visibility-level-label
= visibility_level_icon(@project.visibility_level)
= visibility_level_label(@project.visibility_level)
.col-md-6 .col-sm-6
- unless empty_repo - unless empty_repo
.project-home-dropdown .project-home-dropdown
= render "dropdown" = render "dropdown"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment