diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-06 17:34:36 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-06 17:34:36 +0300 |
| commit | 46e4ed6bd0c8c256bce6d35b4bb992d77fd09971 (patch) | |
| tree | a1be9e633426f364ecdc7521ad28ebb909a20a64 | |
| parent | 29a7a8c75b6970d34124c1489a663ee738ef863a (diff) | |
| parent | 24507da42df4d48539570617c99825914f0a34dc (diff) | |
Merge branch '29470-make-modal-sizes-consistent-and-mobile-friendly' into 'master'
Resolve "Make modal sizes consistent and mobile friendly"
Closes #29470
See merge request !10088
| -rw-r--r-- | app/assets/stylesheets/framework/modal.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index 8cd49280e1c..7098203321d 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -16,6 +16,8 @@ body.modal-open { overflow: hidden; } -.modal .modal-dialog { - width: 860px; +@media (min-width: $screen-md-min) { + .modal-dialog { + width: 860px; + } } diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 566dcc64802..2f946ab2f59 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -329,8 +329,6 @@ } #modal_merge_info .modal-dialog { - width: 600px; - .dark { margin-right: 40px; } diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index fc4da4c495f..f3916622b6f 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -145,8 +145,6 @@ margin: 0; } -#modal-remove-blob > .modal-dialog { width: 850px; } - .blob-upload-dropzone-previews { text-align: center; border: 2px; |