flashoff 0.0.12 → 0.0.13

data/lib/flashoff/version.rb

@@ -1,3 +1,3 @@
 module Flashoff
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/vendor/assets/javascripts/file_input.js

@@ -1,6 +1,6 @@
 $(function() {
 
-$('input[type=file].btn-file').each(function(i,elem){
+$('input[type=file].btn-file').each(function(i,el){
 
   // Maybe some fields don't need to be standardized.
   if (typeof $(this).attr('data-bfi-disabled') != 'undefined') {
@@ -14,13 +14,13 @@ $('input[type=file].btn-file').each(function(i,elem){
     buttonWord = $(this).attr('title');
   }
 
-  // Start by getting the HTML of the input element.
+  // Start by getting the HTML of the input elent.
   // Thanks for the tip http://stackoverflow.com/a/1299069
-  var input = $('<div>').append( $(elem).eq(0).clone() ).html();
+  var input = $('<div>').append( $(el).eq(0).clone() ).html();
 
   // Now we're going to replace that input field with a Bootstrap button.
   // The input will actually still be there, it will just be float above and transparent (done with the CSS).
-  $(elem).replaceWith('<a class="btn btn-small btn-block btn-file">'+buttonWord+input+'</a>');
+  $(el).replaceWith('<a class="btn btn-small btn-outline btn-block btn-file">'+buttonWord+input+'</a>');
 })
 // After we have found all of the file inputs let's apply a listener for tracking the mouse movement.
 // This is important because the in order to give the illusion that this is a button in FF we actually need to move the button from the file input under the cursor. Ugh.
@@ -35,9 +35,9 @@ $('input[type=file].btn-file').each(function(i,elem){
       inputWidth, inputHeight,
       cursorX, cursorY;
 
-    // This wrapper element (the button surround this file input)
+    // This wrapper elent (the button surround this file input)
     wrapper = $(this);
-    // The invisible file input element
+    // The invisible file input elent
     input = wrapper.find("input");
     // The left-most position of the wrapper
     wrapperX = wrapper.offset().left;
@@ -80,7 +80,7 @@ $('input[type=file].btn-file').each(function(i,elem){
 // This ensures they can be easily overridden with developer styles
 var cssHtml = '<style>'+
   '.btn-file { overflow: hidden; position: relative; cursor: pointer; z-index: 1; }'+
-  '.btn-file input[type=file], .btn-file input[type=file]:focus, .btn-file input[type=file]:hover { position: absolute; top: 0; left: 0; cursor: pointer; opacity: 0; filter: alpha(opacity=0); z-index: 99; outline: 0; }'+
+  '.btn-file input[type=file], .btn-file input[type=file]:focus, .btn-file input[type=file]:hover { position: absolute; top: 0; left: 0; cursor: pointer; opacity: 0; z-index: 99; outline: 0; }'+
   '.btn-file-name { margin-left: 8px; }'+
   '</style>';
 $('link[rel=stylesheet]').eq(0).before(cssHtml);

data/vendor/assets/stylesheets/button.css.scss

@@ -3,6 +3,7 @@
 #Button
 #Button Sizes
 #Button Colors
+#Button Links
 #Button Icons
 #Button Outlines
 #Button Group
@@ -48,7 +49,7 @@
   border-radius: 2px;
   font-size: 11px;
   line-height: 11px;
-  padding: 7px 15px;
+  padding: 8px 15px;
 }
 .btn-mini {
   border-radius: 2px;
@@ -90,6 +91,20 @@ input.btn-block {
 }
 .btn-red:hover { background: rgba(210,64,46,1); }
 
+/* #Button Links
+================================================== */
+.btn-link {
+  background: none;
+  border: none;
+  margin-top: 12px;
+  padding: 0;
+}
+.btn-link:hover { background: none; }
+.btn-link.btn-large { margin-top: 17px; }
+.btn-link.btn-small { margin-top: 8px; }
+.btn-link.btn-mini { margin-top: 6px; }
+.btn-link.btn-link-clean { margin-top: 0; }
+
 /* #Button Icons
 ================================================== */
 .btn-icon {
@@ -105,7 +120,7 @@ input.btn-block {
 .btn-small.btn-icon {
   font-size: 14px;
   line-height: 14px;
-  padding: 7px 8px 5px 7px;
+  padding: 8px 9px 6px 8px;
 }
 .btn-mini.btn-icon {
   font-size: 11px;
@@ -127,11 +142,11 @@ input.btn-block {
   color: rgba(71,74,84,1);
 }
 .btn-large.btn-outline { padding: 14px 29px 16px 29px; }
-.btn-small.btn-outline { padding: 6px 14px 7px 14px; }
+.btn-small.btn-outline { padding: 7px 14px 8px 14px; }
 .btn-mini.btn-outline { padding: 5px 14px 6px 14px; }
 .btn-outline.btn-icon { padding: 10px 12px 9px 12px; }
 .btn-large.btn-icon.btn-outline { padding: 11px 13px 11px 13px; }
-.btn-small.btn-icon.btn-outline { padding: 5px 7px 5px 6px; }
+.btn-small.btn-icon.btn-outline { padding: 6px 7px 6px 6px; }
 .btn-mini.btn-icon.btn-outline { padding: 4px 6px 4px 6px; }
 
 /* #Button Group

data/vendor/assets/stylesheets/form.css.scss

@@ -23,7 +23,7 @@ label {
   display: block;
   font-size: 14px;
   font-weight: bold;
-  margin: 5px 0 10px 0;
+  margin: 5px 0 5px 0;
 }
 textarea,
 input[type="text"],
@@ -51,7 +51,7 @@ input[type="color"],
   color: rgba(43,50,53,1);
   display: block;
   font-size: 16px;
-  margin: -5px 0 10px 0;
+  margin-bottom: 5px;
   padding: 13px 0 10px 0;
   text-indent: 10px;
   -webkit-transition: border linear 0.2s;
@@ -60,7 +60,6 @@ input[type="color"],
   vertical-align: middle;
 }
 textarea { height: 140px; }
-.textarea-large { height: 200px; }
 textarea:focus,
 input[type="text"]:focus,
 input[type="password"]:focus,
@@ -89,12 +88,6 @@ input[type="checkbox"] {
   margin-top: 1px \9;
   line-height: normal;
 }
-input[type="submit"] { margin-top: 10px; }
-input[type="submit"].form-button-inline { 
-  margin-top: -5px;
-  padding-bottom: 13px;
-  padding-top: 12px; 
-}
 input[type="file"],
 input[type="image"],
 input[type="submit"],
@@ -117,14 +110,13 @@ select {
   border-radius: 2px;
   color: rgba(33,40,43,1);
 	font-size: 100%;
-  margin-bottom: 15px;
+  margin-bottom: 5px;
   padding: 13px 0 10px 15px;
   text-indent: 0;
   text-transform: capitalize;
   width: 100%;
   vertical-align: middle;
 }
-.form-select-inline { margin-top: -5px; }
 select[multiple] {
   border-radius: 2px;
   padding-left: 10px;
@@ -193,16 +185,23 @@ select:focus:invalid:focus { border-color: rgba(254,79,50,1); }
 .form-error-messages li:first-child { padding-top: 10px; }
 .form-error-messages li:last-child { padding-bottom: 10px; }
 .form-img { margin-top: -5px; }
+.form-textarea-large { height: 200px; }
 .form-input-inline {
   display: inline-block;
   margin-right: 10px;
 }
-.form-text-inline { margin-top: 22px; }
+.form-text-inline { margin-top: 13px; }
+.form-select-inline { margin-top: 0px; }
 .form-help-block {
   color: rgba(158,171,179,1);
   display: block;
   font-size: 12px;
-  margin: -5px 0 15px 0;
+  margin-bottom: 15px;
+}
+.form-button-inline { 
+  margin-top: 2px;
+  padding-bottom: 13px;
+  padding-top: 12px; 
 }
 .form-footer {
 	border-top: 1px solid rgba(236,238,241,1);
@@ -214,6 +213,6 @@ select:focus:invalid:focus { border-color: rgba(254,79,50,1); }
 /* #Media Queries
 ================================================== */
 @media only screen and (max-width: 767px) {
-  input[type="submit"].form-button-inline { margin-top: 10px; }
+  .form-button-inline { margin-top: 15px; }
   .form-text-inline { margin-top: 0; }
 }