-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch '18546-update-wiki-page-design' into 'master'
Resolve "missing design for wiki page" ### To Do: - [x] Move page navigation from sub-menu to sidebar menu - [x] Update wiki page header - [x] Update wiki edit page actions and header - [x] Update `Git access` page design - [ ] ~~Add search to sidebar navigation~~ ### Screen Shots: #### `@media (min-width: $screen-lg)`     #### `@media (min-width: $screen-md)`   #### `@media (min-width: $screen-sm)`   ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #18546 See merge request !7429
Showing
- app/assets/javascripts/dispatcher.js.es6 1 addition, 1 deletionapp/assets/javascripts/dispatcher.js.es6
- app/assets/javascripts/wikis.js 0 additions, 38 deletionsapp/assets/javascripts/wikis.js
- app/assets/javascripts/wikis.js.es6 73 additions, 0 deletionsapp/assets/javascripts/wikis.js.es6
- app/assets/stylesheets/framework/nav.scss 1 addition, 1 deletionapp/assets/stylesheets/framework/nav.scss
- app/assets/stylesheets/framework/sidebar.scss 1 addition, 1 deletionapp/assets/stylesheets/framework/sidebar.scss
- app/assets/stylesheets/pages/wiki.scss 125 additions, 0 deletionsapp/assets/stylesheets/pages/wiki.scss
- app/controllers/projects/wikis_controller.rb 2 additions, 0 deletionsapp/controllers/projects/wikis_controller.rb
- app/helpers/nav_helper.rb 5 additions, 0 deletionsapp/helpers/nav_helper.rb
- app/views/projects/wikis/_form.html.haml 0 additions, 3 deletionsapp/views/projects/wikis/_form.html.haml
- app/views/projects/wikis/_nav.html.haml 0 additions, 16 deletionsapp/views/projects/wikis/_nav.html.haml
- app/views/projects/wikis/_sidebar.html.haml 23 additions, 0 deletionsapp/views/projects/wikis/_sidebar.html.haml
- app/views/projects/wikis/edit.html.haml 22 additions, 10 deletionsapp/views/projects/wikis/edit.html.haml
- app/views/projects/wikis/git_access.html.haml 27 additions, 25 deletionsapp/views/projects/wikis/git_access.html.haml
- app/views/projects/wikis/history.html.haml 11 additions, 6 deletionsapp/views/projects/wikis/history.html.haml
- app/views/projects/wikis/pages.html.haml 11 additions, 2 deletionsapp/views/projects/wikis/pages.html.haml
- app/views/projects/wikis/show.html.haml 11 additions, 6 deletionsapp/views/projects/wikis/show.html.haml
- changelogs/unreleased/18546-update-wiki-page-design.yml 4 additions, 0 deletionschangelogs/unreleased/18546-update-wiki-page-design.yml
- features/project/wiki.feature 0 additions, 5 deletionsfeatures/project/wiki.feature
- features/steps/project/source/markdown_render.rb 3 additions, 3 deletionsfeatures/steps/project/source/markdown_render.rb
- features/steps/project/wiki.rb 6 additions, 10 deletionsfeatures/steps/project/wiki.rb
Loading
Please register or sign in to comment