summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'revert-unintentional-changes-in-mr-12810' into 'master'Annabel Dunstone Gray2017-11-063-145/+42
|\
| * Revert unintentional changes in !12810Takuya Noguchi2017-11-063-145/+42
* | Resolve "Editor icons"Tim Zallmann2017-11-062-3/+19
|/
* Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-0314-204/+300
|\
| * Merge branch '39776-remove-responsive-table-bottom-border' into 'master'Annabel Dunstone Gray2017-11-031-1/+4
| |\
| | * Remove bottom-border from last responsive table rowEric Eastwood2017-11-031-1/+4
| * | Enable MergeableSelector in scss-lint (for !14055)Takuya Noguchi2017-11-031-26/+26
| * | Enable MergeableSelector in scss-lint (for !13480)Takuya Noguchi2017-11-031-21/+17
| * | Enable MergeableSelector in scss-lint (for !13473)Takuya Noguchi2017-11-031-7/+0
| * | Enable MergeableSelector in scss-lintTakuya Noguchi2017-11-0312-170/+274
| |/
* | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-11-024-60/+98
|\ \ | |/
| * Merge branch 'refactor-responsive-tables-for-nested-error' into 'master'Annabel Dunstone Gray2017-11-022-58/+84
| |\
| | * Refactor responsive table styles to support nested error blockrefactor-responsive-tables-for-nested-errorEric Eastwood2017-11-022-58/+84
| * | Merge branch '39513-fix-gears-spinning-physically' into 'master'Clement Ho2017-11-011-1/+6
| |\ \
| | * | Fix autodevops graphic gears spinning based on physics39513-fix-gears-spinning-physicallyEric Eastwood2017-10-301-1/+6
| * | | Merge branch 'fix-user-tab-activity-mobile' into 'master'Annabel Dunstone Gray2017-11-011-1/+8
| |\ \ \
| | * | | Fixed user profile tab being off-screenfix-user-tab-activity-mobilePhil Hughes2017-10-241-1/+8
* | | | | remove PhantomJS specific hacksMike Greiling2017-10-312-9/+0
|/ / / /
* | | | Upload files through the multi-file editorPhil Hughes2017-10-311-0/+3
* | | | Revert "Merge branch '2518-saved-configuration-for-issue-board' into 'master'"revert-2573818fDmitriy Zaporozhets2017-10-304-45/+0
| |_|/ |/| |
* | | Merge branch '39582-nestingdepth-6' into 'master'39635-convert-jquery-scrollto-js-library-to-be-a-yarn-managed-libraryAnnabel Dunstone Gray2017-10-302-9/+4
|\ \ \
| * | | Enable NestingDepth (level 6) on scss-lintTakuya Noguchi2017-10-302-9/+4
| | |/ | |/|
* | | [CE backport] Saved configuration for issue boardOswaldo Ferreira2017-10-304-0/+45
|/ /
* | Remove filter icon from search bar32318-filter-iconAnnabel Dunstone Gray2017-10-241-12/+1
|/
* Merge branch 'remove-new-sidebar-stuff' into 'master'Phil Hughes2017-10-242-35/+29
|\
| * Remove variables from sidebar CSSAnnabel Dunstone Gray2017-10-202-22/+20
| * Replace all instances of new-sidebar with contextual-sidebarAnnabel Dunstone Gray2017-10-201-15/+11
* | Merge branch 'add-shared-vue-loading-button' into 'master'Filipa Lacerda2017-10-232-0/+14
|\ \ | |/ |/|
| * Add loading buttonadd-shared-vue-loading-buttonEric Eastwood2017-10-232-0/+14
* | Merge branch 'animate-auto-devops' into 'master'Annabel Dunstone Gray2017-10-201-0/+11
|\ \
| * | Animate auto devops graphicanimate-auto-devopsClement Ho2017-10-181-0/+11
* | | Merge branch 'update-nav-sidebar-hover' into 'master'Annabel Dunstone Gray2017-10-191-3/+3
|\ \ \
| * | | update nav sidebar hover color to increase contrastupdate-nav-sidebar-hovertauriedavis2017-10-111-3/+3
* | | | Merge branch '36160-zindex' into 'master'Annabel Dunstone Gray2017-10-181-0/+5
|\ \ \ \
| * | | | Decreases z-index of select2 to a lower number of our navigation bar36160-zindexFilipa Lacerda2017-10-181-0/+5
| | |_|/ | |/| |
* | | | Fix tooltip padding to align to 8px gridpms-fix-tooltip-paddingPedro Moreira da Silva2017-10-181-1/+1
|/ / /
* | | Merge branch 'ph-multi-file-editor-restructure-data' into 'master'Filipa Lacerda2017-10-171-0/+7
|\ \ \
| * | | Refactored multi-file data structurePhil Hughes2017-10-161-0/+7
* | | | Merge branch '38156-breadcrumbs-margin' into 'master'Tim Zallmann2017-10-171-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use variable for mobile breadcrumbs padding38156-breadcrumbs-marginAnnabel Dunstone Gray2017-10-161-1/+1
* | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-171-4/+85
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-1016-900/+554
| |\ \ \
| * | | | Groups tree enhancements for Groups Dashboard and Group HomepageKushal Pandya2017-10-041-4/+85
* | | | | Remove extra border radius when editing a fileRachel Pipkin2017-10-162-0/+5
* | | | | Remove banner from pipelines pageFilipa Lacerda2017-10-161-0/+25
* | | | | Merge branch 'winh-indeterminate-dropdown' into 'master'Phil Hughes2017-10-161-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix alignment for indeterminate marker in dropdownswinh-indeterminate-dropdownWinnie Hellmann2017-10-111-0/+1
* | | | | Revert "Merge branch '36160-select2-dropdown' into 'master'"revert-8ae7963cFilipa Lacerda2017-10-121-1/+0
* | | | | Fixes from CSS refactorAnnabel Dunstone Gray2017-10-121-0/+2
| |_|_|/ |/| | |
* | | | Merge branch '37660-match-sidebar-colors' into 'master'Annabel Dunstone Gray2017-10-111-1/+1
|\ \ \ \ | |/ / / |/| | |