summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/merge_conflicts.scss
Commit message (Expand)AuthorAgeFilesLines
* Added Stylelint SetupTim Zallmann2019-02-251-51/+45
* Add "none" syntax highlighting "color" schemekhm2018-12-181-2/+22
* Replace snake case in mixins and merge_conflicts variablesGeorge Tsiolis2018-07-251-108/+102
* Fix bad master mergeClement Ho2018-05-221-1/+1
* Make it explicit that merge conflict feature commits to source branchAnnabel Dunstone Gray2018-05-211-1/+9
* Enable BorderZero rule in scss-lintTakuya Noguchi2017-11-061-1/+1
* Update light colors, remove ’25’ and add ‘950’ shades31094-define-color-prioritiesPedro Moreira da Silva2017-09-231-1/+1
* Change full colors to a more harmonious palettePedro Moreira da Silva2017-03-231-1/+1
* Finish refactoring graysvariablesAnnabel Dunstone Gray2016-12-131-1/+1
* Enable ColorVariable in scss-lintSam Rose2016-12-011-2/+6
* 24146 Add focus state to buttons and dropdowns24146-add-focus-statetauriedavis2016-11-081-1/+0
* Merge branch 'enable-scss-lint-single-line-per-selector' into 'master' Annabel Dunstone Gray2016-10-251-1/+2
|\
| * Enable SingleLinePerSelector in scss-lintenable-scss-lint-single-line-per-selectorClement Ho2016-10-241-1/+2
* | Enable trailingWhitespace in scss-lintClement Ho2016-10-241-1/+1
|/
* Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-171-0/+2
|\
| * Enforce TrailingSemicolon and EmptyLineBetweenBlocks in scss-lint23319-enable-trailingsemicolon-on-scss-lintClement Ho2016-10-141-0/+2
* | Replace loading text with spinnerAlfredo Sumaran2016-10-131-2/+2
* | Style for resolve conflicts formAlfredo Sumaran2016-10-131-0/+4
* | Styles for discard alertAlfredo Sumaran2016-10-131-3/+13
* | Replace textarea with Ace editorAlfredo Sumaran2016-10-131-0/+7
* | Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-131-0/+26
|/
* 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