Permalink
Browse files

Changed to new logo and changed flash boxes

  • Loading branch information...
1 parent de90e0a commit e2f625c4e18f8a7f5a7b5bea325065fffbd71805 Elad Meidar committed Apr 10, 2010
@@ -15,11 +15,10 @@
</head>
<body>
<%= render :partial => 'users/user_bar'%>
+ <%- flash.each do |name, msg| -%>
+ <%= content_tag :div, msg, :class => 'flash', :id => "flash_#{name}" %>
+ <%- end -%>
<div id="container">
- <%- flash.each do |name, msg| -%>
- <%= content_tag :div, msg, :id => "flash_#{name}" %>
- <%- end -%>
-
<%- if show_title? -%>
<h1><%=h yield(:title) %></h1>
<%- end -%>
@@ -1,9 +1,4 @@
<div id="navcontainer">
-<% if logged_in? %>
-<h1><a href="/dashboard">CannedCukes</a></h1>
-<% else %>
-<h1><a href="/">CannedCukes</a></h1>
-<% end %>
<ul id="navlist">
<li><%= link_to "Search Scenarios", scenarios_url%></li>
<% if logged_in? -%>
@@ -16,5 +11,4 @@
<% end -%>
</ul>
<div class="clear"></div>
-
</div>
View
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -150,19 +150,27 @@ text-align:center;
margin-top:30px;
}
+.flash {
+ -moz-border-radius: 15px;
+ -khtml-border-radius: 15px;
+ -webkit-border-radius: 15px;
+ margin:0px auto;
+ margin-top:20px;
+ width:770px;
+ font-size:17px;
+}
#flash_notice, #flash_error {
padding: 5px 8px;
- margin: 10px 0;
}
#flash_notice {
background-color: #CFC;
- border: solid 1px #6C6;
+ border: solid 2px #363;
}
#flash_error {
background-color: #FCC;
- border: solid 1px #C66;
+ border: solid 2px #C66;
}
.fieldWithErrors {
@@ -207,6 +215,7 @@ margin-top:30px;
#navcontainer {
background:#9F9 url(../images/CannedCukes.png) 10px 10px no-repeat;
margin:0px;
+ height:90px;
padding:30px;
border-bottom:3px solid #396;

0 comments on commit e2f625c

Please sign in to comment.