diff options
| -rw-r--r-- | app/assets/javascripts/application.js | 9 | ||||
| -rw-r--r-- | app/assets/javascripts/shortcuts_dashboard_navigation.js | 40 | ||||
| -rw-r--r-- | app/assets/javascripts/sidebar.js.es6 | 96 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/gitlab-theme.scss | 122 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 23 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 14 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 243 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/profiles/preferences.scss | 40 | ||||
| -rw-r--r-- | app/assets/stylesheets/print.scss | 1 | ||||
| -rw-r--r-- | app/helpers/nav_helper.rb | 9 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 18 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 20 | ||||
| -rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 38 | ||||
| -rw-r--r-- | app/views/layouts/nav/_explore.html.haml | 17 | ||||
| -rw-r--r-- | features/steps/shared/sidebar_active_tab.rb | 31 | ||||
| -rw-r--r-- | spec/javascripts/fixtures/dashboard.html.haml | 45 | ||||
| -rw-r--r-- | spec/javascripts/fixtures/header.html.haml | 4 |
18 files changed, 27 insertions, 745 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 76f3c6506ed..9ceeb942ef8 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -39,7 +39,6 @@ /*= require mousetrap/pause */ /*= require shortcuts */ /*= require shortcuts_navigation */ -/*= require shortcuts_dashboard_navigation */ /*= require shortcuts_issuable */ /*= require shortcuts_network */ /*= require jquery.nicescroll */ @@ -98,11 +97,6 @@ Cookies.defaults.path = gon.relative_url_root || '/'; gl.utils.preventDisabledButtons(); - $('.nav-sidebar').niceScroll({ - cursoropacitymax: '0.4', - cursorcolor: '#FFF', - cursorborder: '1px solid #FFF' - }); $('.js-select-on-focus').on('focusin', function () { return $(this).select().one('mouseup', function (e) { return e.preventDefault(); @@ -249,8 +243,5 @@ gl.awardsHandler = new AwardsHandler(); checkInitialSidebarSize(); new Aside(); - - // bind sidebar events - new gl.Sidebar(); }); }).call(this); diff --git a/app/assets/javascripts/shortcuts_dashboard_navigation.js b/app/assets/javascripts/shortcuts_dashboard_navigation.js deleted file mode 100644 index 1b9a265ba39..00000000000 --- a/app/assets/javascripts/shortcuts_dashboard_navigation.js +++ /dev/null @@ -1,40 +0,0 @@ -/* eslint-disable func-names, space-before-function-paren, max-len, one-var, no-var, no-restricted-syntax, vars-on-top, no-use-before-define, no-param-reassign, new-cap, no-underscore-dangle, wrap-iife, prefer-arrow-callback, consistent-return, no-return-assign, padded-blocks, no-undef, max-len */ - -/*= require shortcuts */ - -(function() { - var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }, - hasProp = {}.hasOwnProperty; - - this.ShortcutsDashboardNavigation = (function(superClass) { - extend(ShortcutsDashboardNavigation, superClass); - - function ShortcutsDashboardNavigation() { - ShortcutsDashboardNavigation.__super__.constructor.call(this); - Mousetrap.bind('g a', function() { - return ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-activity'); - }); - Mousetrap.bind('g i', function() { - return ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-issues'); - }); - Mousetrap.bind('g m', function() { - return ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-merge_requests'); - }); - Mousetrap.bind('g p', function() { - return ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-projects'); - }); - } - - ShortcutsDashboardNavigation.findAndFollowLink = function(selector) { - var link; - link = $(selector).attr('href'); - if (link) { - return window.location = link; - } - }; - - return ShortcutsDashboardNavigation; - - })(Shortcuts); - -}).call(this); diff --git a/app/assets/javascripts/sidebar.js.es6 b/app/assets/javascripts/sidebar.js.es6 deleted file mode 100644 index a23ca449c4b..00000000000 --- a/app/assets/javascripts/sidebar.js.es6 +++ /dev/null @@ -1,96 +0,0 @@ -/* eslint-disable */ -((global) => { - let singleton; - - const pinnedStateCookie = 'pin_nav'; - const sidebarBreakpoint = 1024; - - const pageSelector = '.page-with-sidebar'; - const navbarSelector = '.navbar-fixed-top'; - const sidebarWrapperSelector = '.sidebar-wrapper'; - const sidebarContentSelector = '.nav-sidebar'; - - const pinnedToggleSelector = '.js-nav-pin'; - const sidebarToggleSelector = '.toggle-nav-collapse, .side-nav-toggle'; - - const pinnedPageClass = 'page-sidebar-pinned'; - const expandedPageClass = 'page-sidebar-expanded'; - - const pinnedNavbarClass = 'header-sidebar-pinned'; - const expandedNavbarClass = 'header-sidebar-expanded'; - - class Sidebar { - constructor() { - if (!singleton) { - singleton = this; - singleton.init(); - } - return singleton; - } - - init() { - this.isPinned = Cookies.get(pinnedStateCookie) === 'true'; - this.isExpanded = ( - window.innerWidth >= sidebarBreakpoint && - $(pageSelector).hasClass(expandedPageClass) - ); - $(document) - .on('click', sidebarToggleSelector, () => this.toggleSidebar()) - .on('click', pinnedToggleSelector, () => this.togglePinnedState()) - .on('click', 'html, body', (e) => this.handleClickEvent(e)) - .on('page:change', () => this.renderState()) - .on('todo:toggle', (e, count) => this.updateTodoCount(count)); - this.renderState(); - } - - handleClickEvent(e) { - if (this.isExpanded && (!this.isPinned || window.innerWidth < sidebarBreakpoint)) { - const $target = $(e.target); - const targetIsToggle = $target.closest(sidebarToggleSelector).length > 0; - const targetIsSidebar = $target.closest(sidebarWrapperSelector).length > 0; - if (!targetIsToggle && (!targetIsSidebar || $target.closest('a'))) { - this.toggleSidebar(); - } - } - } - - updateTodoCount(count) { - $('.js-todos-count').text(gl.text.addDelimiter(count)); - } - - toggleSidebar() { - this.isExpanded = !this.isExpanded; - this.renderState(); - } - - togglePinnedState() { - this.isPinned = !this.isPinned; - if (!this.isPinned) { - this.isExpanded = false; - } - Cookies.set(pinnedStateCookie, this.isPinned ? 'true' : 'false', { expires: 3650 }); - this.renderState(); - } - - renderState() { - $(pageSelector) - .toggleClass(pinnedPageClass, this.isPinned && this.isExpanded) - .toggleClass(expandedPageClass, this.isExpanded); - $(navbarSelector) - .toggleClass(pinnedNavbarClass, this.isPinned && this.isExpanded) - .toggleClass(expandedNavbarClass, this.isExpanded); - - const $pinnedToggle = $(pinnedToggleSelector); - const tooltipText = this.isPinned ? 'Unpin navigation' : 'Pin navigation'; - const tooltipState = $pinnedToggle.attr('aria-describedby') && this.isExpanded ? 'show' : 'hide'; - $pinnedToggle.attr('title', tooltipText).tooltip('fixTitle').tooltip(tooltipState); - - if (this.isExpanded) { - setTimeout(() => $(sidebarContentSelector).niceScroll().updateScrollBar(), 200); - } - } - } - - global.Sidebar = Sidebar; - -})(window.gl || (window.gl = {})); diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss index 7c7f991dd87..ff1329af444 100644 --- a/app/assets/stylesheets/framework.scss +++ b/app/assets/stylesheets/framework.scss @@ -18,7 +18,6 @@ @import "framework/flash.scss"; @import "framework/forms.scss"; @import "framework/gfm.scss"; -@import "framework/gitlab-theme.scss"; @import "framework/header.scss"; @import "framework/highlight.scss"; @import "framework/issue_box.scss"; @@ -33,7 +32,6 @@ @import "framework/progress.scss"; @import "framework/panels.scss"; @import "framework/selects.scss"; -@import "framework/sidebar.scss"; @import "framework/tables.scss"; @import "framework/timeline.scss"; @import "framework/typography.scss"; diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss deleted file mode 100644 index 91ab1503439..00000000000 --- a/app/assets/stylesheets/framework/gitlab-theme.scss +++ /dev/null @@ -1,122 +0,0 @@ -/** - * Styles the GitLab application with a specific color theme - * - * $color-light - - * $color - - * $color-darker - - * $color-dark - - */ -@mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) { - .page-with-sidebar { - .toggle-nav-collapse, - .pin-nav-btn { - color: $color-light; - - &:hover { - color: $white-light; - } - } - - .sidebar-wrapper { - background: $color-darker; - } - - .sidebar-header, - .sidebar-action-buttons { - color: $color-light; - background-color: lighten($color-darker, 5%); - } - - .nav-sidebar { - li { - a { - color: $color-light; - - &:hover, - &:focus, - &:active { - background: $color-dark; - } - - i { - color: $color-light; - } - - path, - polygon { - fill: $color-light; - } - - .count { - color: $color-light; - background: $color-dark; - } - - svg { - position: relative; - top: 3px; - } - } - - &.separate-item { - border-top: 1px solid $color; - } - - &.active a { - color: $white-light; - background: $color-dark; - - &.no-highlight { - border: none; - } - - i { - color: $white-light; - } - - path, - polygon { - fill: $white-light; - } - } - } - - } - } -} - -$theme-charcoal: #3d454d; -$theme-charcoal-dark: #383f45; -$theme-charcoal-text: #b9bbbe; - -$theme-blue: #2980b9; -$theme-graphite: #666; -$theme-gray: #373737; -$theme-green: #019875; -$theme-violet: #548; - -body { - &.ui_blue { - @include gitlab-theme(#becde9, $theme-blue, #1970a9, #096099); - } - - &.ui_charcoal { - @include gitlab-theme($theme-charcoal-text, #485157, $theme-charcoal, $theme-charcoal-dark); - } - - &.ui_graphite { - @include gitlab-theme(#ccc, #777, $theme-graphite, #555); - } - - &.ui_gray { - @include gitlab-theme(#979797, $theme-gray, #272727, #222); - } - - &.ui_green { - @include gitlab-theme(#adc, $theme-green, #018865, #017855); - } - - &.ui_violet { - @include gitlab-theme(#98c, $theme-violet, #436, #325); - } -} diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 16ecf466931..17d9b50e327 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -92,26 +92,11 @@ header { } } } - - .side-nav-toggle { - position: absolute; - left: -10px; - margin: 7px 0; - font-size: 18px; - padding: 6px 10px; - border: none; - background-color: $background-color; - - &:hover { - background-color: $btn-gray-hover; - } - } } .header-content { position: relative; height: $header-height; - padding-left: 30px; @media (min-width: $screen-sm-min) { padding-right: 0; @@ -227,14 +212,6 @@ header { } } -.page-sidebar-pinned.right-sidebar-expanded { - @media (max-width: $screen-lg-min) { - .header-content .title { - width: 300px; - } - } -} - @media (max-width: $screen-xs-max) { header .container-fluid { font-size: 18px; diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index ce864c2de5e..1cf256eb093 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -418,11 +418,15 @@ } } -.page-with-layout-nav { - margin-top: $header-height + 2; - - .right-sidebar { - top: ($header-height * 2) + 2; +.content-wrapper { + margin-top: $header-height; + + &.page-with-layout-nav { + margin-top: ($header-height * 2) + 2; + + .right-sidebar { + top: ($header-height * 2) + 2; + } } } diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss deleted file mode 100644 index 44c445c0543..00000000000 --- a/app/assets/stylesheets/framework/sidebar.scss +++ /dev/null @@ -1,243 +0,0 @@ -.page-with-sidebar { - padding: $header-height 0 25px; - transition: padding $sidebar-transition-duration; - - &.page-sidebar-pinned { - .sidebar-wrapper { - box-shadow: none; - } - } - - .sidebar-wrapper { - position: fixed; - top: 0; - bottom: 0; - left: 0; - height: 100%; - width: 0; - overflow: hidden; - transition: width $sidebar-transition-duration; - box-shadow: 2px 0 16px 0 $black-transparent; - } -} - -.sidebar-wrapper { - z-index: 1000; - background: $background-color; - - .nicescroll-rails-hr { - // TODO: Figure out why nicescroll doesn't hide horizontal bar - display: none!important; - } -} - -.content-wrapper { - width: 100%; - transition: padding $sidebar-transition-duration; - - .container-fluid { - background: #fff; - padding: 0 $gl-padding; - - &.container-blank { - background: none; - padding: 0; - border: none; - } - } -} - -.nav-sidebar { - position: absolute; - top: 50px; - bottom: 0; - width: $sidebar_width; - overflow-y: auto; - overflow-x: hidden; - - &.navbar-collapse { - padding: 0 !important; - } - - .sidebar-header { - padding: 11px 22px 12px; - font-size: 20px; - } - - li { - &.separate-item { - padding-top: 10px; - margin-top: 10px; - } - - .icon-container { - width: 34px; - display: inline-block; - text-align: center; - } - - a { - padding: 7px $gl-sidebar-padding; - font-size: $gl-font-size; - line-height: 24px; - display: block; - text-decoration: none; - font-weight: normal; - - &:hover, - &:active, - &:focus { - text-decoration: none; - } - - i { - font-size: 16px; - } - - i, - svg { - margin-right: 13px; - } - } - } - - .count { - float: right; - padding: 0 8px; - border-radius: 6px; - } -} - -.sidebar-action-buttons { - width: $sidebar_width; - position: absolute; - top: 0; - left: 0; - min-height: 50px; - padding: 5px 0; - font-size: 18px; - line-height: 30px; - - .toggle-nav-collapse { - left: 0; - } - - .pin-nav-btn { - right: 0; - display: none; - - @media (min-width: $sidebar-breakpoint) { - display: block; - } - - .fa { - transition: transform .15s; - - .page-sidebar-pinned & { - transform: rotate(90deg); - } - } - } -} - -.nav-header-btn { - padding: 10px $gl-sidebar-padding; - color: inherit; - transition-duration: .3s; - position: absolute; - top: 0; - cursor: pointer; - - &:hover, - &:focus { - color: $white-light; - text-decoration: none; - } -} - -.page-sidebar-expanded { - .sidebar-wrapper { - width: $sidebar_width; - } -} - -.page-sidebar-pinned { - .content-wrapper, - .layout-nav { - @media (min-width: $sidebar-breakpoint) { - padding-left: $sidebar_width; - } - } - - .merge-request-tabs-holder.affix { - @media (min-width: $sidebar-breakpoint) { - left: $sidebar_width; - } - } - - &.right-sidebar-expanded { - .line-resolve-all-container { - display: none; - } - } -} - -header.header-sidebar-pinned { - @media (min-width: $sidebar-breakpoint) { - padding-left: ($sidebar_width + $gl-padding); - - .side-nav-toggle { - display: none; - } - - .header-content { - padding-left: 0; - } - } -} - -.right-sidebar-collapsed { - padding-right: 0; - - @media (min-width: $screen-sm-min) { - padding-right: $sidebar_collapsed_width; - - .merge-request-tabs-holder.affix { - right: $sidebar_collapsed_width; - } - } - - .sidebar-collapsed-icon { - cursor: pointer; - - .btn { - background-color: $gray-light; - } - } -} - -.right-sidebar-expanded { - padding-right: 0; - - @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { - &:not(.build-sidebar) { - padding-right: $sidebar_collapsed_width; - } - } - - @media (min-width: $screen-md-min) { - padding-right: $gutter_width; - - .merge-request-tabs-holder.affix { - right: $gutter_width; - } - } - - &.with-overlay { - padding-right: $sidebar_collapsed_width; - } -} - -.right-sidebar { - border-left: 1px solid $border-color; -} diff --git a/app/assets/stylesheets/pages/profiles/preferences.scss b/app/assets/stylesheets/pages/profiles/preferences.scss index f8da0983b77..fb8d9455ce8 100644 --- a/app/assets/stylesheets/pages/profiles/preferences.scss +++ b/app/assets/stylesheets/pages/profiles/preferences.scss @@ -1,42 +1,3 @@ -.application-theme { - label { - margin-right: 20px; - text-align: center; - - .preview { - border-radius: 4px; - - height: 80px; - margin-bottom: 10px; - width: 160px; - - &.ui_blue { - background: $theme-blue; - } - - &.ui_charcoal { - background: $theme-charcoal; - } - - &.ui_graphite { - background: $theme-graphite; - } - - &.ui_gray { - background: $theme-gray; - } - - &.ui_green { - background: $theme-green; - } - - &.ui_violet { - background: $theme-violet; - } - } - } -} - .syntax-theme { label { margin-right: 20px; @@ -48,7 +9,6 @@ img { border-radius: 4px; - max-width: 100%; } } diff --git a/app/assets/stylesheets/print.scss b/app/assets/stylesheets/print.scss index 0ff3c3f5472..6cc1cc8e263 100644 --- a/app/assets/stylesheets/print.scss +++ b/app/assets/stylesheets/print.scss @@ -31,7 +31,6 @@ nav.navbar-collapse.collapse, .blob-commit-info, .file-title, .file-holder, -.sidebar-wrapper, .nav, .btn, ul.notes-form, diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb index df87fac132d..6de76e9b5d3 100644 --- a/app/helpers/nav_helper.rb +++ b/app/helpers/nav_helper.rb @@ -1,9 +1,4 @@ module NavHelper - def page_sidebar_class - if pinned_nav? - "page-sidebar-expanded page-sidebar-pinned" - end - end def page_gutter_class if current_path?('merge_requests#show') || @@ -27,10 +22,6 @@ module NavHelper class_name = '' class_name << " with-horizontal-nav" if defined?(nav) && nav - if pinned_nav? - class_name << " header-sidebar-expanded header-sidebar-pinned" - end - class_name end diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index a9a0b149049..9df67d77eef 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -1,20 +1,4 @@ -.page-with-sidebar{ class: "#{page_sidebar_class} #{page_gutter_class}" } - .sidebar-wrapper.nicescroll - .sidebar-action-buttons - .nav-header-btn.toggle-nav-collapse{ title: "Open/Close" } - %span.sr-only Toggle navigation - = icon('bars') - - %div{ class: "nav-header-btn pin-nav-btn has-tooltip #{'is-active' if pinned_nav?} js-nav-pin", title: pinned_nav? ? "Unpin navigation" : "Pin Navigation", data: { placement: 'right', container: 'body' } } - %span.sr-only Toggle navigation pinning - = icon('fw thumb-tack') - - - if defined?(sidebar) && sidebar - = render "layouts/nav/#{sidebar}" - - elsif current_user - = render 'layouts/nav/dashboard' - - else - = render 'layouts/nav/explore' +%div{ class: "#{page_gutter_class}" } - if defined?(nav) && nav .layout-nav diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 5456be77aab..0d26e004611 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -2,9 +2,6 @@ %a{ href: "#content-body", tabindex: "1", class: "sr-only gl-accessibility" } Skip to content %div{ class: "container-fluid" } .header-content - %button.side-nav-toggle{ type: 'button', "aria-label" => "Toggle global navigation" } - %span.sr-only Toggle navigation - = icon('bars') %button.navbar-toggle{type: 'button'} %span.sr-only Toggle navigation = icon('ellipsis-v') @@ -47,6 +44,23 @@ = link_to "Profile Settings", profile_path, aria: { label: "Profile Settings" } %li = link_to "Help", help_path, aria: { label: "Help" } + %li + = link_to "Projects", dashboard_projects_path, aria: { label: "Projects" } + %li + = link_to "Activity", activity_dashboard_path, aria: { label: "Activity" } + - if koding_enabled? + %li + = link_to "Koding", koding_path, aria: { label: "Koding" } + %li + = link_to "Groups", dashboard_groups_path, aria: { label: "Groups" } + %li + = link_to "Milestones", dashboard_milestones_path, aria: { label: "Milestones" } + %li + = link_to "Issues", assigned_issues_dashboard_path, aria: { label: "Issues" } + %li + = link_to "Merge Requests", assigned_mrs_dashboard_path, aria: { label: "Merge Requests" } + %li + = link_to "Snippets", dashboard_snippets_path, aria: { label: "Snippets" } %li.divider %li = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link", aria: { label: "Sign out" } diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml deleted file mode 100644 index 2a6d9cda379..00000000000 --- a/app/views/layouts/nav/_dashboard.html.haml +++ /dev/null @@ -1,38 +0,0 @@ -.nav-sidebar - .sidebar-header Across GitLab - %ul.nav - = nav_link(path: ['root#index', 'projects#trending', 'projects#starred', 'dashboard/projects#index'], html_options: {class: "#{project_tab_class} home"}) do - = link_to dashboard_projects_path, title: 'Projects', class: 'dashboard-shortcuts-projects' do - %span - Projects - = nav_link(path: 'dashboard#activity') do - = link_to activity_dashboard_path, class: 'dashboard-shortcuts-activity', title: 'Activity' do - %span - Activity - - if koding_enabled? - = nav_link(controller: :koding) do - = link_to koding_path, title: 'Koding' do - %span - Koding - = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do - = link_to dashboard_groups_path, title: 'Groups' do - %span - Groups - = nav_link(controller: 'dashboard/milestones') do - = link_to dashboard_milestones_path, title: 'Milestones' do - %span - Milestones - = nav_link(path: 'dashboard#issues') do - = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'dashboard-shortcuts-issues' do - %span - Issues - %span.count= number_with_delimiter(cached_assigned_issuables_count(current_user, :issues, :opened)) - = nav_link(path: 'dashboard#merge_requests') do - = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do - %span - Merge Requests - %span.count= number_with_delimiter(cached_assigned_issuables_count(current_user, :merge_requests, :opened)) - = nav_link(controller: 'dashboard/snippets') do - = link_to dashboard_snippets_path, title: 'Snippets' do - %span - Snippets diff --git a/app/views/layouts/nav/_explore.html.haml b/app/views/layouts/nav/_explore.html.haml deleted file mode 100644 index e5bda7b3a6f..00000000000 --- a/app/views/layouts/nav/_explore.html.haml +++ /dev/null @@ -1,17 +0,0 @@ -%ul.nav.nav-sidebar - = nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do - = link_to explore_root_path, title: 'Projects' do - %span - Projects - = nav_link(controller: [:groups, 'groups/milestones', 'groups/group_members']) do - = link_to explore_groups_path, title: 'Groups' do - %span - Groups - = nav_link(controller: :snippets) do - = link_to explore_snippets_path, title: 'Snippets' do - %span - Snippets - = nav_link(controller: :help) do - = link_to help_path, title: 'Help' do - %span - Help diff --git a/features/steps/shared/sidebar_active_tab.rb b/features/steps/shared/sidebar_active_tab.rb deleted file mode 100644 index 07fff16e867..00000000000 --- a/features/steps/shared/sidebar_active_tab.rb +++ /dev/null @@ -1,31 +0,0 @@ -module SharedSidebarActiveTab - include Spinach::DSL - - step 'no other main tabs should be active' do - expect(page).to have_selector('.nav-sidebar li.active', count: 1) - end - - def ensure_active_main_tab(content) - expect(find('.nav-sidebar li.active')).to have_content(content) - end - - step 'the active main tab should be Home' do - ensure_active_main_tab('Projects') - end - - step 'the active main tab should be Groups' do - ensure_active_main_tab('Groups') - end - - step 'the active main tab should be Projects' do - ensure_active_main_tab('Projects') - end - - step 'the active main tab should be Issues' do - ensure_active_main_tab('Issues') - end - - step 'the active main tab should be Merge Requests' do - ensure_active_main_tab('Merge Requests') - end -end diff --git a/spec/javascripts/fixtures/dashboard.html.haml b/spec/javascripts/fixtures/dashboard.html.haml deleted file mode 100644 index 32446acfd60..00000000000 --- a/spec/javascripts/fixtures/dashboard.html.haml +++ /dev/null @@ -1,45 +0,0 @@ -%ul.nav.nav-sidebar - %li.home.active - %a.dashboard-shortcuts-projects - %span - Projects - %li - %a - %span - Todos - %span.count.js-todos-count - 1 - %li - %a.dashboard-shortcuts-activity - %span - Activity - %li - %a - %span - Groups - %li - %a - %span - Milestones - %li - %a.dashboard-shortcuts-issues - %span - Issues - %span - 1 - %li - %a.dashboard-shortcuts-merge_requests - %span - Merge Requests - %li - %a - %span - Snippets - %li - %a - %span - Help - %li - %a - %span - Profile Settings diff --git a/spec/javascripts/fixtures/header.html.haml b/spec/javascripts/fixtures/header.html.haml index 4db2ef604de..59f3ce5654a 100644 --- a/spec/javascripts/fixtures/header.html.haml +++ b/spec/javascripts/fixtures/header.html.haml @@ -1,10 +1,6 @@ %header.navbar.navbar-fixed-top.navbar-gitlab.nav_header_class .container-fluid .header-content - %button.side-nav-toggle - %span.sr-only - Toggle navigation - %i.fa.fa-bars %button.navbar-toggle %span.sr-only Toggle navigation |