waterfall_bourbon_neat_rails 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9703493250511d11623cd76544c818541c767a23
-  data.tar.gz: 94303becf4df330f47ae654226bcd3e3a02e9c93
+  metadata.gz: a6873534e2fc27b18f31ffb00d0ca9e78e5c142a
+  data.tar.gz: 703007c3c545058b0e71b6821762e6183c2dfc12
 SHA512:
-  metadata.gz: 24f13fe1296deedea18deb5b3bcb699307cb515db41cf2ab2f0cf24c5c03617a327bacd68a258ddceaa22303531503d76de9ff604373e404dfac270f646ffaa1
-  data.tar.gz: 83c5b28ec4396e0b59efa6f80988c0177ac67c896b458a43f46bccc459b6b1aaa5c21fe21658d4386dc0f5ed518b7d41c5d48abbddcfeb3a4eb3849ae8c1b1d5
+  metadata.gz: 71e255a419b5e4a9a0e286a238352c4dfd002495e62cfc3356c71f1b38700569b60abe5acb22ac8a9d59a2a386486e61fb2bfc46adfc8e19e6058eb3b670f2a6
+  data.tar.gz: b089fcbb4e03cd4171a537e3f585d7e0ce2f884623600339da02df7d6e023f7e5024b7e18b87eae2354d791fd744b6b20bb6f515c177c7e5636dff4ca5e22295

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

@@ -23,16 +23,17 @@ body{
 	}
 	.content{
 		.button{
-    		@include button;
-  		}
+    	@include button;
+    	width: auto;
+  	}
 
-  		.button.button-positive{
-    		@include button-positive;
-  		}
+		.button.button-positive{
+  		@include button-positive;
+		}
 
-  		.button.button-negative{
-    		@include button-negative(#444);
-  		}
+		.button.button-negative{
+  		@include button-negative(#444);
+		}
 
 		z-index: 2;
 		@include clearfix;
@@ -150,130 +151,130 @@ body#main{
 				}
 			}
 		}
