Age | Commit message (Collapse) | Author | |
---|---|---|---|
2017-09-23 | Update light colors, remove ’25’ and add ‘950’ shades | Pedro Moreira da Silva | |
2017-03-23 | Change full colors to a more harmonious palette | Pedro Moreira da Silva | |
2016-12-13 | Finish refactoring grays | Annabel Dunstone Gray | |
2016-12-02 | Enable ColorVariable in scss-lint | Sam Rose | |
2016-11-08 | 24146 Add focus state to buttons and dropdowns | tauriedavis | |
2016-10-25 | Merge branch 'enable-scss-lint-single-line-per-selector' into 'master' | Annabel Dunstone Gray | |
Enable SingleLinePerSelector in scss-lint ## What does this MR do? Enables `SingleLinePerSelector` in `.scss-lint.yml` ## Are there points in the code the reviewer needs to double check? This MR touches a lot of files, just need another pair of eyes to look through and make sure I didn't break anything. ## Why was this MR needed? Improve SCSS maintainability and consistency ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - 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 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? #23485 See merge request !7081 | |||
2016-10-24 | Enable SingleLinePerSelector in scss-lint | Clement Ho | |
2016-10-24 | Enable trailingWhitespace in scss-lint | Clement Ho | |
2016-10-17 | Merge branch 'master' into merge-conflicts-editor-2 | Sean McGivern | |
2016-10-15 | Enforce TrailingSemicolon and EmptyLineBetweenBlocks in scss-lint | Clement Ho | |
2016-10-13 | Replace loading text with spinner | Alfredo Sumaran | |
2016-10-13 | Style for resolve conflicts form | Alfredo Sumaran | |
2016-10-13 | Styles for discard alert | Alfredo Sumaran | |
2016-10-13 | Replace textarea with Ace editor | Alfredo Sumaran | |
2016-10-13 | Implement editor to manually resolve merge conflicts | Alfredo Sumaran | |
2016-08-28 | Remove #faf9f9 and #f9f9f9 from color palette; replace with #fafafa | Annabel Dunstone | |
2016-08-15 | Satisfy scss-lint | Douwe Maan | |
2016-08-12 | CSS theme improvements for MC UI. | Fatih Acet | |
2016-08-12 | Prefer lowercase hex values as declared in styling guideline. | Fatih Acet | |
2016-08-12 | Use mixin to create color schemes. | Fatih Acet | |
Some SCSS Foo in action! :boom: | |||
2016-08-12 | Implement color schemes for MC UI. | Fatih Acet | |
2016-08-12 | Simplify Haml template and Scss files for MC UI. | Fatih Acet | |
2016-08-12 | Show loading button while Ajax request is in progress. | Fatih Acet | |
2016-08-12 | Draw side-by-side view only one table. | Fatih Acet | |
2016-08-12 | Make SCSS lint and RuboCop happy | Sean McGivern | |
2016-08-12 | Fix specs | Sean McGivern | |
- Add match line header to expected result for `File#sections`. - Lowercase CSS colours. - Remove unused `diff_refs` keyword argument. - Rename `parent` -> `parent_file`, to be more explicit. - Skip an iteration when highlighting. | |||
2016-08-12 | Fixes for merge conflicts UI. | Fatih Acet | |
2016-08-12 | Implement conflict selection with highlighting. | Fatih Acet | |
2016-08-12 | Styling for selected/unselected versions. | Fatih Acet | |
2016-08-12 | Added new UI components for Merge Conflicts UI. | Fatih Acet | |