summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-10 21:10:24 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-10 21:10:24 +0300
commit37cf2eb691b19998b69b8ad9bf8489837d00c81a (patch)
tree32a45a28aaaece5bc57c3d7958842a4bf9549e37
parent11ecf007810548d6e919cc032b3c9bcaf74bba48 (diff)
downloadgitlab-ce-37cf2eb691b19998b69b8ad9bf8489837d00c81a.tar.gz
More readable notice/alert messages
-rw-r--r--app/assets/stylesheets/common.scss27
-rw-r--r--app/views/layouts/_flash.html.haml4
2 files changed, 21 insertions, 10 deletions
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 2ab3a1b3b52..abd38a09929 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -46,15 +46,26 @@ table a code {
/** FLASH message **/
.flash-container {
display: none;
- .alert {
- cursor: pointer;
- margin: 0;
- text-align: center;
- border-radius: 0;
+ cursor: pointer;
+ margin: 0;
+ text-align: center;
+ border-radius: 0;
+ color: #fff;
- span {
- font-size: 14px;
- }
+ span {
+ font-size: 14px;
+ }
+
+ .flash-notice {
+ background: #49C;
+ padding: 10px;
+ text-shadow: 0 1px 1px #178;
+ }
+
+ .flash-alert {
+ background: #C67;
+ text-shadow: 0 1px 1px #945;
+ padding: 10px;
}
}
diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml
index f9ef068d18d..2585030db83 100644
--- a/app/views/layouts/_flash.html.haml
+++ b/app/views/layouts/_flash.html.haml
@@ -1,8 +1,8 @@
.flash-container
- if alert
- .alert.alert-error
+ .flash-alert
%span= alert
- elsif notice
- .alert.alert-info
+ .flash-notice
%span= notice