summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/merge_requests.scss
Commit message (Collapse)AuthorAgeFilesLines
* Add merge train position message (CE)Nathan Friend2019-06-171-1/+2
| | | | | | This commit adds an informational message under the pipeline block in the merge request widget that displays the current position of the merge request on the merge train.
* Merge request tabs fixesAnnabel Dunstone Gray2019-06-061-5/+30
| | | | | | - Makes activity dropdown and resolved counter smaller - Uses grid for spacing - Removes scrolling on MR tabs
* Fix MR checkboxes alignment on mobile57037-fix-mr-checkboxes-mobile-alignmentPaul Slaughter2019-05-301-46/+0
| | | | | It does this by removing the `.accept-control` class which was only causing problems.
* Merge branch '58632-fix-mr-widget-padding' into 'master'Mike Greiling2019-05-241-5/+9
|\ | | | | | | | | | | | | Fix MR widget padding Closes #58632 See merge request gitlab-org/gitlab-ce!28472
| * Fix MR widget padding58632-fix-mr-widget-paddingHeinrich Lee Yu2019-05-201-5/+9
| | | | | | | | Align elements horizontally and add missing bottom padding
* | Add backport changesSarah Groff Hennigh-Palermo2019-05-201-4/+0
|/ | | | Adds backport changes for ee
* [CE] Support multiple assignees for merge requestsosw-multi-assignees-merge-requestsOswaldo Ferreira2019-04-081-0/+10
| | | | | Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161 (code out of ee/ folder).
* Improve diff navigation headerSam Bigelow2019-04-051-7/+9
| | | | | | | | | | | | | | - Compare versions header is full width except in the unified diff mode with no tree sidebar - Bar is always full width, but the content within stays centered when unified and no tree sidebar - File header is the same height as the "Compare versions header" - aligns with the design system grid guidelines => 56px - Diff file headers use a button group, switch icon order to open file externally being the last option, all buttons will become icon buttons (icon delivery by @dimitrieh) - If a file header becomes sticky no rounded corner/double border problem is visible anymore
* Re-use MR tabs styles to Epic tabsce-7327-add-roadmap-within-epicKushal Pandya2019-04-041-16/+22
|
* Merge branch '57115-just-in-time-k8s-resource-creation' into 'master'Clement Ho2019-03-201-0/+1
|\ | | | | | | | | Create project-specific Kubernetes resources just-in-time See merge request gitlab-org/gitlab-ce!25586
| * Add :preparing status to HasStatusTiger2019-03-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | Introduces a new status for builds between :created and :pending that will be used when builds require one or more prerequisite actions to be completed before being picked up by a runner (such as creating Kubernetes resources before deploying). The existing :created > :pending transition is unchanged, so only builds that require preparation will use the :preparing status.
* | Fix z-index issueNathan Friend2019-03-181-1/+1
|/ | | | | | This commit lowers the z-index of the .merge-request-tabs-holder class to avoid rendering conflicts with the mini pipeline status dropdown on the merge request page.
* Fixed sticky headers in merge request creation diffPhil Hughes2019-03-121-0/+10
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57691
* Fixed sticky bar styling in SafariPhil Hughes2019-03-081-0/+2
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58625
* Added Stylelint SetupTim Zallmann2019-02-251-4/+0
| | | | | | | | | | | | | | | | | | | | | | Added stylelint to static-analysis Updated yarn dependencies CSS Fixes and rule adoptions of stylelint Added stylelint-scss Deduplicated yarn.lock to clear dependencies First round of advanced stylelint rules Mainly Vendor prefix updates related to flex Updates to more webkit specific vendor prefixes Finished all vendor specific fixes Moved now 4 rules to warning Fixed the new scss lint problems More stylelint adaptions after rebase
* Remove padding for mr-widget-sectionPaul Slaughter2019-02-211-1/+0
| | | | | | | | | | This class is used in: - `group_test_reports_app.vue` where the padding is overruled by `.mr-report` - `mr_widget_options.vue` where the padding is overruled by `p-0` - `ee/mr_widget_options.vue` where there is a bug because the padding is not overruled.
* Make the file tree in merge requests resizablePhil Hughes2019-02-151-2/+2
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51857
* Fixed link alignmentNatalia Tepluhina2019-02-141-0/+5
|
* Return border bottom on MR TabsSam Bigelow2019-02-131-5/+3
|
* Resolve "Override squash commit message"Natalia Tepluhina2019-02-071-8/+35
|
* Added fuzzy file finder to merge requestsPhil Hughes2019-02-051-0/+6
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53304
* Resolve "Merge request file browser should always be possible show/hide"Sam Bigelow2019-01-221-2/+27
|
* Remove all `$theme-gray-{weight}` variables in favor of `$gray-{weight}`George Tsiolis2019-01-141-3/+3
|
* Redesign of MR header sections (CE Port)Paul Slaughter2018-11-301-21/+17
| | | | | | | - https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8593 - Create mr-widget-icon to encapsulate circle icons - Decouple workflow L&F from mr-widget-heading - Decouple container L&F from mr-widget-heading
* Show toggle tree button on merge request commitsPhil Hughes2018-11-221-0/+1
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53019
* Resolve "Filter discussion (tab) by comments or activity in issues and merge ↵Oswaldo Ferreira2018-10-231-1/+9
| | | | requests"
* Frontend: Review app changesFilipa Lacerda2018-10-221-7/+8
|
* Fixes styling issues in test reportsFilipa Lacerda2018-10-111-1/+0
| | | | | | | | | | | In the Merge Request widget, the reports for tests had an extra border. The loading icon in the mr widget used in all report sections had an extra margin causing text to be misaligned. This commit fixes both issues Closes #52147
* Added file tree to merge request diffsPhil Hughes2018-10-031-0/+11
| | | | | | | | | | | | | | | This file tree displays all the diff files in a tree like format Each file is taken and converted into a tree with folders Each folder can be toggled open & closed Clicking a file will scroll to the diff file & highlight with a glow affect Searching the tree list will search only files & return a list of the files without any folders Each file row contains an icon to show changed, new file or deleted Each row will also contain the added & removed lines count Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14249
* Rename some css classes that are shared between issues and mrsDmitriy Zaporozhets2018-09-211-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove jquery.scss; Combine multiple duplicate grays into global gray ↵Annabel Dunstone Gray2018-09-111-1/+1
| | | | variables; Remove unused styles in common.scss
* Merge branch '49110-update-mr-widget-styles' into 'master'Filipa Lacerda2018-08-261-18/+21
|\ | | | | | | | | | | | | Resolve "Follow up to "Styling of the MR widget's info and pipeline sections"" Closes #49110 See merge request gitlab-org/gitlab-ce!21206
| * Update mr_widget_header to not show branch names in 'commits behind' textPaul Slaughter2018-08-211-1/+0
| | | | | | | | | | | | Also: - Increased presence of 'commits behind' text - Added link to target branch in 'commits behind' text
| * Update MR deployment to use .label-truncate with .deploy-linkPaul Slaughter2018-08-211-0/+3
| |
| * Update MR header and pipeline to use .label-truncate with .label-branchPaul Slaughter2018-08-211-17/+18
| | | | | | | | | | | | | | Also: - Renamed .label-truncated to .label-truncate - Removed length checking in JS to let the CSS handle this - Improve IE11 compatibility of MR headers
* | Remove another batch of reassigned scss variablesAnnabel Dunstone Gray2018-08-211-4/+4
|/
* Adds a css class for mr reports to render them correctlyLukas Eipert2018-08-031-1/+1
|
* Adds frontend support to render test reports on theMR widgetFilipa Lacerda2018-08-021-0/+41
| | | | | | | Creates an app to render grouped test reports in the MR widget Ports CSS from EE into CE Creates a reusable code component Adds getters and utils to the existing reports store
* Replace snake case in SCSS variablesGeorge Tsiolis2018-07-251-1/+1
|
* Add merge request header branch actions left marginGeorge Tsiolis2018-07-171-0/+1
|
* Backport mr widget changes from EEbackport-widget-changesAnnabel Dunstone Gray2018-07-121-0/+4
|
* Fix MR widget borderAnnabel Dunstone Gray2018-07-111-6/+0
|
* Redesign for mr widget info and pipelines sectionClement Ho2018-07-061-26/+156
|
* Update external link icon in merge request widgetGeorge Tsiolis2018-06-271-0/+4
|
* Revert merge request widget button max heightGeorge Tsiolis2018-06-261-1/+0
|
* Changes tab VUE refactoringFelipe Artur2018-06-211-3/+1
|
* Fix cancel automatic merge button heightJose2018-06-191-0/+1
|
* Remove the btn-xs class from the stylesheetsJose2018-06-131-6/+0
|
* Resolve "Scrolling tabs are broken on profile, activity, and projects"Simon Knox2018-06-131-0/+1
|
* Merge branch 'master' into bootstrap4Clement Ho2018-05-081-4/+0
|\