-		.registration_container{
-			@include outer-container;
-			@include pad(20px 0);	
+		// .registration_container{
+		// 	@include outer-container;
+		// 	@include pad(20px 0);	
 
-			form{
-				@include fill-parent;
+		// 	form{
+		// 		@include fill-parent;
 				
-				.field_container{
-					@include span-columns(14);
-					@include shift(1);
-					background-color: transparent;
+		// 		.field_container{
+		// 			@include span-columns(14);
+		// 			@include shift(1);
+		// 			background-color: transparent;
 					
-					legend{
-						@include font-attr(1.4em, $medium_blue, bold);
-					}
+		// 			legend{
+		// 				@include font-attr(1.4em, $medium_blue, bold);
+		// 			}
 					
-					fieldset{
-					  @include fill-parent;
-						@include pad(10px 0);
-						margin-top: 10px;
+		// 			fieldset{
+		// 			  @include fill-parent;
+		// 				@include pad(10px 0);
+		// 				margin-top: 10px;
 						
-						legend{
-							@include font-attr(1.2em, $medium_blue, bold);
-						}
+		// 				legend{
+		// 					@include font-attr(1.2em, $medium_blue, bold);
+		// 				}
 						
-						.form_inputs{
-						  @include span-columns(12 of 14);
-						  @include shift(1);
-						}
-					}
-				}
-
-				.form_inputs.acc_info, .form_inputs.acc_details{
+		// 				.form_inputs{
+		// 				  @include span-columns(12 of 14);
+		// 				  @include shift(1);
+		// 				}
+		// 			}
+		// 		}
+
+		// 		.form_inputs.acc_info, .form_inputs.acc_details{
 					
-					.left_column, .right_column{
-						@include span-columns(6 of 12);
-					}
-
-					.left_column{
-						.user_details_phone_number{
-							@include span-columns(4 of 6);
-						}
-						.user_details_phone_extension{
-							@include span-columns(2 of 6);
-							@include omega;
-						}
-					}
-
-					.right_column{
-						.logo_preview{
-							.img_container{
-							  @include border(solid, 1px, $light_blue);
-							  @include pad(5px);
-								height: 200px;
-								overflow: hidden;
-								box-shadow: 0 0 1px 1px;
-							}
-
-							.headshot{
-								max-width:200px;
-							}
-						}
-						.partner_state{
-							@include span-columns(2 of 6);
-
-							select{
-								height: 40px;
-								width: 100%;
-								margin-bottom: 0px;
-							}
-
-						}
-						.partner_zip_code{
-							@include span-columns(2 of 5);
-							@include omega;
-							padding-left: 10px;
-							label{
-								text-align: center;
-							}
-							input{
-								@include center;
-								width: 60px;
-							}
+		// 			.left_column, .right_column{
+		// 				@include span-columns(6 of 12);
+		// 			}
+
+		// 			.left_column{
+		// 				.user_details_phone_number{
+		// 					@include span-columns(4 of 6);
+		// 				}
+		// 				.user_details_phone_extension{
+		// 					@include span-columns(2 of 6);
+		// 					@include omega;
+		// 				}
+		// 			}
+
+		// 			.right_column{
+		// 				.logo_preview{
+		// 					.img_container{
+		// 					  @include border(solid, 1px, $light_blue);
+		// 					  @include pad(5px);
+		// 						height: 200px;
+		// 						overflow: hidden;
+		// 						box-shadow: 0 0 1px 1px;
+		// 					}
+
+		// 					.headshot{
+		// 						max-width:200px;
+		// 					}
+		// 				}
+		// 				.partner_state{
+		// 					@include span-columns(2 of 6);
+
+		// 					select{
+		// 						height: 40px;
+		// 						width: 100%;
+		// 						margin-bottom: 0px;
+		// 					}
+
+		// 				}
+		// 				.partner_zip_code{
+		// 					@include span-columns(2 of 5);
+		// 					@include omega;
+		// 					padding-left: 10px;
+		// 					label{
+		// 						text-align: center;
+		// 					}
+		// 					input{
+		// 						@include center;
+		// 						width: 60px;
+		// 					}
 							
-						}
-
-						#user_details_state{
-							width: 60px;
-							height: 38px;
-							margin-bottom: 0;
-						}
-
-						.upload_actions{
-							position: relative;
-							.upload_btn{
-								@include btn(#fff, 120px, 40px, 1em, $light_blue, #f7f7f7, $light_blue);
-								margin: 9px 0;
-							}
-							input{
-								display: none;
-							}
-						}
-					}
-				}
-				.form_actions{
-					@include span-columns(14);
-					@include shift(1);
-					@include clearfix;
+		// 				}
+
+		// 				#user_details_state{
+		// 					width: 60px;
+		// 					height: 38px;
+		// 					margin-bottom: 0;
+		// 				}
+
+		// 				.upload_actions{
+		// 					position: relative;
+		// 					.upload_btn{
+		// 						@include btn(#fff, 120px, 40px, 1em, $light_blue, #f7f7f7, $light_blue);
+		// 						margin: 9px 0;
+		// 					}
+		// 					input{
+		// 						display: none;
+		// 					}
+		// 				}
+		// 			}
+		// 		}
+		// 		.form_actions{
+		// 			@include span-columns(14);
+		// 			@include shift(1);
+		// 			@include clearfix;
 					
-					margin-top:20px;
-					color: $light_blue;
-
-					input{
-						float: left;
-					}
-					.btn_back{
-						float: right;
-					}				
-					input, .btn_back{
-						@include btn(#fff, 120px, 40px, 1em, $light_blue, transparent, $light_blue);
-					}
-				}
-			}
-		}
+		// 			margin-top:20px;
+		// 			color: $light_blue;
+
+		// 			input{
+		// 				float: left;
+		// 			}
+		// 			.btn_back{
+		// 				float: right;
+		// 			}				
+		// 			input, .btn_back{
+		// 				@include btn(#fff, 120px, 40px, 1em, $light_blue, transparent, $light_blue);
+		// 			}
+		// 		}
+		// 	}
+		// }
 	}
 }
 
