Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removing duplicate modal styling

This commit is contained in:
Kris 2018-01-26 14:52:03 -05:00
parent 9721fb7573
commit ee155bd4f2
3 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/common/base/modal.scss
View File

@ -11,6 +11,16 @@
} }
.bootbox.modal {
position: fixed;
z-index: z("modal","content");
overflow: auto;
height: auto;
background-color: $secondary;
box-shadow: 0 2px 2px rgba(0,0,0, .25);
background-clip: padding-box;
}
.input-hint-text { .input-hint-text {
margin-left: 0.5em; margin-left: 0.5em;
color: $secondary-high; color: $secondary-high;

10
app/assets/stylesheets/desktop/modal.scss
View File

@ -7,23 +7,13 @@
// Hardcode to be the same as before for now. I would recommend not using bootbox, or finding a way so the html structure can be the same // Hardcode to be the same as before for now. I would recommend not using bootbox, or finding a way so the html structure can be the same
.bootbox.modal { .bootbox.modal {
position: fixed;
top: 50%; top: 50%;
left: 50%; left: 50%;
z-index: z("modal","content");
overflow: auto;
width: 610px; width: 610px;
height: auto;
margin: -250px 0 0 -305px; margin: -250px 0 0 -305px;
background-color: $secondary;
border: 1px solid $primary-low;
box-shadow: 0 3px 7px rgba(0,0,0, .8);
background-clip: padding-box;
.cancel { .cancel {
margin-left: 1em; margin-left: 1em;
} }
} }
.modal.in { .modal.in {

10
app/assets/stylesheets/mobile/modal.scss
View File

@ -10,18 +10,8 @@
// Hardcode to be the same as before for now. I would recommend not using bootbox, or finding a way so the html structure can be the same // Hardcode to be the same as before for now. I would recommend not using bootbox, or finding a way so the html structure can be the same
.bootbox.modal { .bootbox.modal {
position: fixed;
top: 10%; top: 10%;
z-index: z("modal","content");
overflow: auto;
width: 100%; width: 100%;
height: auto;
background-color: $secondary;
border: 1px solid rgba(0, 0, 0, 0.3);
@include border-radius-all (6px);
box-shadow: 0 3px 7px rgba(0,0,0, 0.3);
background-clip: padding-box;
} }
.modal.fade { .modal.fade {