Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/merge_conflicts.scss
AgeCommit message (Expand)Author
2019-02-25Added Stylelint SetupTim Zallmann
2018-12-18Add "none" syntax highlighting "color" schemekhm
2018-07-25Replace snake case in mixins and merge_conflicts variablesGeorge Tsiolis
2018-05-23Fix bad master mergeClement Ho
2018-05-21Make it explicit that merge conflict feature commits to source branchAnnabel Dunstone Gray
2017-11-06Enable BorderZero rule in scss-lintTakuya Noguchi
2017-09-23Update light colors, remove ’25’ and add ‘950’ shadesPedro Moreira da Silva
2017-03-23Change full colors to a more harmonious palettePedro Moreira da Silva
2016-12-13Finish refactoring graysAnnabel Dunstone Gray
2016-12-02Enable ColorVariable in scss-lintSam Rose
2016-11-0824146 Add focus state to buttons and dropdownstauriedavis
2016-10-25Merge branch 'enable-scss-lint-single-line-per-selector' into 'master' Annabel Dunstone Gray
2016-10-24Enable SingleLinePerSelector in scss-lintClement Ho
2016-10-24Enable trailingWhitespace in scss-lintClement Ho
2016-10-17Merge branch 'master' into merge-conflicts-editor-2Sean McGivern
2016-10-15Enforce TrailingSemicolon and EmptyLineBetweenBlocks in scss-lintClement Ho
2016-10-13Replace loading text with spinnerAlfredo Sumaran
2016-10-13Style for resolve conflicts formAlfredo Sumaran
2016-10-13Styles for discard alertAlfredo Sumaran
2016-10-13Replace textarea with Ace editorAlfredo Sumaran
2016-10-13Implement editor to manually resolve merge conflictsAlfredo Sumaran
2016-08-28Remove #faf9f9 and #f9f9f9 from color palette; replace with #fafafaAnnabel Dunstone
2016-08-15Satisfy scss-lintDouwe Maan
2016-08-12CSS theme improvements for MC UI.Fatih Acet
2016-08-12Prefer lowercase hex values as declared in styling guideline.Fatih Acet
2016-08-12Use mixin to create color schemes.Fatih Acet
2016-08-12Implement color schemes for MC UI.Fatih Acet
2016-08-12Simplify Haml template and Scss files for MC UI.Fatih Acet
2016-08-12Show loading button while Ajax request is in progress.Fatih Acet
2016-08-12Draw side-by-side view only one table.Fatih Acet
2016-08-12Make SCSS lint and RuboCop happySean McGivern
2016-08-12Fix specsSean McGivern
2016-08-12Fixes for merge conflicts UI.Fatih Acet
2016-08-12Implement conflict selection with highlighting.Fatih Acet
2016-08-12Styling for selected/unselected versions.Fatih Acet
2016-08-12Added new UI components for Merge Conflicts UI.Fatih Acet
    generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 19:07:10 +0300