-
- Downloads
Merge branch 'replace-bootstrap-caret' into 'master'
Replace bootstrap caret with fontawesome caret ## What does this MR do? 1. Replaces all occurrences of `.caret` with fontawesome's caret (`fa-caret-down` for most cases) 2. Remove `.caret` from CSS 3. Refactored pipeline graph toggle to display the correct fontawesome caret (Had to change some JavaScript for this) ## Are there points in the code the reviewer needs to double check? * Need to check if I missed any pagesor for any side effects ## Why was this MR needed? Resolves UI inconsistency ## Screenshots (if relevant) Before (1 example out of many):  After:  ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - 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 you do - 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 #21169 See merge request !6314
No related branches found
No related tags found
Showing
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- app/assets/javascripts/pipeline.js.es6 10 additions, 1 deletionapp/assets/javascripts/pipeline.js.es6
- app/assets/stylesheets/framework/buttons.scss 8 additions, 1 deletionapp/assets/stylesheets/framework/buttons.scss
- app/assets/stylesheets/framework/dropdowns.scss 0 additions, 17 deletionsapp/assets/stylesheets/framework/dropdowns.scss
- app/assets/stylesheets/framework/forms.scss 2 additions, 2 deletionsapp/assets/stylesheets/framework/forms.scss
- app/assets/stylesheets/framework/header.scss 4 additions, 0 deletionsapp/assets/stylesheets/framework/header.scss
- app/assets/stylesheets/framework/selects.scss 8 additions, 1 deletionapp/assets/stylesheets/framework/selects.scss
- app/assets/stylesheets/pages/pipelines.scss 4 additions, 11 deletionsapp/assets/stylesheets/pages/pipelines.scss
- app/views/dashboard/todos/index.html.haml 1 addition, 1 deletionapp/views/dashboard/todos/index.html.haml
- app/views/explore/groups/index.html.haml 1 addition, 1 deletionapp/views/explore/groups/index.html.haml
- app/views/explore/projects/_filter.html.haml 2 additions, 2 deletionsapp/views/explore/projects/_filter.html.haml
- app/views/layouts/header/_default.html.haml 1 addition, 1 deletionapp/views/layouts/header/_default.html.haml
- app/views/projects/branches/index.html.haml 1 addition, 1 deletionapp/views/projects/branches/index.html.haml
- app/views/projects/ci/pipelines/_pipeline.html.haml 2 additions, 2 deletionsapp/views/projects/ci/pipelines/_pipeline.html.haml
- app/views/projects/commit/_commit_box.html.haml 1 addition, 1 deletionapp/views/projects/commit/_commit_box.html.haml
- app/views/projects/commit/_pipeline.html.haml 1 addition, 1 deletionapp/views/projects/commit/_pipeline.html.haml
- app/views/projects/deployments/_actions.haml 1 addition, 1 deletionapp/views/projects/deployments/_actions.haml
- app/views/projects/forks/index.html.haml 1 addition, 1 deletionapp/views/projects/forks/index.html.haml
- app/views/projects/group_links/index.html.haml 1 addition, 1 deletionapp/views/projects/group_links/index.html.haml
- app/views/projects/issues/show.html.haml 1 addition, 1 deletionapp/views/projects/issues/show.html.haml
Please register or sign in to comment