-
- Downloads
Merge branch 'ui/sidebar' into 'master'
UI: Sidebar & header tweaks and fixes Depends on !1953 See the commits for more details, the messages mostly speak for themselves.   Fixes #2928, #2071, https://dev.gitlab.org/gitlab/gitlabhq/issues/2575, and https://dev.gitlab.org/gitlab/gitlabhq/issues/2573 See merge request !1958
Showing
- app/assets/javascripts/application.js.coffee 17 additions, 9 deletionsapp/assets/javascripts/application.js.coffee
- app/assets/javascripts/sidebar.js.coffee 1 addition, 0 deletionsapp/assets/javascripts/sidebar.js.coffee
- app/assets/stylesheets/framework/header.scss 5 additions, 3 deletionsapp/assets/stylesheets/framework/header.scss
- app/assets/stylesheets/framework/sidebar.scss 98 additions, 88 deletionsapp/assets/stylesheets/framework/sidebar.scss
- app/helpers/nav_helper.rb 8 additions, 0 deletionsapp/helpers/nav_helper.rb
- app/views/layouts/_page.html.haml 5 additions, 5 deletionsapp/views/layouts/_page.html.haml
- app/views/layouts/admin.html.haml 2 additions, 2 deletionsapp/views/layouts/admin.html.haml
- app/views/layouts/ci/_page.html.haml 5 additions, 5 deletionsapp/views/layouts/ci/_page.html.haml
- app/views/layouts/header/_default.html.haml 6 additions, 6 deletionsapp/views/layouts/header/_default.html.haml
- app/views/layouts/nav/_admin.html.haml 14 additions, 14 deletionsapp/views/layouts/nav/_admin.html.haml
- app/views/layouts/nav/_dashboard.html.haml 9 additions, 9 deletionsapp/views/layouts/nav/_dashboard.html.haml
- app/views/layouts/nav/_explore.html.haml 4 additions, 4 deletionsapp/views/layouts/nav/_explore.html.haml
- app/views/layouts/nav/_group.html.haml 7 additions, 7 deletionsapp/views/layouts/nav/_group.html.haml
- app/views/layouts/nav/_group_settings.html.haml 3 additions, 3 deletionsapp/views/layouts/nav/_group_settings.html.haml
- app/views/layouts/nav/_profile.html.haml 10 additions, 10 deletionsapp/views/layouts/nav/_profile.html.haml
- app/views/layouts/nav/_project.html.haml 17 additions, 17 deletionsapp/views/layouts/nav/_project.html.haml
- app/views/layouts/nav/_project_settings.html.haml 12 additions, 12 deletionsapp/views/layouts/nav/_project_settings.html.haml
Loading
Please register or sign in to comment