waterfall_bourbon_neat_rails 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 412f74b8f2a6ba82d533e43e50d1bff6f34ca377
-  data.tar.gz: 993d81808e22d886ccf9a1511466a69b08ca134a
+  metadata.gz: 6ec73c702709827abf18b7f5e574ca49d9ba4a6a
+  data.tar.gz: 1796a844911f79f92dd021c017e60c592833e184
 SHA512:
-  metadata.gz: 846352ead21b42250768feade70195b1ff8055c21d68e855f719c62eeb00469a8cfa80986defac5126431215741a1106551b8b856d73094c684559cf71c8740e
-  data.tar.gz: cb7ff46c877ccc96adf198d849feadb4d37bed5f3933f9f21c4a509f523d9fc2368a7a3b3fd7c3fbef5abf1139c34e17b448ca6918a13dd9bdef937141c306ee
+  metadata.gz: 1dfe71ce955c97491cd7c71bcc38950b96f5d125abf93a352c9998f4708e748ae3401a5063de4f299c8d560f990bb4a0fddfe3c3d13a2c225f7a4699916c7690
+  data.tar.gz: d3015f39b658ff0cf731eb4df123afaeb2429b1a6c18c4987cf91b425d161379bd3c5fcdcfddd0e35fe358f4220eb81322e84a04982d354262364fa43c9d2d5c

data/app/assets/stylesheets/base/_forms.scss

@@ -5,6 +5,10 @@ fieldset {
   padding: $base-line-height;
 }
 
