summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
Commit message (Collapse)AuthorAgeFilesLines
* Fixed add to tree button on mobilenew-file-mobile-dropdown-fixPhil Hughes2016-09-141-0/+4
| | | | Closes #22128
* Merge branch '21895-horizontal-scroll-bar-present-in-collapsed-sidebar' into ↵Annabel Dunstone Gray2016-09-131-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Removed horizontal overflow from collapsed issuable sidebar ## What does this MR do? Uses flexbox to remove any horizontal overflow from the collapsed issuable sidebar ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? There was a horizontal scrollbar at the bottom of all collapsed issuable sidebars as seen in the screenshot in #21895. ## Screenshots (if relevant) ![2016-09-11_16.28.30](/uploads/8e01565385b1ff0b736630ac3c24a3a1/2016-09-11_16.28.30.gif) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21895. See merge request !6295
| * Removed horizontal overflow from collapsed issuable sidebar21895-horizontal-scroll-bar-present-in-collapsed-sidebarLuke Bennett2016-09-121-1/+1
| |
* | Merge branch '21877-no-mr-branch-title-link-in-issue-on-mobile' into 'master' Annabel Dunstone Gray2016-09-132-4/+9
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue merge-request-info missing on mobile ## What does this MR do? Removed media query declaration relating to `.merge-request-info` and `.issue-info`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Mobile UX ## Screenshots (if relevant) ![Screen_Shot_2016-09-07_at_19.10.39](/uploads/6dc39b72459087826071ba9fbd06da17/Screen_Shot_2016-09-07_at_19.10.39.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21877 See merge request !6250
| * Used flexbox to force related merge request list items into columned items21877-no-mr-branch-title-link-in-issue-on-mobileLuke Bennett2016-09-091-0/+9
| |
| * Removed media query declaration relating to merge-request-info and issue-infoLuke Bennett2016-09-071-4/+0
| |
* | Merge branch 'support-long-branch-namers' into 'master' Annabel Dunstone Gray2016-09-081-3/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Give project selection dropdowns responsive width, long names wrap. ## What does this MR do? Makes two dropdown menus (branch name selector & project selector) wider on larger screens, and allows their contents to wrap. ## Are there points in the code the reviewer needs to double check? Sanity check. ## Why was this MR needed? Considered a regression, as users who relied on long branch names could no longer see them fully. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-30_at_2.50.43_PM](/uploads/e0252cb02c5f34f3c777d2d67028042f/Screen_Shot_2016-08-30_at_2.50.43_PM.png) After: ![Screen_Shot_2016-08-30_at_2.49.35_PM](/uploads/b504e0f3e139c85699bc5aafb58199f3/Screen_Shot_2016-08-30_at_2.49.35_PM.png) After (updated after fixes, including project selector): ![Screen_Shot_2016-09-02_at_1.46.53_PM](/uploads/b480fc8193f713ce43518cb83886fd52/Screen_Shot_2016-09-02_at_1.46.53_PM.png) ![Screen_Shot_2016-09-02_at_1.50.26_PM](/uploads/f0d31702668e83e6c0c24782cc43fdbd/Screen_Shot_2016-09-02_at_1.50.26_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [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 #15633 See merge request !6105
| * | Give project selection dropdowns responsive width, long-names wrap.support-long-branch-namersBryce2016-09-021-3/+9
| | |
* | | Merge branch 'dz-bulk-edit-mr' into 'master' Rémy Coutable2016-09-082-11/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add bulk update support for merge requests list ## What does this MR do? Adds new feature: ability to update multiple merge requests at once from index page (same like we have for issues already) ## Are there points in the code the reviewer needs to double check? I don't think so ## Why was this MR needed? * consistency with issues * save user time when you want set same label/milestone to 20 merge requests ## Screenshots (if relevant) ![Screenshot_2016-09-08_11.48.49](/uploads/fe50b2472330e211eb8d6d6dafb15667/Screenshot_2016-09-08_11.48.49.png)![Screenshot_2016-09-08_11.48.46](/uploads/4833c3705120ec028f7a62a4e128998d/Screenshot_2016-09-08_11.48.46.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] ~~API support added~~ - Tests - [x] Added for this feature/bug - [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? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20087 See merge request !6226
| * | | Refactor code for bulk update merge requests featuredz-bulk-edit-mrDmitriy Zaporozhets2016-09-081-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add bulk update support for merge requests listDmitriy Zaporozhets2016-09-082-11/+15
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'awards-control-margin' into 'master' Annabel Dunstone Gray2016-09-082-5/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix margin for awards-control buttons ## What does this MR do? Fixes margin in awards-control ## Screenshots (if relevant) Before: ![Screen_Shot_2016-09-06_at_10.58.03_AM](/uploads/b3fcd4103669bc7ae54a22093f492391/Screen_Shot_2016-09-06_at_10.58.03_AM.png) After: ![Screen_Shot_2016-09-06_at_10.54.54_AM](/uploads/dcd0e57a8cff82fe70990a9a8e2b1232/Screen_Shot_2016-09-06_at_10.54.54_AM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/21896 See merge request !6233
| * | | | fix padding top/bottomawards-control-margintauriedavis2016-09-071-1/+1
| | | | |
| * | | | minor refactortauriedavis2016-09-071-5/+2
| | | | |
| * | | | fix margin for multi-line emojistauriedavis2016-09-072-0/+6
| | | | |
| * | | | fix margin for awards-control buttonstauriedavis2016-09-061-2/+0
| | | | |
* | | | | Merge branch 'dz-mr-version-compare' into 'master' Douwe Maan2016-09-081-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow compare merge request versions ## What does this MR do? Add new functionality to the merge request page. It allows you easily compare merge request versions in one click. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To improve code review experience. ## Screenshots (if relevant) See discussion ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [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? https://gitlab.com/gitlab-org/gitlab-ce/issues/13570 See merge request !6127
| * | | | Improve merge request version featureDmitriy Zaporozhets2016-09-071-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use version numbers instead of sha as more user-friendly * Make it clear that we compare later version (left) with older one (right) * Improve wording of version switch panel Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Improve merge request version switch/compare dropdownDmitriy Zaporozhets2016-09-071-1/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'blame-ui-fix' into 'master' Annabel Dunstone Gray2016-09-071-19/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix layout issues with blame table ## What does this MR do? Fixes layout issues with the blame before. Previously the content would expanded out of the table making it look ugly! ## Screenshots (if relevant) ![Screen_Shot_2016-09-06_at_10.36.17](/uploads/719fc7cdf909b18afbe8afafbae7d99a/Screen_Shot_2016-09-06_at_10.36.17.png) ## What are the relevant issue numbers? Closes #21216 See merge request !6218
| * | | | | Fix layout issues with blame tableblame-ui-fixPhil Hughes2016-09-061-19/+3
| | | | | | | | | | | | | | | | | | | | | | | | Closes #21216
* | | | | | remove superfluous "collapsed" class and rename header classes for clarityMike Greiling2016-09-073-21/+3
| | | | | |
* | | | | | refactor sidebar logic into singleton classMike Greiling2016-09-071-3/+1
| | | | | |
* | | | | | Merge branch 'replace-animate-emoji-timeout' into 'master' Fatih Acet2016-09-072-44/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace animateEmoji timeout with eventListener ## What does this MR do? Replaces the end animation timeout for awards_handler.js with an eventListener that listens for the animationEnd event ## Are there points in the code the reviewer needs to double check? Check for any side effects ## Why was this MR needed? Improve code quality so that it is easier to understand ## What are the relevant issue numbers? Closes #20679 ## 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 [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) See merge request !5690
| * | | | | | Replace animateEmoji timeout with eventListenerClement Ho2016-09-062-44/+33
| | | | | | |
* | | | | | | Merge branch 'master' into issues-filters-reset-btnBryce Johnson2016-09-071-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'created-icon' into 'master' Fatih Acet2016-09-071-1/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lighten color of created icon #### What does this MR do? Changes `created` icon color to lighter gray #### Screenshots (if relevant) ![Screen_Shot_2016-09-06_at_10.25.19_AM](/uploads/6543d0004d817adcbe13cc2b23b6b7bb/Screen_Shot_2016-09-06_at_10.25.19_AM.png) cc @dimitrieh See merge request !6230
| | * | | | | Lighten color of created iconcreated-iconAnnabel Dunstone Gray2016-09-061-1/+1
| | | |_|/ / | | |/| | |
* | | | | | Merge branch 'master' into issues-filters-reset-btnBryce Johnson2016-09-076-18/+34
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch ↵Annabel Dunstone Gray2016-09-061-3/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '18851-commit-text-in-activity-commits-page-etc-has-the-wrong-line-height' into 'master' Changed `.commit-row-title` `line-height` to `1.35` from `1` ## What does this MR do? Changes `.commit-row-title` `line-height` to `1.35` from `1`, this is to match the `line-height: 20px;` from before 41c2ea9b. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Not enough space between commit lines ## What are the relevant issue numbers? Closes #18851. ## Screenshots (if relevant) New screenshot below. ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #18851 See merge request !5996
| | * | | | Changed `.commit-row-title` `line-height` to `1.35` from `1`18851-commit-text-in-activity-commits-page-etc-has-the-wrong-line-heightLuke Bennett2016-09-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed `margin-bottom` Corrected commit-actions margin Reverted action margin for a more logical approach
| * | | | | Merge branch 'cleanup-mislignments-issue-list-view' into 'master' Annabel Dunstone Gray2016-09-062-2/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | increased checkbox and filter button padding ## What does this MR do? fixed misalignments as described in https://gitlab.com/gitlab-org/gitlab-ce/issues/19110 ## Are there points in the code the reviewer needs to double check? Not that I know of ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/issues/19110 ## Screenshots (if relevant) ![image](/uploads/e7c5ffe78e1a5b67fa0335ba1c231df2/image.png) ![image](/uploads/1591ed872e765da3b5ed071c8872194f/image.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] 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) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19110 See merge request !6206
| | * | | | increased checkbox and filter button paddingDimitrie Hoekstra2016-09-052-2/+2
| | | |/ / | | |/| |
| * | | | remove css selectorsubudzisz2016-09-062-11/+10
| | | | |
| * | | | add feature testubudzisz2016-09-061-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add feature test add feature test add feature test remove test to builds_spec remove feature test to builds_spec remove feature test to builds_spec add changes to methods and remove FactoryGirl add changes to methods and remove FactoryGirl adding changes to test and js file changes grammar update changelog rename file name update files after review update files after review update files after review
| * | | | add js fileubudzisz2016-09-061-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show variables on-click show variables on-click show variables on-click remove = and add new js classes into sidebar.scss show variables by clicking button show variables by clicking button show variables by clicking button show variables by clicking button use id for a class add nicescroll add nicescroll
| * | | | Merge branch 'master' into repository-page-ui-issuesBryce Johnson2016-09-0516-104/+114
| |\ \ \ \ | | |/ / /
| * | | | Merge branch 'master' into repository-page-ui-issuesBryce Johnson2016-09-029-30/+58
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'master' into repository-page-ui-issuesBryce Johnson2016-09-012-1/+2
| |\ \ \ \
| * | | | | Fix repo page ui issues, show full last commit message in repo view.Bryce2016-08-312-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrates changes from ClemMakesApps' commit: 8581e152, although it was reverted to avoid frustrating conflicts. See MR: !5530 (diffs)
| * | | | | Revert "Add last commit time to repo view"Bryce2016-08-311-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8581e152ef8fa27b6670760d39b7f06dab5f796b. This creates really difficult conflicts with another MR that was worked on simulataneously. That MR mostly encompassed the aims of this commit. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5308/commits
* | | | | | Merge branch 'master' into issues-filters-reset-btnBryce Johnson2016-09-055-18/+21
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'fix-suggested-colors-underline' into 'master' Annabel Dunstone Gray2016-09-021-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove suggested colors hover underline ## What does this MR do? * Removes the blue hover underline for the suggested color containers * Added `cursor: pointer` to the suggested color containers ## Are there points in the code the reviewer needs to double check? Shouldn't be :smile: ## Why was this MR needed? Improves UI ## Screenshots (if relevant) Before: ![DS48AvgSVX](/uploads/0077e7a5837c8ce9fe2493ad6a42a018/DS48AvgSVX.gif) After: ![olZzS68WNr](/uploads/4e0ae808c69942a528f1303df8cddeae/olZzS68WNr.gif) ## 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 #21792 See merge request !6165
| | * | | | | Remove suggested colors hover underlineClement Ho2016-09-021-0/+1
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'icon-button-alignment' into 'master' Fatih Acet2016-09-021-1/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of icon buttons ## What does this MR do? Fix misalignment of buttons with only an icon which was introduced by !5451. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5451#note_14066627 ## Screenshots ### Before ![with-text](/uploads/aa7f7a98e2015070689e762e0cf99844/witht-text.png) ![without-text](/uploads/72db7c54e3961fd0df34b0ea79455fd0/without-text.png) ### After ![with-text](/uploads/3f19e55773083bcb22f3909f6dc0d147/witht-text.png) ![without-text](/uploads/b6647d4d71eb5cd9d1712908d2b93665/without-text.png) See merge request !5887
| | * | | | | Fix alignment of icon buttons (!5887)winniehell2016-08-191-1/+3
| | | | | | |
| * | | | | | Merge branch 'fix-wiki-anchor-interaction' into 'master' Fatih Acet2016-09-021-17/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown anchor icon interaction ## What does this MR do? Fixes and improves the markdown anchor icon interaction so that hovering over any headers (generated through markdown) will have an anchor icon that's easily accessible (won't hide from you on edge cases), replaced the icon with fontAwesome icon and added more padding for the anchor icon. ## Are there points in the code the reviewer needs to double check? 1. Need to check if it's okay to replace the icon-link.png with fontAwesome 2. Need to check if it's okay for the additional view padding on views that render markdown to compensate for anchor link space 3. Need to check if there are any other views that render markdown that did not have it's padding re-adjusted ## Why was this MR needed? Improve markdown rendered anchor links so that they are more user friendly ## What are the relevant issue numbers? Closes #20459 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-07-30_at_2.31.43_PM](/uploads/12b2aad7f130d26a709ff28083ecc2e3/Screen_Shot_2016-07-30_at_2.31.43_PM.png) After: ![Screen_Shot_2016-08-08_at_10.25.06_AM](/uploads/caac1985cfbd305b8c8665d86e30ab24/Screen_Shot_2016-08-08_at_10.25.06_AM.png) Before: ![https://gitlab.com/gitlab-org/gitlab-ce/uploads/45e6d0aee7abbdb42a4c781ae0ba1961/ws7MBrK70g.gif](https://gitlab.com/gitlab-org/gitlab-ce/uploads/45e6d0aee7abbdb42a4c781ae0ba1961/ws7MBrK70g.gif) After: ![nLQOMn9RUO](/uploads/3905ceac2d591399d14cec1b3319f46b/nLQOMn9RUO.gif) ## 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 [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) See merge request !5577
| | * | | | | | Fix markdown anchor icon interactionClement Ho2016-09-021-17/+10
| | | | | | | |
| * | | | | | | Merge branch '21471-bold-text-in-ci-build-output-not-styled' into 'master' Annabel Dunstone Gray2016-09-021-0/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added `.term-bold` declaration. ## What does this MR do? Added `.term-bold` declaration. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/issues/21471#note_14874299 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21471 See merge request !6171
| | * | | | | | | Added `.term-bold` declaration.21471-bold-text-in-ci-build-output-not-styledLuke "Jared" Bennett2016-09-021-0/+3
| | | |_|/ / / / | | |/| | | | |