@@ -329,14 +330,14 @@ body#landing-page{
 				}
 				
 				.url__item{
-          height: 40px;
-          
-          @include span-columns(6 of 8);
-          @include shift(1);
-          @include border(solid, 1px, $sky_blue);
-          @include border-radius;
-          @include pad(0 0 0 5px);
-        }
+		          height: 40px;
+		          
+		          @include span-columns(6 of 8);
+		          @include shift(1);
+		          @include border(solid, 1px, $sky_blue);
+		          @include border-radius;
+		          @include pad(0 0 0 5px);
+		        }
 			}
 
 			form{

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

@@ -22,7 +22,7 @@ $medium_red: #FF3030;
 
 $light_blue: #4f91cd; 
 $light_grey_op: rgba(240,240,240,0.6);
-$light_grey_op2: rgba(255, 255, 255, 0.91);
+$light_grey_op2: rgba(241, 241, 241, 0.91);
 
 $sky_blue: #A8C7E3;
 

data/app/assets/stylesheets/custom/components/_config.scss

@@ -2,7 +2,8 @@
 @import "table";
 @import "ajax_spinner";
 
-@import "form_v1";
+@import "forms/config";
+
 @import "captcha";
 @import "view_profile";
 

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

@@ -0,0 +1 @@
+@import "registration_and_edit";

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

@@ -0,0 +1,189 @@
+.registration-wrapper, .update-wrapper{
+	@include outer-container;
+	@include pad(20px 0);
+
+	background-color: $container_color_3;
+	color: $light_blue;
+
+	form{
+		@include row;
+	}
+
+	.fieldset-main{
+		@include span-columns(14);
+		@include shift(1);
+
+		background-color: transparent;
+	}
+
+	.fieldset-main-legend{
+		@include font-attr(20px, $medium_blue, bold);
+	}
+
+	.fieldset-child{
+		@include fill-parent;
+		@include pad(10px 0);
+
+		margin-top: 15px;
+	}
+
+	.fieldset-child-legend{
+		@include font-attr(17px, $medium_blue, bold);
+	}
+
+	.account-details, .account-info, .account-additional, .account-business-hours {
+		@include span-columns(12 of 14);
+		@include shift(1);
+	}
+
+	//account details section style
+	.account-details{
+		//
+	}
+
+	//account info section style
+	.account-info{
+
+		//general
+		.left-column, .right-column{
+			@include span-columns(6 of 12);
+		}
+
+		.user_details_phone_number{
+			@include span-columns(4 of 6);
+		}
+		.user_details_phone_extension{
+			@include span-columns(2 of 6);
+			@include omega;
+		}
+
+		.logo_preview{
+			.img_container{
+			  @include border(solid, 1px, $light_blue);
+			  @include pad(5px);
+				height: 200px;
+				overflow: hidden;
+				box-shadow: 0 0 1px 1px;
+			}
+
+			.headshot{
+				max-width:200px;
+			}
+		}
+
+		.partner_state{
+			@include span-columns(2 of 6);
+
+			select{
+				height: 40px;
+				width: 100%;
+				margin-bottom: 0px;
+			}
+		}
+
+		#user_details_state{
+			width: 60px;
+			height: 38px;
+			margin-bottom: 0;
+		}
+
+		.upload_actions{
+			position: relative;
+
+		.upload_btn{
+			@include btn(#fff, 120px, 40px, 1em, $light_blue, #f7f7f7, $light_blue);
+			margin: 9px 0;
+		}
+			input{
+				display: none;
+			}
+		}
+	}
+
+	//account additional info style
+	.account-additional{
+		//general
+		.left-column, .right-column{
+			@include span-columns(6 of 12);
+		}
+
+		.logo_preview{
+			.img_container{
+			  @include border(solid, 1px, $light_blue);
+			  @include pad(5px);
+				height: 200px;
+				overflow: hidden;
+				box-shadow: 0 0 1px 1px;
+			}
+
+			.headshot{
+				max-width:200px;
+			}
+		}
+
+		.upload_actions{
+			position: relative;
+
+			.upload_btn{
+				@include btn(#fff, 120px, 40px, 1em, $light_blue, #f7f7f7, $light_blue);
+				margin: 9px 0;
+			}
+			input{
+				display: none;
+			}
+		}
+	}
+
+	//account business hours section style
+	.account-business-hours{
+		.days{
+	  	@include span-columns(12);
+	  	@include shift(1);
+		}
+
+		.day{
+			@include span-columns(6 of 12);
+			@include omega;
+			margin: 10px 0;
+		}
+
+		.day-text{
+			@include span-columns(1 of 6);
+			font-weight: bold;
+		}
+
+		.day-hours{
+			@include span-columns(5 of 6);
+		}
+
+		.open-time, .close-time{
+			@include span-columns(2 of 6);
+			margin: 0 5px;
+			height: 40px;
+			float: left;
+			color: inherit;
+			text-align:center;
+		}
+
+		.divider{
+			display: block;
+			width: 20px;
+			text-align: center;
+			height: 40px;
+			line-height: 40px;
+			color: inherit;
+			float: left;
+			font-weight: bolder;
+		}
+	}
+
+	.form-actions{
+		@include span-columns(14);
+    @include shift(1);
+    @include pad(20px 0);
+
+    .button-negative{
+      margin-left:20px;
+    }
+	}
+}

data/app/assets/stylesheets/partials/_layout.scss

@@ -148,7 +148,7 @@ body {
 body#main {
   background: image-url('home-bg.jpg') no-repeat fixed center center / cover #383A3D;
   position: relative;
-  text-align: center;
+  // text-align: center;
   color:white;
 
   .header{
@@ -199,10 +199,4 @@ body#landing-page {
     clear: both;
     height: 0px;
   }
-
-  .logo {
-    float: left;
-    padding: 1% 0% 2% 3%;
-  }
-
 }

data/lib/waterfall_bourbon_neat_rails/version.rb

@@ -1,3 +1,3 @@
 module WaterfallBourbonNeatRails
-  VERSION = "1.1.1".freeze
+  VERSION = "1.1.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waterfall_bourbon_neat_rails
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Waterfall Software Inc.
@@ -249,10 +249,11 @@ files:
 - app/assets/stylesheets/custom/components/_captcha.scss
 - app/assets/stylesheets/custom/components/_chosen.scss
 - app/assets/stylesheets/custom/components/_config.scss
-- app/assets/stylesheets/custom/components/_form_v1.scss
 - app/assets/stylesheets/custom/components/_table.scss
 - app/assets/stylesheets/custom/components/_toolbar.scss
 - app/assets/stylesheets/custom/components/_view_profile.scss
+- app/assets/stylesheets/custom/components/forms/_config.scss
+- app/assets/stylesheets/custom/components/forms/_registration_and_edit.scss
 - app/assets/stylesheets/custom/rules.txt
 - app/assets/stylesheets/libs/jquery-ui-1.10.4.min.css
 - app/assets/stylesheets/libs/jquery.ui.timepicker.css

data/app/assets/stylesheets/custom/components/_form_v1.scss

@@ -1,43 +0,0 @@
-// .business-hours{
-	// @include span-columns(14);
-// }
-
-.days{
-  @include span-columns(12);
-  @include shift(1);
-}
-
-.day{
-	@include span-columns(6 of 12);
-	@include omega;
-	margin: 10px 0;
-}
-
-.day-text{
-	@include span-columns(1 of 6);
-	font-weight: bold;
-}
-
-.day-hours{
-	@include span-columns(5 of 6);
-}
-
-.open-time, .close-time{
-	@include span-columns(2 of 6);
-	margin: 0 5px;
-	height: 40px;
-	float: left;
-	color: inherit;
-	text-align:center;
-}
-
-.divider{
-	display: block;
-	width: 20px;
-	text-align: center;
-	height: 40px;
-	line-height: 40px;
-	color: inherit;
-	float: left;
-	font-weight: bolder;
-}