summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Rauch <ricardo@gravityonmars.com>2011-11-17 16:30:57 -0300
committerRicardo Rauch <ricardo@gravityonmars.com>2011-11-17 16:30:57 -0300
commitc0dbebb11d7f077d1d203c51b876e06bebea6235 (patch)
treea43a723ddb890107c8dd1e63026b01c88c0f5296
parent07b7ddded3fb769121010171c741cb74397d3830 (diff)
downloadgitlab-ce-c0dbebb11d7f077d1d203c51b876e06bebea6235.tar.gz
fixing error messages
-rw-r--r--app/assets/stylesheets/style.scss58
-rw-r--r--app/views/layouts/_head_panel.html.erb6
2 files changed, 52 insertions, 12 deletions
diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss
index 1f3fa1b70f4..771fe48bf38 100644
--- a/app/assets/stylesheets/style.scss
+++ b/app/assets/stylesheets/style.scss
@@ -74,7 +74,6 @@ $blue_link: "#2fa0bb";
/* eo Vars */
html{ -webkit-font-smoothing:antialiased; }
-*{text-shadow: 0 1px 0 white}
body{font-size: 12px; background-color: #eee;}
a{text-decoration: none; font-weight: bold; color: #666}
a:hover{color: #333}
@@ -481,15 +480,58 @@ header .account-links a:last-child{
border-bottom: 0;
}
-#no_ssh_key_defined {
- border:1px solid #ee8801;
- margin:20px;
- padding:20px;
- background:#ffe3f0;
- h2{margin:0;}
- p {margin:10px 0 0;}
+.big-message{
+ background-image: -webkit-gradient(linear, 0 48, 0 0, color-stop(0.041, #eccb40), to(#ffee4d));
+ background-image: -webkit-linear-gradient(90deg, #eccb40 4.1%, #ffee4d);
+ background-image: -moz-linear-gradient(90deg, #eccb40 4.1%, #ffee4d);
+ background-image: -o-linear-gradient(90deg, #eccb40 4.1%, #ffee4d);
+ text-align: center;
+ font-weight: bold;
+ padding: 10px 20px;
+ text-shadow: 0 1px 0 rgba(255,255,255,.3);
+ color: #333;
+ color: rgba(0,0,0,.7);
+ font-size: 14px;
+ box-shadow: 0 1px 2px rgba(0,0,0,.7);
+ z-index: 100000;
+ margin-bottom: 2px;
}
+.big-message a{color: #000; text-decoration: underline;}
+
+.big-message.error{
+ background-color: #722523;
+ background-image: -webkit-gradient(linear, 0 49, 0 0, color-stop(0.04, #722523), to(#ad4846));
+ background-image: -webkit-linear-gradient(90deg, #9b403f 4%, #c16765);
+ background-image: -moz-linear-gradient(90deg, #722523 4%, #ad4846);
+ background-image: -o-linear-gradient(90deg, #722523 4%, #ad4846);
+ color: #2E0D0C;
+}
+
+.big-message.success{
+ background-color: #7a9339;
+ background-image: -webkit-gradient(linear, 0 48, 0 0, color-stop(0.062, #7a9339), to(#93ae46));
+ background-image: -webkit-linear-gradient(90deg, #7a9339 6.2%, #93ae46);
+ background-image: -moz-linear-gradient(90deg, #7a9339 6.2%, #93ae46);
+ background-image: -o-linear-gradient(90deg, #7a9339 6.2%, #93ae46)
+}
+
+.big-message.success{
+ background-color: #7a9339;
+ background-image: -webkit-gradient(linear, 0 48, 0 0, color-stop(0.062, #7a9339), to(#93ae46));
+ background-image: -webkit-linear-gradient(90deg, #7a9339 6.2%, #93ae46);
+ background-image: -moz-linear-gradient(90deg, #7a9339 6.2%, #93ae46);
+ background-image: -o-linear-gradient(90deg, #7a9339 6.2%, #93ae46)
+}
+
+.big-message.notice{
+ background-image: -webkit-gradient(linear, 0 49, 0 0, color-stop(0.061, #447790), color-stop(0.897, #5da2bf));
+ background-image: -webkit-linear-gradient(90deg, #447790 6.1%, #5da2bf 89.7%);
+ background-image: -moz-linear-gradient(90deg, #447790 6.1%, #5da2bf 89.7%);
+ background-image: -o-linear-gradient(90deg, #447790 6.1%, #5da2bf 89.7%)
+}
+
+
/* eo Account Box */
input.search-input{float: left; text-shadow: none; width: 116px; background-image: url('icon-search.png') ; background-repeat: no-repeat; background-position: 10px; border-radius: 100px; border: 1px solid rgba(0,0,0,.7); box-shadow: 0 1px 0 rgba(255,255,255,.2), 0 2px 2px rgba(0,0,0,.4) inset ; background-color: #D2D5DA; background-color: rgba(255,255,255,.5); padding: 5px; padding-left: 26px; margin-top: 4px; margin-right: 10px }
input.search-input:focus{ background-color: white; width: 216px;}
diff --git a/app/views/layouts/_head_panel.html.erb b/app/views/layouts/_head_panel.html.erb
index bf0394b1582..40c7e0a08e4 100644
--- a/app/views/layouts/_head_panel.html.erb
+++ b/app/views/layouts/_head_panel.html.erb
@@ -48,9 +48,7 @@
<% end %>
<% if current_user.keys.all.empty? %>
- <div id="no_ssh_key_defined">
- <h2>ATTENTION!</h2>
- <p>No SSH Key is defined. You won't be able to use any Git command!
- <p>Click <%=link_to( 'here', keys_path ) %> to add one!
+ <div id="no_ssh_key_defined" class="big-message error">
+ <p>No SSH Key is defined. You won't be able to use any Git command!. Click <%=link_to( 'here', keys_path ) %> to add one!
</div>
<% end %>