mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-22 02:56:06 +10:00
Merge branch 'fix-merge-on-success-widget-buttons' into 'master'
Fixed merge on success widget buttons on mobile ## What does this MR do? Fixes 'merge on success' widget buttons on mobile as they were stacked with 100% width before when it is a button group with a small dropdown button. ## Are there points in the code the reviewer needs to double check? Ney ## Why was this MR needed? mobile UX ## What are the relevant issue numbers? Closes #18610. ## Screenshots (if relevant)  ## 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 - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4726
This commit is contained in:
@@ -119,7 +119,12 @@
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
@media (max-width: $screen-sm-max) {
|
||||
.btn-grouped {
|
||||
margin-left: 0;
|
||||
margin-right: 7px;
|
||||
}
|
||||
|
||||
@media (max-width: $screen-xs-max) {
|
||||
h4 {
|
||||
font-size: 15px;
|
||||
}
|
||||
@@ -131,10 +136,14 @@
|
||||
.btn,
|
||||
.btn-group,
|
||||
.accept-action {
|
||||
width: 100%;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.accept-action {
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.accept-control {
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
@@ -284,7 +293,7 @@
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
@media (min-width: $screen-sm-min) {
|
||||
@media (min-width: $screen-xs-min) {
|
||||
float: left;
|
||||
width: 50%;
|
||||
margin-bottom: 0;
|
||||
|
||||
Reference in New Issue
Block a user