github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 03:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

BUGFIX: share alert styling with mobile

Browse Source
This commit is contained in:
Régis Hanol 2014-07-07 17:46:32 +02:00
parent b0815e8ace
commit ab3d664ce0
7 changed files with 53 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/assets/stylesheets/common/base/alert.scss Normal file
View File

@ -0,0 +1,45 @@
.alert {
padding: 8px 35px 8px 14px;
background-color: scale-color($danger, $lightness: 75%);
color: #c09853;
.close {
position: relative;
top: -2px;
right: -21px;
line-height: 18px;
float: right;
font-size: 20px;
font-weight: bold;
line-height: 18px;
color: $primary;
opacity: 0.2;
filter: alpha(opacity = 20);
@include hover {
color: $primary;
text-decoration: none;
cursor: pointer;
opacity: 0.4;
filter: alpha(opacity = 40);
}
}
button.close {
padding: 0;
cursor: pointer;
background: transparent;
border: 0;
-webkit-appearance: none;
}
&.alert-success {
background-color: scale-color($success, $lightness: 90%);
color: $success;
}
&.alert-error {
background-color: scale-color($danger, $lightness: 75%);
color: $danger;
}
&.alert-info {
background-color: scale-color($tertiary, $lightness: 90%);
color: $primary;
}
}

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

@ -2,6 +2,7 @@
/* @import "desktop/*"; TODO: get this working again */
@import "desktop/alert";
@import "desktop/compose";
@import "desktop/discourse";
@import "desktop/header";

3
app/assets/stylesheets/desktop/alert.scss Normal file
View File

@ -0,0 +1,3 @@
.alert {
margin-bottom: 15px;
}

47
app/assets/stylesheets/desktop/discourse.scss
View File

@ -475,53 +475,6 @@ body {
}
}
.alert {
padding: 8px 35px 8px 14px;
margin-bottom: 18px;
background-color: scale-color($danger, $lightness: 75%);
color: #c09853;
.close {
position: relative;
top: -2px;
right: -21px;
line-height: 18px;
float: right;
font-size: 20px;
font-weight: bold;
line-height: 18px;
color: $primary;
opacity: 0.2;
filter: alpha(opacity = 20);
@include hover {
color: $primary;
text-decoration: none;
cursor: pointer;
opacity: 0.4;
filter: alpha(opacity = 40);
}
}
button.close {
padding: 0;
cursor: pointer;
background: transparent;
border: 0;
-webkit-appearance: none;
}
&.alert-success {
background-color: scale-color($success, $lightness: 90%);
color: $success;
}
&.alert-error {
background-color: scale-color($danger, $lightness: 75%);
color: $danger;
}
&.alert-info {
background-color: scale-color($tertiary, $lightness: 90%);
color: $primary;
}
}
.bootbox.modal {
.modal-footer {
a.btn-primary {

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

@ -2,6 +2,7 @@
/* @import "mobile/*"; TODO: get this working again */
@import "mobile/alert";
@import "mobile/compose";
@import "mobile/discourse";
@import "mobile/faqs";

3
app/assets/stylesheets/mobile/alert.scss Normal file
View File

@ -0,0 +1,3 @@
.alert {
margin: 15px 0 5px 0;
}

2
app/assets/stylesheets/mobile/discourse.scss
View File

@ -72,8 +72,6 @@ body {
}
}
}
}
blockquote {