summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework
Commit message (Expand)AuthorAgeFilesLines
* Converted JS modules into exported modulesph-es-modulesPhil Hughes2017-12-142-20/+0
* Merge branch 'winh-unify-modals' into 'master'Filipa Lacerda2017-12-131-3/+10
|\
| * Rename recaptcha-dialog to recaptcha-modalWinnie Hellmann2017-12-121-1/+1
| * Rename popup-dialog to modalWinnie Hellmann2017-12-121-2/+9
* | Merge branch '33926-update-issuable-icons' into 'master'Annabel Dunstone Gray2017-12-131-1/+5
|\ \
| * | Update issuable status icons33926-update-issuable-iconsEric Eastwood2017-12-131-1/+5
* | | Merge branch 'new-nav-tech-debt' into 'master'Phil Hughes2017-12-132-6/+3
|\ \ \
| * | | Rename page-with-sidebar to layout-pagenew-nav-tech-debtAnnabel Dunstone Gray2017-12-081-2/+2
| * | | Remove page-with-new-nav classAnnabel Dunstone Gray2017-12-082-4/+1
* | | | Merge branch '40468-empty-states' into 'master'Tim Zallmann2017-12-131-0/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'master' into 40468-empty-statesFilipa Lacerda2017-12-124-21/+31
| |\ \ \
| * \ \ \ Merge branch 'master' into 40468-empty-statesFilipa Lacerda2017-12-111-0/+7
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Update pipelines empty state [ci skip]Filipa Lacerda2017-12-071-0/+7
* | | | | Merge branch 'winh-cleanup-dropdowns' into 'master'Annabel Dunstone Gray2017-12-127-271/+101
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix top margin for right aligned dropdownsWinnie Hellmann2017-12-081-1/+0
| * | | | Fix dropdown top marginWinnie Hellmann2017-12-081-1/+1
| * | | | Remove new-style-dropdown mixinWinnie Hellmann2017-12-086-20/+0
| * | | | Use global styles for filter dropdownsWinnie Hellmann2017-12-082-54/+10
| * | | | Make new .dropdown-menu-align-right style globalWinnie Hellmann2017-12-081-4/+2
| * | | | Make new .dropdown-menu style globalWinnie Hellmann2017-12-081-15/+1
| * | | | Make new .dropdown-menu-selectable style globalWinnie Hellmann2017-12-081-39/+28
| * | | | Make new dropdown <li> style globalWinnie Hellmann2017-12-081-17/+2
| * | | | Make new dropdown-link style globalWinnie Hellmann2017-12-081-21/+10
| * | | | Make new .dropdown-menu-user-link style globalWinnie Hellmann2017-12-081-13/+7
| * | | | Make new dropdown-item-hover style globalWinnie Hellmann2017-12-081-39/+23
| * | | | Make new .text-danger style globalWinnie Hellmann2017-12-081-10/+5
| * | | | Make new .is-active style globalWinnie Hellmann2017-12-081-18/+7
| * | | | Make new .dropdown-header style globalWinnie Hellmann2017-12-081-6/+2
| * | | | Make new style .divider globalWinnie Hellmann2017-12-081-15/+5
| * | | | Make new .dropdown-open-top style globalWinnie Hellmann2017-12-081-4/+4
| |/ / /
* | | | Merge branch '39608-comment-on-image-discussions-tab-alignment' into 'master'Tim Zallmann2017-12-122-3/+3
|\ \ \ \
| * | | | Fix comment on image discussion icon alignment39608-comment-on-image-discussions-tab-alignmentEric Eastwood2017-12-082-3/+3
| |/ / /
* | | | Merge branch 'backport-epic-in-issue' into 'master'Jacob Schatz2017-12-111-0/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Backport epic in issueepic-in-issuebackport-epic-in-issueClement Ho2017-12-071-0/+5
| |/ /
* | | Merge branch '35724-animate-sidebar' into 'master'Filipa Lacerda2017-12-112-18/+23
|\ \ \ | |_|/ |/| |
| * | Fix transitions35724-animate-sidebarAnnabel Dunstone Gray2017-12-071-12/+9
| * | Fix mobile stylesAnnabel Dunstone Gray2017-12-071-10/+3
| * | Animate contextual sidebar; change class names for easier readabilityAnnabel Dunstone Gray2017-12-072-13/+28
| |/
* | Resolve "No feedback when checking on checklist if potential spam was detected"Luke Bennett2017-12-081-0/+7
|/
* Merge branch 'outdated-browser-position-fix' into 'master'Filipa Lacerda2017-12-071-13/+0
|\
| * Fixed outdated browser banner positioningoutdated-browser-position-fixPhil Hughes2017-12-061-13/+0
* | Resolve "Display member role per project"Mike Greiling2017-12-072-6/+4
* | Merge branch '40592-dropdown-options-are-misaligned' into 'master'Clement Ho2017-12-071-0/+1
|\ \ | |/ |/|
| * remove top from dropdown-label-box that is child of filter-dropdown-item40592-dropdown-options-are-misalignedLuke Bennett2017-12-021-0/+1
* | Merge branch 'backport-board-scope-highlight' into 'master'Sean McGivern2017-12-061-0/+10
|\ \
| * | backport board scope highlightbackport-board-scope-highlightClement Ho2017-12-051-0/+10
* | | Merge branch 'list-multiple-clusters' into 'master'Grzegorz Bizon2017-12-061-0/+138
|\ \ \ | |/ / |/| |
| * | Merge branch '35616-move-k8-to-cluster-page' into cluster-page-with-list-clus...Kamil Trzcinski2017-12-053-2/+5
| |\ \
| * \ \ Merge remote-tracking branch 'origin/list-multiple-clusters' into cluster-pag...Kamil Trzcinski2017-12-031-0/+138
| |\ \ \ | | |_|/ | |/| |
| | * | Changes after Frontend and UX review:Filipa Lacerda2017-11-281-31/+30
View Lorry Controller Status