Merge branch 'dz-small-ui-fixes' into 'master'

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

* in help file I found css for modal that affect whole application -> moved to separate file
* fixed ugly confirmation message when remove project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !3979
This commit is contained in:
Jacob Schatz 2016-04-29 17:56:46 +00:00
commit 85d6403278
4 changed files with 24 additions and 20 deletions

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";

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;
}

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;
}

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.