Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-18 01:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix user/username error class

Browse Source
This commit is contained in:
Erick Guan 2014-05-26 14:17:25 +08:00
parent 570c4b6300
commit ecbda44be4
5 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/user/about.js.handlebars
View File

@ -9,7 +9,7 @@
{{#if error}} {{#if error}}
<div class="control-group"> <div class="control-group">
<div class="instructions"> <div class="instructions">
<div class='alert error'>{{i18n user.change_about.error}}</div> <div class='alert alert-error'>{{i18n user.change_about.error}}</div>
</div> </div>
</div> </div>
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/user/email.js.handlebars
View File

@ -17,7 +17,7 @@
{{#if error}} {{#if error}}
<div class="control-group"> <div class="control-group">
<div class="instructions"> <div class="instructions">
<div class='alert error'>{{i18n user.change_email.error}}</div> <div class='alert alert-error'>{{i18n user.change_email.error}}</div>
</div> </div>
</div> </div>
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/templates/user/username.js.handlebars
View File

@ -10,7 +10,7 @@
{{#if error}} {{#if error}}
<div class="control-group"> <div class="control-group">
<div class="instructions"> <div class="instructions">
<div class='alert error'>{{i18n user.change_username.error}}</div> <div class='alert alert-error'>{{i18n user.change_username.error}}</div>
</div> </div>
</div> </div>
{{/if}} {{/if}}

2
app/assets/stylesheets/common/base/discourse.scss
View File

@ -13,7 +13,7 @@ blockquote {
border-left: 5px solid darken(scale-color-diff(), 10%); border-left: 5px solid darken(scale-color-diff(), 10%);
} }
a.no-href { a.no-href {
cursor: pointer; cursor: pointer;
} }

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

@ -491,27 +491,12 @@ body {
margin-bottom: 18px; margin-bottom: 18px;
background-color: scale-color($danger, $lightness: 75%); background-color: scale-color($danger, $lightness: 75%);
color: #c09853; color: #c09853;
}
.alert .close {
position: relative;
top: -2px;
right: -21px;
line-height: 18px;
}
.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;
}
.alert {
.close { .close {
position: relative;
top: -2px;
right: -21px;
line-height: 18px;
float: right; float: right;
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;
@ -534,7 +519,20 @@ body {
border: 0; border: 0;
-webkit-appearance: none; -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 { .bootbox.modal {
.modal-footer { .modal-footer {
a.btn-primary { a.btn-primary {