dfm_web 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 796aa668e18b0dc758855c81500d042f65d6d6e3
-  data.tar.gz: 0de3758badc28b9f2dedd12d5ebe47f70032717e
+  metadata.gz: bbd9352ce1a7db68e5c88c39e7992eb627a7ca3d
+  data.tar.gz: b1ef7521f408fd330f209121d95257d8457f3e8e
 SHA512:
-  metadata.gz: 661db92da32f71a48d599e79b5c11ff72c4bd4b92824169c4d9b840883853e2ff04cdb200aa415a3f73fa25e1755ff065a92fbb9a909fd110e58de14b4e8a2b5
-  data.tar.gz: 940f25f51d4f098ec94673050445284268077789dbbd727b488f8b996b7eca862f8986f8a01508ce520025dd49c808839d46f570fea6f5edafdab24d26f1b54e
+  metadata.gz: 39f08f0c84a6d34501666636d7c2ea9866b2c2cde2c5079eb33401894ee63021726aba81360bb150a03f8f6cd3d64fa7f7c1a666f9a654bb46994e14df78a704
+  data.tar.gz: c5747cd5114e5f24ef6fae279fa239b14e9bab5792d0d44b649c51eaf063e9ef9b5df11b99a212b03b383e62e809cf65945e1f25ad4ec81118bbf50947e36f9d

data/app/assets/stylesheets/dfm_web/nav.css

@@ -171,7 +171,6 @@ nav #nav form input[type="text"] {
 }
 
 nav > #nav > ul.right {
-  position: absolute;
   right: 0;
   z-index: 99999;
 }

data/app/assets/stylesheets/dfm_web/style.css.erb

@@ -31,7 +31,8 @@ html {
   margin: 0 auto;
 }
 
-
+/* Hide Rails scaffold notice bars */
+main #main p#notice { display: none; }
 
 
 #main {

data/app/views/layouts/_nav.html.erb

@@ -1,11 +1,13 @@
 <nav>
   <div id="nav">
-    <div class="left">
-      <%= link_to main_app.root_url do %>
-        <%= image_tag "dfm_web/uwcrest.png", size: '25x40' %>
-        <h1 class='hover_span'>DFM<span>CH</span> Web</h1>
-      <% end %>
-    </div>
+    <ul class="left">
+      <li class="no_hover">
+        <%= link_to main_app.root_url do %>
+          <%= image_tag "dfm_web/uwcrest.png", size: '25x40' %>
+          <span>DFM Web</span>
+        <% end %>
+      </li>
+    </ul>
 
     <ul class="right">
       <li><%= link_to "Example", '#' %></li>

data/lib/dfm_web/version.rb

@@ -1,10 +1,11 @@
 module DfmWeb
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end
 
 
 # Version History
 
+# 2.1.2   Add submit buttons w/ modifier classes below "button" links with the same classes to the kitchen sink.
 # 2.1.1   Eliminate a visual jump when resizing from L to XL.
 # 2.1.0   Updated the print version of the "paper" class so it matches the screen version as it should.
 # 2.0.9   Added a animation clear on the notice/alert close javascript. This allows you to add new actions in your app.

data/spec/dummy/app/views/application/index.html.erb

@@ -267,11 +267,25 @@
   </div>
   <div class="pure-u-1 pure-u-lg-1-2">
     <h1>Modifier Classes</h1>
-    <br/>
+
+    <h2>Links with button</h2>
     <%= link_to "button", "#", class: 'button' %>
     <%= link_to "button alert", "#", class: 'button alert' %>
     <%= link_to "button warn", "#", class: 'button warn' %>
+
+    <h2>Form Submit</h2>
+    <%= form_tag nil, method: :get do %>
+      <%= submit_tag "submit" %>
+      <%= submit_tag "submit alert", class: 'alert' %>
+      <%= submit_tag "submit warn", class: 'warn' %>
+    <% end %>
+
+
+
   </div>
+
+
+
 </div>
 
 <hr>