Commit d0a783d

speasley <s@stephenpeasley.com>
2016-07-05 02:43:52
Foundation 6 changes
master
1 parent 1bf1d0a
Changed files (3)
app
assets
javascripts
templates
workout_view.ractive
stylesheets
global.scss
views
layouts
_flash.html.erb
app/assets/javascripts/templates/workout_view.ractive
@@ -1,5 +1,5 @@
 {{#if clock}}
-  <div data-alert="" class="alert-box {{alertStatus}}">
+  <div class="alert callout warning">
     <p> {{message}} </p>
     <p> Rest Clock: {{clock}} </p>
   </div>
app/assets/stylesheets/global.scss
@@ -36,7 +36,7 @@ header {
 /* ---------------------------------------------- */
 /* Buttons -------------------------------------- */
 /* ---------------------------------------------- */
-.button.bare {
+.button.secondary.bare {
   &:link,
 	&:hover,
   &:active,
@@ -44,13 +44,12 @@ header {
   &:focus {
     background-color: transparent;
     border-color: transparent;
+    color: $black;
     padding-left: 1.5rem;
     padding-right: 1.5rem;
   }
 
-  &:hover {
-    text-decoration: underline;
-  }
+  &:hover { text-decoration: underline; }
 }
 /* ---------------------------------------------- */
 /* Avatars -------------------------------------- */
@@ -62,12 +61,12 @@ a[class^="social_"] {
 	background: #ffff00;
 }
 /* ---------------------------------------------- */
-/* Alerts --------------------------------------- */
+/* Callouts ------------------------------------- */
 /* ---------------------------------------------- */
-.alert-box ul {
+.alert.callout ul {
 	margin: 0;
 	li {
 		list-style-type: none;
 		text-align: center;
 	}
-}
\ No newline at end of file
+}
app/views/layouts/_flash.html.erb
@@ -1,13 +1,15 @@
 <% if flash.any? %>
   <div class="row">
     <% flash.each do |name, errors| %>
-      <div data-alert class="alert-box <%= name %>">
+      <div class="alert callout <%= name %>" data-closable>
         <ul>
           <% Array(errors).each do |error| %>
             <%= content_tag :li, error %>
           <% end %>
         </ul>
-        <a href="#" class="close">&times;</a>
+        <button class="close-button" aria-label="Dismiss alert" type="button" data-close>
+          <span aria-hidden="true">&times;</span>
+        </button>
       </div>
     <% end %>
   </div>