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_requests.scss
AgeCommit message (Collapse)Author
2016-12-21Merge branch '25906-title-size' into 'master' Fatih Acet
Resolve "Titles are bigger than usual" Closes #25906 See merge request !8235
2016-12-21Reduce MR widget title by one pixelFilipa Lacerda
2016-12-21Adds background color for disabled state to merge when succeeds dropdownFilipa Lacerda
Adds MR id to changelog entry Fix caret color Remove duplicated semicolon
2016-12-13Finish refactoring graysAnnabel Dunstone Gray
2016-12-13Remove duplicate shades of gray and blackAnnabel Dunstone Gray
2016-12-06Merge branch '25202-fix-mr-widget-content-wrapping' into 'master' Jacob Schatz
Fixed MR widget content wrapping for XS viewports Centers the "Accept Merge Request" button within the MR widget (and adds a bit of right/left padding) for viewports smaller than 768px. BEFORE: ![Screen_Shot_2016-12-02_at_8_53_01_AM](/uploads/fcdae5302a1407090483dd3cff868c51/Screen_Shot_2016-12-02_at_8_53_01_AM.png) AFTER: ![Screen_Shot_2016-12-02_at_9_43_37_AM](/uploads/f7d1dce082b79d263f05cea3c90e870a/Screen_Shot_2016-12-02_at_9_43_37_AM.png) cc: @markglenfletcher @annabeldunstone Closes #25202 See merge request !7900
2016-12-05Fixed MR widget content wrapping for XS viewportsRyan Harris
Update merge_requests.scss Update merge_requests.scss to use padding shorthand Removed padding from Accept Merge Request button
2016-12-03Reduce base font sizes across appAnnabel Dunstone Gray
2016-12-02Enable ColorVariable in scss-lintSam Rose
2016-11-23Merge branch ↵Fatih Acet
'24266-afraid-to-press-the-orange-button-on-merge-request-screen' into 'master' If Build running change accept merge request when build succeeds button from orange to blue ## What does this MR do? If Build running change accept merge request when build succeeds button from orange to blue ## Are there points in the code the reviewer needs to double check? I didn't really check, but to my knowledge these changes should fix it. Would love to know how to set up working pipelines in my local build. ## Why was this MR needed? orange was to big a warning color for this button ## Screenshots (if relevant) ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c9100be272c5567ee4dfa281cffaeb7a/_24266_merge-request-01.png) ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/bb84ea5b519fc67babf8383f3b396fb7/_24266_merge-request-02.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24266 See merge request !7577
2016-11-18If Build running change accept merge request when build succeeds button from ↵Dimitrie Hoekstra
orange to blue
2016-11-18Unify all MR widget text colors and background colorsAnnabel Dunstone Gray
2016-11-18Merge branch 'pipelines-page-redesign' into 'master' Fatih Acet
Pipelines page redesign Closes #23637 ![Screen_Shot_2016-11-15_at_1.36.34_PM](/uploads/edc6a58f00cca3e03ffd1689bd6eebd8/Screen_Shot_2016-11-15_at_1.36.34_PM.png) See merge request !7487
2016-11-11Remove additional padding on right-aligned items in MR widget.Didem Acet
Fixes #24369.
2016-11-10Move reusable well styles into their own fileAnnabel Dunstone Gray
2016-10-28Finish styling commits viewAnnabel Dunstone Gray
2016-10-28edited stylesheet with mr modal fixes and added to changelogDimitrie Hoekstra
2016-10-26Increase z index on fixed mr tabsAnnabel Dunstone Gray
2016-10-20Fixed issues with sticky mr tabs & sidebarPhil Hughes
Closes #23504
2016-10-18Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski
22191-delete-dynamic-envs-mr
2016-10-18Updates class name for consistencyFilipa Lacerda
2016-10-17Apply better hierarchy to markdown headers and issue/mr titlestauriedavis
2016-10-17Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski
2016-10-15Enforce TrailingSemicolon and EmptyLineBetweenBlocks in scss-lintClement Ho
2016-10-15Merge branch '23167-min-row-height' into 'master' Fatih Acet
Resolve "Build/Pipeline/Environment List Inconsistency Row Height" #### What does this MR do? * Changes generic table class from `builds` to `ci-table`. It was getting confusing using `builds` for `builds`, `pipelines`, `environments` * Sets height on builds rows for continuity #### Are there points in the code the reviewer needs to double check? Apparently you can't set `min-height` on any `table` elements but you _can_ set `height`. For some reason, even if the content within happens to start wrapping, the row height will grow instead of letting the content overlap. Which is a good thing. Just kind of weird. #### Why was this MR needed? Different row heights on builds depending on content #### Screenshots (if relevant) Before: ![Screen_Shot_2016-10-10_at_4.49.58_PM](/uploads/a4edb584f95c670f9815a8e5b1d725ee/Screen_Shot_2016-10-10_at_4.49.58_PM.png) After: ![Screen_Shot_2016-10-10_at_4.32.03_PM](/uploads/488a84b4ed292fbbb0ea7e372c017ae0/Screen_Shot_2016-10-10_at_4.32.03_PM.png) Before: ![Screen_Shot_2016-10-10_at_4.44.23_PM](/uploads/3cbcbada89d1aeb1fea35ea9b851e370/Screen_Shot_2016-10-10_at_4.44.23_PM.png) After: ![Screen_Shot_2016-10-10_at_4.42.56_PM](/uploads/0cb573670f60c7fdf54fdb027c95639f/Screen_Shot_2016-10-10_at_4.42.56_PM.png) ## What are the relevant issue numbers? Closes #23167 See merge request !6787
2016-10-14Merge branch 'mr-tabs-affix' into 'master' Fatih Acet
Merge request tabs stick when scrolling page ## What does this MR do? When scrolling merge requests this sticks the tabs to below the navigation for easy access. ## Screenshots (if relevant) ![sticky](/uploads/372a9889c50e9f85fef475cbee110ec1/sticky.gif) ## What are the relevant issue numbers? Closes #20548 See merge request !6382
2016-10-14Refactor ci_status on MergeRequestControllerZ.J. van de Weg
2016-10-14Show what time ago a MR was deployedZ.J. van de Weg
2016-10-12Improve mr compare message when base is differentDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-12Inform user when comparing 2 version with different baseDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-11Merge branch 'empty-mrs' into 'master' Rémy Coutable
Allows empty merge requests for a workflow described in gitlab-org/gitlab-ce#14606 Closes gitlab-org/gitlab-ce#14606 See merge request !6384
2016-10-11Allow empty merge requestsArtem Sidorenko
2016-10-11Set height on MR builds rowsAnnabel Dunstone Gray
2016-10-11Replace generic table withAnnabel Dunstone Gray
2016-10-08Remove redundant mixinsClement Ho
2016-10-06Adds link to close environment in a merge requestFilipa Lacerda
2016-10-06Merge request tabs stick when scrolling pagePhil Hughes
Closes #20548
2016-10-04Merge branch 'master' into revert-c676283bPhil Hughes
2016-10-03Merge branch 'master' into revert-c676283bPhil Hughes
2016-09-22Changed mr widget build status to pipeline status with pipeline id, with a ↵Luke Bennett
link to the pipeline View details now links to pipelines tab Added changelog entry
2016-09-17Merge branch 'master' into merge-request-push-compare-uiBryce Johnson
2016-09-16Merge branch '18849-project-snippets-page-isn-t-really-responsive' into ↵Jacob Schatz
'master' Update snippets UI ## What does this MR do? Updates snippets UI _(mainly mobile view)_ to new UI proposed in #18849. ## Are there points in the code the reviewer needs to double check? Does anyone know the implementation difference between `app/views/snippets/show.html.haml` and `app/views/projects/snippets/show.html.haml`? I have only been updating the latter as it's the only one I can find implemented. I assume the former is rendered somewhere seeing as there is controllers for it too. But this doesn't seem very DRY from my current perspective. ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-09-06_at_14.20.10](/uploads/ac124a3b0896872ce851b9f56fbe339c/Screen_Shot_2016-09-06_at_14.20.10.png) ![Screen_Shot_2016-09-06_at_14.20.32](/uploads/8d3c7b1d1a5f562ceb6dc22bde695289/Screen_Shot_2016-09-06_at_14.20.32.png) ![Screen_Shot_2016-09-06_at_14.20.48](/uploads/6b1c31ece6d2400bbfc3c673d9e82d4b/Screen_Shot_2016-09-06_at_14.20.48.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #18849 See merge request !6210
2016-09-15style updatestauriedavis
2016-09-14Style merge request diff dropdowns & disable comments.Bryce Johnson
2016-09-07Reordered dropdown optionsLuke Bennett
Rearranged datetime created line Added `avatar_class` option to `link_to_member` so it can be hidden Made snippet title font heavier Added file title bar Hidden unneeded info from xs screens Added visibility icon Reveal file-actions on xs screens Added comments icon to snippets list items Refactored no-comments declaration into framework stylesheet Final touch ups Fixed snippets_spec
2016-09-07Improve merge request version featureDmitriy Zaporozhets
* Use version numbers instead of sha as more user-friendly * Make it clear that we compare later version (left) with older one (right) * Improve wording of version switch panel Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-09-07Improve merge request version switch/compare dropdownDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-08-30Merge branch 'master' into revert-c676283bPhil Hughes
2016-08-25Merge branch '21146-windows-scrollbar' into 'master' Jacob Schatz
Remove ugly horizontal scrollbars in windows ## What does this MR do? Removes horizontal scrollbars from pipelines view ## Why was this MR needed? It looked terrible. ## What are the relevant issue numbers? Closes #21146 See merge request !5942
2016-08-23Fix overflow scrollAnnabel Dunstone
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 19:15:36 +0300