Revert "Merge branch 'new-navigation-prototype' into 'master'"
This reverts merge request !3494
This commit is contained in:
parent
4361cc395c
commit
f2b7cd4435
|
@ -4,6 +4,7 @@ expanded = 'page-sidebar-expanded'
|
||||||
toggleSidebar = ->
|
toggleSidebar = ->
|
||||||
$('.page-with-sidebar').toggleClass("#{collapsed} #{expanded}")
|
$('.page-with-sidebar').toggleClass("#{collapsed} #{expanded}")
|
||||||
$('header').toggleClass("header-collapsed header-expanded")
|
$('header').toggleClass("header-collapsed header-expanded")
|
||||||
|
$('.toggle-nav-collapse i').toggleClass("fa-angle-right fa-angle-left")
|
||||||
$.cookie("collapsed_nav", $('.page-with-sidebar').hasClass(collapsed), { path: '/' })
|
$.cookie("collapsed_nav", $('.page-with-sidebar').hasClass(collapsed), { path: '/' })
|
||||||
|
|
||||||
setTimeout ( ->
|
setTimeout ( ->
|
||||||
|
|
|
@ -33,15 +33,10 @@
|
||||||
background: $color;
|
background: $color;
|
||||||
}
|
}
|
||||||
|
|
||||||
.complex-sidebar .nav-primary {
|
|
||||||
border-right: 1px solid lighten($color, 3%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebar-wrapper {
|
.sidebar-wrapper {
|
||||||
background: $color-darker;
|
background: $color-darker;
|
||||||
|
|
||||||
.sidebar-user {
|
.sidebar-user {
|
||||||
border-top: 1px solid lighten($color, 3%);
|
|
||||||
background: $color-darker;
|
background: $color-darker;
|
||||||
color: $color-light;
|
color: $color-light;
|
||||||
|
|
||||||
|
@ -67,6 +62,7 @@
|
||||||
|
|
||||||
.count {
|
.count {
|
||||||
color: $color-light;
|
color: $color-light;
|
||||||
|
background: $color-dark;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -123,11 +123,11 @@ header {
|
||||||
}
|
}
|
||||||
|
|
||||||
@mixin collapsed-header {
|
@mixin collapsed-header {
|
||||||
margin-left: 40px;
|
margin-left: $sidebar_collapsed_width;
|
||||||
}
|
}
|
||||||
|
|
||||||
.header-collapsed {
|
.header-collapsed {
|
||||||
margin-left: 40px;
|
margin-left: $sidebar_collapsed_width;
|
||||||
|
|
||||||
@media (min-width: $screen-md-min) {
|
@media (min-width: $screen-md-min) {
|
||||||
@include collapsed-header;
|
@include collapsed-header;
|
||||||
|
|
|
@ -144,7 +144,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
a {
|
a {
|
||||||
padding: 7px 12px;
|
padding: 7px 15px;
|
||||||
font-size: $gl-font-size;
|
font-size: $gl-font-size;
|
||||||
line-height: 24px;
|
line-height: 24px;
|
||||||
color: $gray;
|
color: $gray;
|
||||||
|
@ -169,12 +169,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.count {
|
.count {
|
||||||
&:before {
|
float: right;
|
||||||
content: '(';
|
background: #eee;
|
||||||
}
|
padding: 0 8px;
|
||||||
&:after {
|
@include border-radius(6px);
|
||||||
content: ')';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&.back-link i {
|
&.back-link i {
|
||||||
|
@ -193,27 +191,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.expand-nav a {
|
|
||||||
color: $gl-icon-color;
|
|
||||||
width: 60px;
|
|
||||||
position: fixed;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
font-size: 20px;
|
|
||||||
background: transparent;
|
|
||||||
height: 59px;
|
|
||||||
text-align: center;
|
|
||||||
line-height: 59px;
|
|
||||||
border-bottom: 1px solid #eee;
|
|
||||||
transition-duration: .3s;
|
|
||||||
outline: none;
|
|
||||||
z-index: 100;
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.collapse-nav a {
|
.collapse-nav a {
|
||||||
width: $sidebar_width;
|
width: $sidebar_width;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
|
@ -233,12 +210,55 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.page-sidebar-collapsed {
|
.page-sidebar-collapsed {
|
||||||
|
padding-left: $sidebar_collapsed_width;
|
||||||
|
|
||||||
.sidebar-wrapper {
|
.sidebar-wrapper {
|
||||||
|
width: $sidebar_collapsed_width;
|
||||||
|
|
||||||
|
.header-logo {
|
||||||
|
width: $sidebar_collapsed_width;
|
||||||
|
|
||||||
|
a {
|
||||||
|
padding-left: ($sidebar_collapsed_width - 36) / 2;
|
||||||
|
|
||||||
|
.gitlab-text-container {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-sidebar {
|
||||||
|
width: $sidebar_collapsed_width;
|
||||||
|
|
||||||
|
li {
|
||||||
|
width: auto;
|
||||||
|
|
||||||
|
a {
|
||||||
|
span {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.collapse-nav a {
|
||||||
|
width: $sidebar_collapsed_width;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar-user {
|
||||||
|
padding-left: ($sidebar_collapsed_width - 36) / 2;
|
||||||
|
width: $sidebar_collapsed_width;
|
||||||
|
|
||||||
|
.username {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.page-sidebar-expanded {
|
.page-sidebar-expanded {
|
||||||
|
padding-left: $sidebar_collapsed_width;
|
||||||
|
|
||||||
@media (min-width: $screen-md-min) {
|
@media (min-width: $screen-md-min) {
|
||||||
padding-left: $sidebar_width;
|
padding-left: $sidebar_width;
|
||||||
}
|
}
|
||||||
|
@ -289,48 +309,3 @@
|
||||||
padding-right: $sidebar_collapsed_width;
|
padding-right: $sidebar_collapsed_width;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.complex-sidebar {
|
|
||||||
display: inline-block;
|
|
||||||
|
|
||||||
.nav-primary {
|
|
||||||
width: 61px;
|
|
||||||
float: left;
|
|
||||||
height: 100vh;
|
|
||||||
|
|
||||||
.nav-sidebar {
|
|
||||||
width: 60px;
|
|
||||||
|
|
||||||
li a {
|
|
||||||
width: 60px;
|
|
||||||
|
|
||||||
span {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.nav-secondary {
|
|
||||||
$nav-secondary-width: 168px;
|
|
||||||
|
|
||||||
float: left;
|
|
||||||
width: $nav-secondary-width;
|
|
||||||
|
|
||||||
.nav-sidebar {
|
|
||||||
width: $nav-secondary-width;
|
|
||||||
|
|
||||||
li {
|
|
||||||
width: $nav-secondary-width;
|
|
||||||
|
|
||||||
a {
|
|
||||||
width: $nav-secondary-width;
|
|
||||||
|
|
||||||
i {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
- if nav_menu_collapsed?
|
||||||
|
= link_to icon('angle-right'), '#', class: 'toggle-nav-collapse', title: "Open/Close"
|
||||||
|
- else
|
||||||
|
= link_to icon('angle-left'), '#', class: 'toggle-nav-collapse', title: "Open/Close"
|
|
@ -1,7 +1,5 @@
|
||||||
.page-with-sidebar{ class: "#{page_sidebar_class} #{page_gutter_class}" }
|
.page-with-sidebar{ class: "#{page_sidebar_class} #{page_gutter_class}" }
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
.expand-nav
|
|
||||||
= link_to icon('bars'), '#', class: 'toggle-nav-collapse', title: "Open sidebar"
|
|
||||||
.sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
|
.sidebar-wrapper.nicescroll{ class: nav_sidebar_class }
|
||||||
.header-logo
|
.header-logo
|
||||||
%a#logo
|
%a#logo
|
||||||
|
@ -10,19 +8,15 @@
|
||||||
.gitlab-text-container
|
.gitlab-text-container
|
||||||
%h3 GitLab
|
%h3 GitLab
|
||||||
|
|
||||||
- primary_sidebar = current_user ? 'dashboard' : 'explore'
|
- if defined?(sidebar) && sidebar
|
||||||
|
|
||||||
- if defined?(sidebar) && sidebar && sidebar != primary_sidebar
|
|
||||||
.complex-sidebar
|
|
||||||
.nav-primary
|
|
||||||
= render "layouts/nav/#{primary_sidebar}"
|
|
||||||
.nav-secondary
|
|
||||||
= render "layouts/nav/#{sidebar}"
|
= render "layouts/nav/#{sidebar}"
|
||||||
|
- elsif current_user
|
||||||
|
= render 'layouts/nav/dashboard'
|
||||||
- else
|
- else
|
||||||
= render "layouts/nav/#{primary_sidebar}"
|
= render 'layouts/nav/explore'
|
||||||
|
|
||||||
.collapse-nav
|
.collapse-nav
|
||||||
= link_to icon('angle-left'), '#', class: 'toggle-nav-collapse', title: "Hide sidebar"
|
= render partial: 'layouts/collapse_button'
|
||||||
- if current_user
|
- if current_user
|
||||||
= link_to current_user, class: 'sidebar-user', title: "Profile" do
|
= link_to current_user, class: 'sidebar-user', title: "Profile" do
|
||||||
= image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36'
|
= image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36'
|
||||||
|
|
|
@ -95,7 +95,7 @@
|
||||||
Spam Logs
|
Spam Logs
|
||||||
%span.count= number_with_delimiter(SpamLog.count(:all))
|
%span.count= number_with_delimiter(SpamLog.count(:all))
|
||||||
|
|
||||||
= nav_link(controller: :application_settings) do
|
= nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
|
||||||
= link_to admin_application_settings_path, title: 'Settings' do
|
= link_to admin_application_settings_path, title: 'Settings' do
|
||||||
= icon('cogs fw')
|
= icon('cogs fw')
|
||||||
%span
|
%span
|
||||||
|
|
|
@ -15,12 +15,12 @@
|
||||||
= icon('dashboard fw')
|
= icon('dashboard fw')
|
||||||
%span
|
%span
|
||||||
Activity
|
Activity
|
||||||
= nav_link(path: ['dashboard/groups#index', 'explore/groups#index']) do
|
= nav_link(controller: :groups) do
|
||||||
= link_to dashboard_groups_path, title: 'Groups' do
|
= link_to dashboard_groups_path, title: 'Groups' do
|
||||||
= icon('group fw')
|
= icon('group fw')
|
||||||
%span
|
%span
|
||||||
Groups
|
Groups
|
||||||
= nav_link(path: 'dashboard#milestones') do
|
= nav_link(controller: :milestones) do
|
||||||
= link_to dashboard_milestones_path, title: 'Milestones' do
|
= link_to dashboard_milestones_path, title: 'Milestones' do
|
||||||
= icon('clock-o fw')
|
= icon('clock-o fw')
|
||||||
%span
|
%span
|
||||||
|
@ -48,6 +48,7 @@
|
||||||
%span
|
%span
|
||||||
Help
|
Help
|
||||||
|
|
||||||
|
%li.separate-item
|
||||||
= nav_link(controller: :profile) do
|
= nav_link(controller: :profile) do
|
||||||
= link_to profile_path, title: 'Profile Settings', data: {placement: 'bottom'} do
|
= link_to profile_path, title: 'Profile Settings', data: {placement: 'bottom'} do
|
||||||
= icon('user fw')
|
= icon('user fw')
|
||||||
|
|
|
@ -1,4 +1,12 @@
|
||||||
%ul.nav.nav-sidebar
|
%ul.nav.nav-sidebar
|
||||||
|
= nav_link do
|
||||||
|
= link_to root_path, title: 'Go to dashboard', class: 'back-link' do
|
||||||
|
= icon('caret-square-o-left fw')
|
||||||
|
%span
|
||||||
|
Go to dashboard
|
||||||
|
|
||||||
|
%li.separate-item
|
||||||
|
|
||||||
= nav_link(path: 'groups#show', html_options: {class: 'home'}) do
|
= nav_link(path: 'groups#show', html_options: {class: 'home'}) do
|
||||||
= link_to group_path(@group), title: 'Home' do
|
= link_to group_path(@group), title: 'Home' do
|
||||||
= icon('group fw')
|
= icon('group fw')
|
||||||
|
@ -34,7 +42,7 @@
|
||||||
%span
|
%span
|
||||||
Members
|
Members
|
||||||
- if can?(current_user, :admin_group, @group)
|
- if can?(current_user, :admin_group, @group)
|
||||||
= nav_link do
|
= nav_link(html_options: { class: "separate-item" }) do
|
||||||
= link_to edit_group_path(@group), title: 'Settings' do
|
= link_to edit_group_path(@group), title: 'Settings' do
|
||||||
= icon ('cogs fw')
|
= icon ('cogs fw')
|
||||||
%span
|
%span
|
||||||
|
|
|
@ -1,4 +1,12 @@
|
||||||
%ul.nav.nav-sidebar
|
%ul.nav.nav-sidebar
|
||||||
|
= nav_link do
|
||||||
|
= link_to root_path, title: 'Go to dashboard', class: 'back-link' do
|
||||||
|
= icon('caret-square-o-left fw')
|
||||||
|
%span
|
||||||
|
Go to dashboard
|
||||||
|
|
||||||
|
%li.separate-item
|
||||||
|
|
||||||
= nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
|
= nav_link(path: 'profiles#show', html_options: {class: 'home'}) do
|
||||||
= link_to profile_path, title: 'Profile Settings' do
|
= link_to profile_path, title: 'Profile Settings' do
|
||||||
= icon('user fw')
|
= icon('user fw')
|
||||||
|
|
|
@ -1,4 +1,19 @@
|
||||||
%ul.nav.nav-sidebar
|
%ul.nav.nav-sidebar
|
||||||
|
- if @project.group
|
||||||
|
= nav_link do
|
||||||
|
= link_to group_path(@project.group), title: 'Go to group', class: 'back-link' do
|
||||||
|
= icon('caret-square-o-left fw')
|
||||||
|
%span
|
||||||
|
Go to group
|
||||||
|
- else
|
||||||
|
= nav_link do
|
||||||
|
= link_to root_path, title: 'Go to dashboard', class: 'back-link' do
|
||||||
|
= icon('caret-square-o-left fw')
|
||||||
|
%span
|
||||||
|
Go to dashboard
|
||||||
|
|
||||||
|
%li.separate-item
|
||||||
|
|
||||||
= nav_link(path: 'projects#show', html_options: {class: 'home'}) do
|
= nav_link(path: 'projects#show', html_options: {class: 'home'}) do
|
||||||
= link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
|
= link_to project_path(@project), title: 'Project', class: 'shortcuts-project' do
|
||||||
= icon('bookmark fw')
|
= icon('bookmark fw')
|
||||||
|
@ -98,7 +113,7 @@
|
||||||
Snippets
|
Snippets
|
||||||
|
|
||||||
- if project_nav_tab? :settings
|
- if project_nav_tab? :settings
|
||||||
= nav_link(html_options: {class: "#{project_tab_class}"}) do
|
= nav_link(html_options: {class: "#{project_tab_class} separate-item"}) do
|
||||||
= link_to edit_project_path(@project), title: 'Settings' do
|
= link_to edit_project_path(@project), title: 'Settings' do
|
||||||
= icon('cogs fw')
|
= icon('cogs fw')
|
||||||
%span
|
%span
|
||||||
|
|
|
@ -7,6 +7,10 @@ Feature: Groups
|
||||||
When I visit group "NonExistentGroup" page
|
When I visit group "NonExistentGroup" page
|
||||||
Then page status code should be 404
|
Then page status code should be 404
|
||||||
|
|
||||||
|
Scenario: I should have back to group button
|
||||||
|
When I visit group "Owned" page
|
||||||
|
Then I should see back to dashboard button
|
||||||
|
|
||||||
@javascript
|
@javascript
|
||||||
Scenario: I should see group "Owned" dashboard list
|
Scenario: I should see group "Owned" dashboard list
|
||||||
When I visit group "Owned" page
|
When I visit group "Owned" page
|
||||||
|
|
|
@ -18,6 +18,15 @@ Feature: Project
|
||||||
Then I should see the default project avatar
|
Then I should see the default project avatar
|
||||||
And I should not see the "Remove avatar" button
|
And I should not see the "Remove avatar" button
|
||||||
|
|
||||||
|
Scenario: I should have back to group button
|
||||||
|
And project "Shop" belongs to group
|
||||||
|
And I visit project "Shop" page
|
||||||
|
Then I should see back to group button
|
||||||
|
|
||||||
|
Scenario: I should have back to group button
|
||||||
|
And I visit project "Shop" page
|
||||||
|
Then I should see back to dashboard button
|
||||||
|
|
||||||
Scenario: I should have readme on page
|
Scenario: I should have readme on page
|
||||||
And I visit project "Shop" page
|
And I visit project "Shop" page
|
||||||
Then I should see project "Shop" README
|
Then I should see project "Shop" README
|
||||||
|
|
|
@ -5,9 +5,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
|
||||||
include SharedUser
|
include SharedUser
|
||||||
|
|
||||||
step 'I click on group milestones' do
|
step 'I click on group milestones' do
|
||||||
page.within '.nav-secondary' do
|
click_link 'Milestones'
|
||||||
click_link("Milestones")
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'I should see group milestones index page has no milestones' do
|
step 'I should see group milestones index page has no milestones' do
|
||||||
|
|
|
@ -4,6 +4,10 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
|
||||||
include SharedGroup
|
include SharedGroup
|
||||||
include SharedUser
|
include SharedUser
|
||||||
|
|
||||||
|
step 'I should see back to dashboard button' do
|
||||||
|
expect(page).to have_content 'Go to dashboard'
|
||||||
|
end
|
||||||
|
|
||||||
step 'I should see group "Owned"' do
|
step 'I should see group "Owned"' do
|
||||||
expect(page).to have_content '@owned'
|
expect(page).to have_content '@owned'
|
||||||
end
|
end
|
||||||
|
|
|
@ -82,10 +82,8 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
|
||||||
# Sub Tabs: Issues
|
# Sub Tabs: Issues
|
||||||
|
|
||||||
step 'I click the "Milestones" tab' do
|
step 'I click the "Milestones" tab' do
|
||||||
page.within '.nav-secondary' do
|
|
||||||
click_link('Milestones')
|
click_link('Milestones')
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
step 'I click the "Labels" tab' do
|
step 'I click the "Labels" tab' do
|
||||||
click_link('Labels')
|
click_link('Labels')
|
||||||
|
|
|
@ -36,7 +36,7 @@ class Spinach::Features::ProjectFork < Spinach::FeatureSteps
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'I goto the Merge Requests page' do
|
step 'I goto the Merge Requests page' do
|
||||||
page.within '.nav-secondary' do
|
page.within '.page-sidebar-expanded' do
|
||||||
click_link "Merge Requests"
|
click_link "Merge Requests"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -114,10 +114,8 @@ class Spinach::Features::Project < Spinach::FeatureSteps
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'I should not see "Snippets" button' do
|
step 'I should not see "Snippets" button' do
|
||||||
page.within '.nav-secondary' do
|
|
||||||
expect(page).not_to have_link 'Snippets'
|
expect(page).not_to have_link 'Snippets'
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
step 'project "Shop" belongs to group' do
|
step 'project "Shop" belongs to group' do
|
||||||
group = create(:group)
|
group = create(:group)
|
||||||
|
@ -125,6 +123,14 @@ class Spinach::Features::Project < Spinach::FeatureSteps
|
||||||
@project.save!
|
@project.save!
|
||||||
end
|
end
|
||||||
|
|
||||||
|
step 'I should see back to dashboard button' do
|
||||||
|
expect(page).to have_content 'Go to dashboard'
|
||||||
|
end
|
||||||
|
|
||||||
|
step 'I should see back to group button' do
|
||||||
|
expect(page).to have_content 'Go to group'
|
||||||
|
end
|
||||||
|
|
||||||
step 'I click notifications drop down button' do
|
step 'I click notifications drop down button' do
|
||||||
click_link 'notifications-button'
|
click_link 'notifications-button'
|
||||||
end
|
end
|
||||||
|
|
|
@ -41,7 +41,7 @@ module SharedProjectTab
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'the active main tab should be Settings' do
|
step 'the active main tab should be Settings' do
|
||||||
page.within '.nav-secondary' do
|
page.within '.nav-sidebar' do
|
||||||
expect(page).to have_content('Go to project')
|
expect(page).to have_content('Go to project')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue