kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Move modal css to separate file and fix danger text for confirmation modal 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2016-04-29 19:02:30 +02:00
parent bfc6a0e371
commit f3f820d0bd
No known key found for this signature in database
GPG Key ID: 627C5F589F467F17
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/framework.scss
View File

@ -25,6 +25,7 @@
@import "framework/lists.scss";
@import "framework/markdown_area.scss";
@import "framework/mobile.scss";
@import "framework/modal.scss";
@import "framework/nav.scss";
@import "framework/pagination.scss";
@import "framework/progress.scss";

22
app/assets/stylesheets/framework/modal.scss Normal file
View File

@ -0,0 +1,22 @@
.modal-body {
position: relative;
overflow-y: auto;
padding: 15px;
.form-actions {
margin: -$gl-padding+1;
margin-top: 15px;
}
.text-danger {
font-weight: bold;
}
}
body.modal-open {
overflow: hidden;
}
.modal .modal-dialog {
width: 860px;
}

19
app/assets/stylesheets/pages/help.scss
View File

@ -55,25 +55,6 @@
}
}
.modal-body {
position: relative;
overflow-y: auto;
padding: 15px;
.form-actions {
margin: -$gl-padding+1;
margin-top: 15px;
}
}
body.modal-open {
overflow: hidden;
}
.modal .modal-dialog {
width: 860px;
}
.documentation {
padding: 7px;
}

2
app/views/shared/_confirm_modal.html.haml
View File

@ -7,7 +7,7 @@
Confirmation required
.modal-body
%p.cred.lead.js-confirm-text
%p.text-danger.js-confirm-text
%p
This action can lead to data loss.