+input{
+  width:100%;
+}
+
 input,
 label,
 select {

data/app/assets/stylesheets/custom/_components.scss

@@ -2,14 +2,6 @@
 
 /*general classes*/
 
-.reset-margin{
-  margin: 0;
-}
-
-.padding10{
-  padding: 10px;
-}
-
 form input[type="text"], form input[type="email"], form input[type="password"], form input[type="tel"]{
   padding: 0 0 0 10px!important;
   height: 40px;
@@ -38,7 +30,7 @@ input.error{
 }
 
 .form-inputs input{
-  @extend .reset-margin;
+  margin: 0;
 }
 
 #email-error, #password-error, div.error, #current_password-error, #new_password-error, #new_password_confirmation-error{
@@ -99,6 +91,8 @@ input.error{
       width: 60px; 
       margin-top: 10px;
       margin-left: 30px;
+      height: 35px;
+      padding-left: 5px;
     }
 
     .previous, .next{
@@ -227,7 +221,7 @@ input.error{
   right:0;
   z-index: 9999;
   display: none;
-  background-color: rgba(241, 241, 241, 0.66);
+  background-color: rgba(134, 134, 134, 0.66);;
 
   .ajax-spinner{
     width: 30px;
@@ -243,7 +237,9 @@ input.error{
     -o-animation: spin 1s linear infinite;
     animation: spin 1s linear infinite;
   }
-  @-webkit-keyframes spin
+}
+
+@-webkit-keyframes spin
   {
       from { -webkit-transform: rotate(0deg); opacity: 0.4; }
       50%  { -webkit-transform: rotate(180deg); opacity: 1; }
@@ -277,4 +273,22 @@ input.error{
       50%  { transform: rotate(180deg); opacity: 1; }
       to   { transform: rotate(360deg); opacity: 0.2; }
   }
+
+
+//url component(generate link for register)
+
+.url{
+  @include center;
+  p{
+    padding: 5px 0;
+  }
+  #target{
+    height: 40px;
+    width: 110px;
+    padding-left: 5px;
+  }
+  .url__item{
+    margin-top: 10px;
+    display: none;
+  }
 }

data/app/assets/stylesheets/custom/_mixins.scss

@@ -43,7 +43,7 @@
   margin: 0 auto;
 }
 
-@mixin back-btn($color, $width, $height, $line-height, $font-size, $hover-color) {
+@mixin btn($color, $width, $height, $line-height, $font-size, $hover-bck, $hover-color) {
   @include border-radius();
   color: $color;
   width: $width;
@@ -55,10 +55,9 @@
   background-color: transparent;
   border: solid 2px $color;
   font-size: $font-size;
-  font-weight: bold;
 
   &:hover{
-    background-color: $color;
+    background-color: $hover-bck;
     color: $hover-color;
   }
 }

data/app/assets/stylesheets/custom/_pages.scss

@@ -13,7 +13,7 @@ body{
 	.notification{
 		z-index: 4;
 		.flash-error, .flash-notice{
-			@extend .reset-margin;
+			margin: 0;
 		}
 	}
 	.header{
@@ -60,14 +60,14 @@ body#main{
 		.login{
 			margin-top:100px;
 			background-repeat: round;
-			@extend .padding10;
+			padding: 10px;
 
 			form{
 				width: 500px;
 				margin: 10px auto;
 
 				.form-inputs{
-					@extend .padding10;
+					padding: 10px;
 					background-color: $light_grey_op;
 					position: relative;
 					box-shadow: 0 0 25px 1px #00154B;
@@ -87,7 +87,7 @@ body#main{
 				}
 
 				.form-actions{
-					@extend .padding10;
+					padding: 10px;
 				}
 			}
 		}
@@ -96,23 +96,18 @@ body#main{
 				display: block;
 				@include clearfix;
 				.form_actions{
-					@extend .padding10;
+					padding: 10px;
 					@include clearfix;
 					input, .btn_back{
-						cursor: pointer;
-						width: 100px;
-						height: 40px;
-						line-height: 40px;
+						@include btn(#fff, 120px, 40px, 40px, 1.3em, transparent,white);
+						border:none;
 					}
 					input{
 						float: left;
 					}
 					.btn_back{
-						@include back-btn($light_blue, 100px, 40px, 40px, 1em, white);
 						float: right;
 						position: relative;
-						@include font-attr(1.3em, #fff, 400);
-						border:none;
 
 						span:hover{
 							color:$sky_blue;
@@ -150,6 +145,7 @@ body#main{
 						@include font-attr(1.4em, $medium_blue, bold);
 					}
 					fieldset{
+						padding: 10px 30px;
 						legend{
 							@include font-attr(1.2em, $medium_blue, bold);
 						}
@@ -215,7 +211,7 @@ body#main{
 						}
 
 						.upload_actions{
-							margin-top:30px;
+							margin-top:19px;
 							input{
 								height: 40px;
 								padding: 0;
@@ -227,8 +223,9 @@ body#main{
 				.form_actions{
 					@include span-columns(10);
 					float: none;
+					margin-right: auto !important;
 					@include center;
-					@extend .padding10;
+					padding:10px;
 					@include clearfix;
 					color: $light_blue;
 
@@ -236,13 +233,10 @@ body#main{
 						float: left;
 					}
 					.btn_back{
-						@include back-btn($light_blue, 100px, 40px, 40px, 1em, white);
 						float: right;
-					}
-					
+					}				
 					input, .btn_back{
-						@include back-btn($light_blue, 100px, 40px, 40px, 1em, white);
-						width: 90px;
+						@include btn($light_blue, 120px, 40px, 40px, 1em, $light_blue, white);
 					}
 
 				}
@@ -298,12 +292,12 @@ body#landing-page{
 				margin: 10px auto;
 			}
 			.form_actions{;
-				@extend .padding10;
+				padding: 10px 0;
 				@include clearfix;
 				color: $light_blue;
 				
 				input, .btn_back {
-					@include back-btn($light_blue, 100px, 40px, 40px, 1em, white);
+					@include btn($light_blue, 120px, 40px, 40px, 1em, $light_blue, white);
 				}	
 				input{
 					float: left;

data/app/assets/stylesheets/custom/_style.scss

@@ -1,7 +1,7 @@
 @import "variables";
 @import "functions";
 @import "mixins";
-// @import "reset";
+@import "reset";
 // @import "base";
 @import "components";
 @import "pages";

data/app/assets/stylesheets/waterfall_bourbon_neat_rails/application.scss

@@ -1,4 +1,3 @@
-@import "normalize/normalize.css";
 @import "bourbon";
 @import "base/base"; /* Bitters needs to be imported before Neat */
 @import "neat";

data/lib/waterfall_bourbon_neat_rails/version.rb

@@ -1,3 +1,3 @@
 module WaterfallBourbonNeatRails
-  VERSION = "0.1.8".freeze
+  VERSION = "0.1.9".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfall_bourbon_neat_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Waterfall Software Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails