contour 1.2.0 → 1.2.1

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## 1.2.0
+## 1.2.1 (February 20, 2013)
+
+### Enhancements
+- Flash notices are now displayed underneath the menu bar as a float
+  - Flash notices can be customized by overwriting the CSS for `.flash-block` and `.navbar-alert`
+
+## 1.2.0 (February 15, 2013)
 
 ### Breaking Changes
 - Removed support for the subnav partial

data/README.md

@@ -35,7 +35,7 @@ cd blank_rails_project
 Modify `Gemfile` and add
 
 ```ruby
-gem 'contour', '~> 1.2.0'
+gem 'contour', '~> 1.2.1'
 ```
 
 Run Bundle install

data/app/assets/stylesheets/bootstrap-base-overrides.css

@@ -47,13 +47,16 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 .navbar-alert {
-  padding: 5px;
-  line-height: 20px;
-  margin: 0px 0px 3px 0px;
-}
-
-.navbar-alert .close {
-  position: inherit;
-  line-height: 16px;
-  padding-left: 5px;
+  margin: 0px 0px 5px 0px;
+  border: 1px solid #515151;
+  -moz-box-shadow: 3px 3px 4px #515151;
+  -webkit-box-shadow: 3px 3px 4px #515151;
+  box-shadow: 3px 3px 4px #515151;
+}
+
+.flash-block {
+  position: absolute;
+  right: 0px;
+  top: -16px;
+  z-index: 1000;
 }

data/app/views/contour/layouts/_menu.html.erb

@@ -46,9 +46,6 @@
           <input id="<%= Contour.search_bar[:id] || 'global-search' %>" name="q" type="text" autocomplete="off" class="search-query" value="<%= params[:q] %>" placeholder="<%= Contour.search_bar[:placeholder] || 'Search' %>">
         </form>
       <% end %>
-      <div class="navbar-search pull-right" data-object="flash-container">
-        <%= flash_block %>
-      </div>
     </div>
   </div>
 </div>

data/app/views/contour/layouts/application.html.erb

@@ -19,6 +19,12 @@
       <%= render partial: 'contour/layouts/menu' %>
     </div>
 
+    <div class="container" style="position:relative">
+      <div class="flash-block" data-object="flash-container">
+        <%= flash_block %>
+      </div>
+    </div>
+
     <div class="container">
       <%= yield %>
     </div>

data/lib/contour/version.rb

@@ -2,7 +2,7 @@ module Contour
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 2
-    TINY = 0
+    TINY = 1
     BUILD = nil # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails