Commit graph

30 commits

Author SHA1 Message Date
Pedro Moreira da Silva
7ab056c7d7 Update light colors, remove ’25’ and add ‘950’ shades 2017-09-23 01:06:18 +01:00
Pedro Moreira da Silva
c8fd702556 Change full colors to a more harmonious palette 2017-03-23 18:19:17 +00:00
Annabel Dunstone Gray
0b72554c1b Finish refactoring grays 2016-12-13 13:13:53 -06:00
Sam Rose
d6d22a5dbd Enable ColorVariable in scss-lint 2016-12-01 20:22:51 -05:00
tauriedavis
5f2d9ba9ea 24146 Add focus state to buttons and dropdowns 2016-11-08 10:03:17 -08:00
Annabel Dunstone Gray
3b93574a35 Merge branch 'enable-scss-lint-single-line-per-selector' into 'master'
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-25 13:52:26 +00:00
Clement Ho
791c9d0dd3 Enable SingleLinePerSelector in scss-lint 2016-10-24 15:22:06 -05:00
Clement Ho
5480114477 Enable trailingWhitespace in scss-lint 2016-10-24 14:23:40 -05:00
Sean McGivern
86dcb79be3 Merge branch 'master' into merge-conflicts-editor-2 2016-10-17 10:56:55 +01:00
Clement Ho
e88aa25f42 Enforce TrailingSemicolon and EmptyLineBetweenBlocks in scss-lint 2016-10-14 16:28:10 -05:00
Alfredo Sumaran
0402a18367 Replace loading text with spinner 2016-10-13 14:16:34 -05:00
Alfredo Sumaran
02bfb0ff1b Style for resolve conflicts form 2016-10-13 14:16:34 -05:00
Alfredo Sumaran
17830296a6 Styles for discard alert 2016-10-13 14:16:34 -05:00
Alfredo Sumaran
a3eb39a106 Replace textarea with Ace editor 2016-10-13 14:16:34 -05:00
Alfredo Sumaran
26f658decd Implement editor to manually resolve merge conflicts 2016-10-13 14:16:34 -05:00
Annabel Dunstone
764ef25c11 Remove #faf9f9 and #f9f9f9 from color palette; replace with #fafafa 2016-08-28 10:02:27 -05:00
Douwe Maan
882f97e4e3 Satisfy scss-lint 2016-08-15 20:14:36 +00:00
Fatih Acet
f498347d9b CSS theme improvements for MC UI. 2016-08-12 23:24:52 +03:00
Fatih Acet
66241c1b08 Prefer lowercase hex values as declared in styling guideline. 2016-08-12 23:24:51 +03:00
Fatih Acet
7927484435 Use mixin to create color schemes.
Some SCSS Foo in action! 💥
2016-08-12 23:24:50 +03:00
Fatih Acet
c6c74a37d9 Implement color schemes for MC UI. 2016-08-12 23:24:49 +03:00
Fatih Acet
709c308e0e Simplify Haml template and Scss files for MC UI. 2016-08-12 23:24:49 +03:00
Fatih Acet
41f7cee991 Show loading button while Ajax request is in progress. 2016-08-12 23:24:49 +03:00
Fatih Acet
ad0b5ffbb5 Draw side-by-side view only one table. 2016-08-12 23:24:47 +03:00
Sean McGivern
76cd67b005 Make SCSS lint and RuboCop happy 2016-08-12 23:24:46 +03:00
Sean McGivern
261d47bce9 Fix specs
- 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 23:24:46 +03:00
Fatih Acet
10321bf862 Fixes for merge conflicts UI. 2016-08-12 23:24:43 +03:00
Fatih Acet
ff15fbf10c Implement conflict selection with highlighting. 2016-08-12 23:24:43 +03:00
Fatih Acet
f3743111a7 Styling for selected/unselected versions. 2016-08-12 23:24:42 +03:00
Fatih Acet
9d70a4ba76 Added new UI components for Merge Conflicts UI. 2016-08-12 23:24:42 +03:00