summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/merge_requests.scss
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4dwinh2017-06-211-4/+0
| | | | | This reverts commit 6ac777a7592533d9c7b3682b2b9ca8caccca3f4d, reversing changes made to 025cbc2ad4dc175634676ff8a6955e043512d8bf.
* Adjust position and wording for related issues in merge requestsWinnie Hellmann2017-06-191-0/+4
|
* Fix alignment of tree symbols in merge requestswinh-merge-request-tree-symbolswinh2017-05-291-6/+2
|
* MR widget styling fixes32657-fix-mr-widget-styleskushalpandya2017-05-221-6/+14
|
* Refine MR widget styling for buttons and info textKushal Pandya2017-05-191-0/+16
|
* Merge branch 'acet-mr-widget-nothing-to-commit-state' into 'master' Filipa Lacerda2017-05-171-0/+16
|\ | | | | | | | | | | | | MRWidget: Implement new design for nothing to commit state. Closes #29320 See merge request !11266
| * MRWidget: Fix specs and address WIP comments.Fatih Acet2017-05-161-0/+2
| |
| * MRWidget: Implement new design for nothing to commit state.Fatih Acet2017-05-161-0/+14
| |
* | Merge branch 'add-right-margin-to-ci-error-icon' into 'master' Fatih Acet2017-05-161-0/+4
|\ \ | |/ |/| | | | | Added ci-error class and applied a right margin to the ci error widget state See merge request !11353
| * Added ci-error class and applied a right margin to the ci error widget stateadd-right-margin-to-ci-error-iconLuke "Jared" Bennett2017-05-131-0/+4
| |
* | Merge branch '31106-tabs-alignment' into 'master' Annabel Dunstone Gray2017-05-151-0/+20
|\ \ | | | | | | | | | | | | | | | | | | fix Resolved Discussions counter wrapping to next line Closes #31106 See merge request !10775
| * | fix Resolved Discussions counter wrapping to next lineSimon Knox2017-05-131-0/+20
| | | | | | | | | | | | | | | change all .nav-links to use flex place Resolve Discussions above tabs on small screens, and to the right on large
* | | MR zindex regressionLuke "Jared" Bennett2017-05-151-1/+2
| |/ |/|
* | Merge branch '30975-fixed-top-nav-POC' into 'master' Annabel Dunstone Gray2017-05-121-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Add fixed positioning to top level navbar Closes #30975 See merge request !10751
| * | Clean up fixed navbarAnnabel Dunstone Gray2017-05-121-1/+1
| | |
* | | Consistently use monospace font for commit SHAs and branch and tag namesDouwe Maan2017-05-121-28/+28
|/ /
* | Uniform CI status components in vueFilipa Lacerda2017-05-121-6/+2
|/
* Use position sticky on merge request tabsmr-tabs-sticky-pocPhil Hughes2017-05-111-2/+7
| | | | Removes the need for Bootstraps affix on browser that support sticky positions. On these browsers, there should be a slight performance improvement as there will be no scrolling events, it will all be handled by the browser
* Merge branch 'dm-pipeline-widget-padding' into 'master' Robert Speicher2017-05-091-6/+0
|\ | | | | | | | | Make pipeline widget padding consistent between MR and commit pages See merge request !11193
| * Make pipeline widget padding consistent between MR and commit pagesdm-pipeline-widget-paddingDouwe Maan2017-05-081-6/+0
| |
* | Add Prometheus memory sparkline to MR widgetkushalpandya2017-05-091-9/+15
| |
* | Merge request widget redesignFatih Acet2017-05-091-49/+208
|/
* Merge branch '31271-fixmr-target-branch-selector-dropdown' into 'master' Jacob Schatz2017-05-041-0/+4
|\ | | | | | | | | | | | | Fix MR target branch select dropdown placement cut-off Closes #31271 See merge request !10902
| * Fix MR target branch selector dropdown placement cut-off31271-fixmr-target-branch-selector-dropdownEric Eastwood2017-05-011-0/+4
| | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31271 When the dropdown items are too wide, constrain the dropdown to the offsetParent. Otherwise, let it naturally flow as Select2 wants.
* | Allow commenting on older versions of the diff and comparisons between diff ↵dm-link-discussion-to-outdated-diffDouwe Maan2017-05-031-1/+0
|/ | | | versions
* Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-111-0/+2
|\ | | | | | | | | | | | | Link to outdated diff in older MR version from outdated diff discussion Closes #27865 See merge request !10572
| * Link to outdated diff in older MR version from outdated diff discussionDouwe Maan2017-04-081-0/+2
| |
* | Remove double border on MR tabdouble-borderAnnabel Dunstone Gray2017-04-101-1/+0
|/
* Merge branch '29470-make-modal-sizes-consistent-and-mobile-friendly' into ↵Annabel Dunstone Gray2017-04-061-2/+0
|\ | | | | | | | | | | | | | | | | | | 'master' Resolve "Make modal sizes consistent and mobile friendly" Closes #29470 See merge request !10088
| * Remove individual modal width stylesSam Rose2017-04-061-2/+0
| |
* | Fix link togglers jumping to topEric Eastwood2017-03-281-0/+10
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29414
* | Change full colors to a more harmonious palettePedro Moreira da Silva2017-03-231-1/+1
|/
* Consistent button colors for disabled buttons29263-merge-button-colorSimon Knox2017-03-101-4/+0
|
* Merge branch '28230-new-mr-spacing' into 'master' Annabel Dunstone Gray2017-03-071-3/+2
|\ | | | | | | | | | | | | consistent padding on new MR panels Closes #28230 See merge request !9568
| * consistent spacing on new MR panels28230-new-mr-spacingSimon Knox2017-03-071-3/+2
| | | | | | | | | | | | center spinner show placeholder text on new MR page remove redundant `display: block` from li - they default to `list-style` already
* | Merge branch '23948-assign-to-me' into 'master' Alfredo Sumaran2017-03-071-0/+5
|\ \ | | | | | | | | | | | | | | | | | | re-add Assign to Me link on new MR/Issue forms Closes #23948 See merge request !9499
| * | re-add Assign to Me link on new MR/Issue formsSimon Knox2017-03-071-0/+5
| |/
* | thinner bottom header borderwidget-widget-widget-funRegis2017-03-061-0/+1
| |
* | make header match old 16px padding of body contentsRegis2017-03-061-2/+2
| |
* | fix border radius bottom for headerRegis2017-03-061-1/+2
| |
* | match padding for mr-widget sectionsRegis2017-03-061-1/+1
| |
* | scss lintingRegis2017-03-061-3/+3
| |
* | Improve CSS for treeview with pipelines to make it responsibleFilipa Lacerda2017-03-041-32/+33
| |
* | add grey lines - adequate spacing for action buttonsRegis2017-03-031-2/+41
| |
* | Merge branch 'master' into widget-widget-widget-funFilipa Lacerda2017-03-031-1/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (163 commits) Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEM Remove useless assignment Rename query parameter to `membership` Stop setting Strict-Transport-Securty header from within the app Add filter param for authorized projects for current_user for V4 Improve EE compatibility MR docs [ci skip] Fix the `Gitlab::Seeder` monkey patch to disable mail delivery Use separate error class for cherry-pick and revert tree errors Fix cherry-picking or reverting through an MR Resolve "missing count badge styling in new sidebar dropdown" Fix Rubocop offense in build retry service Decrease tanuki logo size remove extra whitespace on dashboard projects page Changes after review Delete hooks from project with empty repository Only add a newline in Markdown Editor if the current line is not empty Revert "Disallow system notes for closed issuables" Cleaning up navigational order - Project Backport EE changes. Service method should be `get` and not `all` Remove bundle-audit ignores that are no longer applicable ...
| * Default to subtle MR mege button until CI status is available28010-mr-merge-button-default-to-dangerEric Eastwood2017-03-021-1/+7
| | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9245
* | Change the size of CI icon in MR heading [ci skip]Filipa Lacerda2017-02-281-0/+5
| |
* | shape header - bold correct text - border radius - white background for the ↵Regis2017-02-171-1/+9
|/ | | | rest of widget
* Add margin to loading icon in Merge Request Widget27947-missing-margin-between-loading-icon-and-text-in-merge-request-widgetSam Rose2017-02-101-2/+6
|
* Keep sidebars absolute until fixed at top; remove unneeded JSAnnabel Dunstone Gray2017-02-101-1/+1
|