Make alert styles consistent

This commit is contained in:
James Brooks
2015-05-18 09:23:09 +01:00
parent 3fa0912818
commit afa66814fa
8 changed files with 52 additions and 42 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

18
public/build/dist/js/all-c574dfda.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
{ {
"dist/css/all.css": "dist/css/all-9e808a49.css", "dist/css/all.css": "dist/css/all-91da3eb2.css",
"dist/js/all.js": "dist/js/all-73562b00.js" "dist/js/all.js": "dist/js/all-c574dfda.js"
} }

View File

@@ -65,25 +65,8 @@ body.status-page {
} }
.alert { .alert {
border-radius: 0;
font-size: 1.2em; font-size: 1.2em;
&.alert-success { font-weight: 600;
background-color: $cachet_green;
border-color: $cachet_dark-green;
color: white;
}
&.alert-info {
background: $cachet_blue;
border-color: $cachet_dark-blue;
color: #FFF;
}
&.alert-danger {
background: $cachet_red;
border-color: $cachet_dark-red;
color: #FFF;
}
} }
.timeline { .timeline {

View File

@@ -15,6 +15,7 @@ html, body {
@import "modules/tabs"; @import "modules/tabs";
@import "modules/forms"; @import "modules/forms";
@import "modules/well"; @import "modules/well";
@import "modules/alerts";
// Styles for partials // Styles for partials
@import "partials/base"; @import "partials/base";

View File

@@ -0,0 +1,20 @@
.alert {
border-radius: 4px;
&.alert-success {
background-color: $cachet_green;
border: solid 2px $cachet_dark-green;
color: white;
}
&.alert-info {
background: $cachet_blue;
border: solid 2px $cachet_dark-blue;
color: #FFF;
}
&.alert-danger {
background: $cachet_red;
border: solid 2px $cachet_dark-red;
color: #FFF;
}
}

View File

@@ -16,3 +16,8 @@
text-align: center; text-align: center;
margin: 0 0 30px 0; margin: 0 0 30px 0;
} }
.login .alert {
font-size: $base-font-size;
letter-spacing: $base-letter-spacing;
}