summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/merge_conflicts.scss
Commit message (Expand)AuthorAgeFilesLines
* Enforce TrailingSemicolon and EmptyLineBetweenBlocks in scss-lint23319-enable-trailingsemicolon-on-scss-lintClement Ho2016-10-141-0/+2
* Remove #faf9f9 and #f9f9f9 from color palette; replace with #fafafaAnnabel Dunstone2016-08-281-1/+1
* Satisfy scss-lintDouwe Maan2016-08-151-4/+4
* CSS theme improvements for MC UI.Fatih Acet2016-08-121-12/+55
* Prefer lowercase hex values as declared in styling guideline.Fatih Acet2016-08-121-39/+39
* Use mixin to create color schemes.Fatih Acet2016-08-121-275/+112
* Implement color schemes for MC UI.Fatih Acet2016-08-121-39/+313
* Simplify Haml template and Scss files for MC UI.Fatih Acet2016-08-121-61/+1
* Show loading button while Ajax request is in progress.Fatih Acet2016-08-121-0/+4
* Draw side-by-side view only one table.Fatih Acet2016-08-121-11/+44
* Make SCSS lint and RuboCop happySean McGivern2016-08-121-3/+3
* Fix specsSean McGivern2016-08-121-12/+12
* Fixes for merge conflicts UI.Fatih Acet2016-08-121-0/+1
* Implement conflict selection with highlighting.Fatih Acet2016-08-121-0/+8
* Styling for selected/unselected versions.Fatih Acet2016-08-121-6/+38
* Added new UI components for Merge Conflicts UI.Fatih Acet2016-08-121-0/+66