waterfall_bourbon_neat_rails 1.2.5 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 145d06fa6222fcb283041b2f494263a8ae7d676b
-  data.tar.gz: f39619bf83fd32fd6ac4d2792034ba4bb00252ff
+  metadata.gz: 532a6370b781a38bbf29a2a1d4a620d7f1a87234
+  data.tar.gz: a51e243d328a03bbccda27efdf201868ad58419f
 SHA512:
-  metadata.gz: 5fa6a74c95ebfe2e1e519907fbb407bb7d22bd902e4e275f72c8543000037a3fc71e20e52f51ebaddc91977167cd11ea576d8f42cce8361bae99b0b3ed476858
-  data.tar.gz: e19c14beb4ec462fa29b8d992a190e1f4da78f48704a8dce757ba3fcd297dbb7433d9f715c976bf6ea822372c6d23f718e876f16a4d525d5707c9052d432b0f7
+  metadata.gz: 7c125c82afd450d8a492e126ea6da705a78e6d7a92901ed473244d21854059a0d636eac67398ed7924c7f3457dec7e014bfda75a3d7f3411e7d318c6d4a42de8
+  data.tar.gz: 2bedd9500eb8598a0dc5893efdfc85946324f9ebdb6936f35eb29191a27afd50290d56a6eccffa539d894f178a40990e9350014b64b615e70baa2e5f553ebbc9

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

@@ -9,7 +9,6 @@
 @import 'mixins/container';
 
 // Extends
-@import 'extends/clearfix';
 @import 'extends/hide-text';
 
 // Typography and Elements

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

@@ -8,3 +8,26 @@
   margin-left: auto;
   margin-right: auto;
 }
+
+
+//buttons
+.button{
+	@include button;
+}
+.button-positive{
+	@include button-positive;
+}
+
+.button-positive.type2{
+	@include button-positive-style2;
+}
+
+.button-negative{
+	@include button-negative(#000);
+	margin-left:30px;
+}
+
+.button-negative.type2{
+	@include button-negative-style2;
+	float:right;
+}

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

@@ -50,6 +50,7 @@
   height: $height;
   line-height: $height;
   font-weight: bold;
+  font: inherit;
   text-align: center;
   padding: 0;
   cursor: pointer;
@@ -64,7 +65,7 @@
   }
 }
 
-@mixin button($size: 18px, $side: left, $weight: bold){
+@mixin button($size: 18px, $side: left, $weight: normal){
   float: $side;
   font-size: $size;
   border-radius: 5px;
@@ -73,11 +74,14 @@
   cursor: pointer;
   min-width: 100px;
   text-align: center;
+  outline: none;
+  width: auto;
 }
 
 @mixin button-negative($color: #fff, $background: transparent) {
   background:$background;
   color: $color;
+  font-weight: bold;
   text-decoration: underline;
     
   &:hover{
@@ -103,12 +107,12 @@
   text-transform: uppercase;
   width: auto;
   color: $color;
-  font-weight: bold;
   border: none;
   background: url(/assets/login-more-than-014c2c6912a50421788390500c53ba65.png) no-repeat scroll right center transparent;
 
-  &:hover{
+  &:hover, &:focus{
     color: $hover-color;
+    border: none; 
   }
 }
 
@@ -119,6 +123,7 @@
   color: $color;
   font-weight: bold;
   border: none;
+  text-decoration: none;
 
   &:hover{
     color: $hover-color;

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

@@ -10,8 +10,6 @@
 // from here we can push other styling attributes for each other page
 
 body{
-	font-family: $primaryFontFamily;
-
 	.notification{
 		z-index: 4;
 		.flash-error, .flash-notice{
@@ -22,29 +20,6 @@ body{
 		z-index: 3;
 	}
 	.content{
-		.button{
-    	  @include button;
-    	  width: auto;
-  	    }
-
-		.button.button-positive{
-  		  @include button-positive;
-		}
-
-		.button.button-negative{
-  		  @include button-negative(#444);
-		}
-
-		.button.button-positive.type2{
-		  @include button-positive-style2;
-		}
-
-        .button.button-negative.type2{
-          @include button-negative-style2;
-          float: right;
-          text-decoration: none;
-        }
-
 		z-index: 2;
 		@include clearfix;
 		.container{
@@ -86,7 +61,7 @@ body#main {
   section.header {
     .logo {
       @include outer-container;
-      padding: 80px 0;
+      padding: 50px 0;
       img {
         width: 400px;
       }

data/app/assets/stylesheets/custom/components/forms/_forgot_pass.scss

@@ -7,12 +7,16 @@
   box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.46);
   background-repeat: round;
 
-  .title{
-    @include span-columns(4);
-    @include shift(5);
-    @include pad(10px);
-    color: #fff;
-    text-transform: uppercase;
+  .title-wrapper{
+    @include outer-container;
+
+    .title{
+      @include span-columns(8);
+      @include shift(4);
+      @include pad(10px 0);
+      color: #fff;
+      text-transform: uppercase;
+    }
   }
 
   #new_user{

data/app/assets/stylesheets/custom/components/forms/_pass_reset.scss

@@ -7,15 +7,19 @@
   box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.46);
   background-repeat: round;
 
-  .title, .info{
-    @include span-columns(4);
-    @include shift(5);
-    @include pad(5px 10px);
-    color: #fff;
-  }
+  .title-wrapper{
+    @include outer-container;
+
+    .title, .info{
+      @include span-columns(8);
+      @include shift(4);
+      @include pad(5px 0);
+      color: #fff;
+    }
 
-  .title, .label{
-    text-transform: uppercase;
+    .title, .label{
+      text-transform: uppercase;
+    }
   }
 
   #reset_password_form{

data/app/assets/stylesheets/custom/components/forms/_registration_and_edit.scss

@@ -1,9 +1,11 @@
 .registration-wrapper, .update-wrapper{
-	@include outer-container;
+	@include span-columns(12);
+	@include shift(2);
 	@include pad(20px 0);
 
 	background-color: $container_color_3;
 	color: $light_blue;
+	box-shadow: 0 0 12px 1px #1F1F1F;
 
 	form{
 		@include row;
@@ -25,6 +27,7 @@
 		@include pad(10px 0);
 
 		margin-top: 15px;
+		border: solid 1px #B6B6B6;	
 	}
 
 	.fieldset-child-legend{

data/app/assets/stylesheets/custom/components/related/_body.scss

@@ -0,0 +1,3 @@
+body{
+	font-family: $primaryFontFamily;
+}

data/lib/waterfall_bourbon_neat_rails/version.rb

@@ -1,3 +1,3 @@
 module WaterfallBourbonNeatRails
-  VERSION = "1.2.5".freeze
+  VERSION = "1.2.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waterfall_bourbon_neat_rails
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.7
 platform: ruby
 authors:
 - Waterfall Software Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -257,8 +257,6 @@ files:
 - app/assets/stylesheets/base/_lists.scss
 - app/assets/stylesheets/base/_typography.scss
 - app/assets/stylesheets/base/_variables.scss
-- app/assets/stylesheets/base/extends/_button.scss
-- app/assets/stylesheets/base/extends/_clearfix.scss
 - app/assets/stylesheets/base/extends/_hide-text.scss
 - app/assets/stylesheets/base/mixins/_container.scss
 - app/assets/stylesheets/base/mixins/_flash.scss

data/app/assets/stylesheets/base/extends/_button.scss

@@ -1,17 +0,0 @@
-%button {
-  -webkit-font-smoothing: antialiased;
-  background-color: $base-button-color;
-  border-radius: $base-border-radius;
-  color: white;
-  display: inline-block;
-  font-size: $base-font-size;
-  font-weight: bold;
-  line-height: 1;
-  padding: .75em 1em;
-  text-decoration: none;
-
-  &:hover {
-    background-color: $hover-button-color;
-    color: white;
-  }
-}

data/app/assets/stylesheets/base/extends/_clearfix.scss

@@ -1,3 +0,0 @@
-%clearfix {
-  @include clearfix;
-}