Merge pull request #391 from cfarquharson/master

Updates per Laurent

demos/grids/grid-other-eng.html

@@ -34,22 +34,6 @@
 <!--<![endif]-->
 
 <!-- CustomScriptsCSSStart -->
-<style type="text/css">
-.thermometer-0,.thermometer-10,.thermometer-20,.thermometer-30,.thermometer-40,.thermometer-50,.thermometer-60,.thermometer-70,.thermometer-80,.thermometer-90,.thermometer-100,.thermometer-110,.thermometer-120{padding-bottom:230px !important;background-repeat:no-repeat;background-position:center bottom;}
-.thermometer-0{background-image:url(../../build/grids/images/thermometer-0.gif);}
-.thermometer-10{background-image:url(../../build/grids/images/thermometer-10.gif);}
-.thermometer-20{background-image:url(../../build/grids/images/thermometer-20.gif);}
-.thermometer-30{background-image:url(../../build/grids/images/thermometer-30.gif);}
-.thermometer-40{background-image:url(../../build/grids/images/thermometer-40.gif);}
-.thermometer-50{background-image:url(../../build/grids/images/thermometer-50.gif);}
-.thermometer-60{background-image:url(../../build/grids/images/thermometer-60.gif);}
-.thermometer-70{background-image:url(../../build/grids/images/thermometer-70.gif);}
-.thermometer-80{background-image:url(../../build/grids/images/thermometer-80.gif);}
-.thermometer-90{background-image:url(../../build/grids/images/thermometer-90.gif);}
-.thermometer-100{background-image:url(../../build/grids/images/thermometer-100.gif);}
-.thermometer-110{background-image:url(../../build/grids/images/thermometer-110.gif);}
-.thermometer-120{background-image:url(../../build/grids/images/thermometer-120.gif);}
-</style>
 <!-- CustomScriptsCSSEnd -->
 </head>
 

src/grids/sass/includes/_border.scss

@@ -0,0 +1,41 @@
+@charset "utf-8";
+/*
+ * Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
+ * www.tbs.gc.ca/ws-nw/wet-boew/terms / www.sct.gc.ca/ws-nw/wet-boew/conditions
+*/
+
+.border-top,.border-right,.border-bottom,.border-left,.border-all {
+	display: inline;
+	float: left;
+	min-height:1px;
+	position: relative;
+	background-image: url(../images/border.gif);
+}
+
+.border-top, .border-bottom {
+	background-repeat: repeat-x;
+}
+
+.border-left, .border-right{
+	background-repeat: repeat-y;
+}
+
+.border-top {
+	background-position:0 0;
+}
+
+.border-bottom {
+	background-position:0 bottom;
+}
+
+.border-left {
+	background-position: left 0;
+}
+
+.border-right {
+	background-position: right 0;
+}
+.border-all {
+	outline: 1px solid #ccc;
+	background: none;
+}

src/grids/sass/includes/_color.scss

@@ -28,7 +28,7 @@
 
 	[class*="background-"] { 
 		#{headings(2,6)}, p {
-			margin: $margin-medium !important;
+			padding: $margin-medium !important;
 		}
 	}
 

src/grids/sass/includes/_form.scss

@@ -36,11 +36,11 @@
 			background: none;
 			@include colorize-border(lighten($light, 3%), "outline");
 			@include colorize-base(lighten($light, 3%));
+			padding-top: 10px;
 
 			& > * {
 				margin-left: 10px;
 				margin-right: 10px;
-				&:first-child { margin-top: 9px; }
 			}
 
 			#{headings(2,6)} {
@@ -69,7 +69,7 @@
 
 		border-style: solid;
 		border-width: 1px;
-		min-height: 18px;
+		min-height: 18px !important;
 		margin-top: 0;
 		margin-bottom: $margin-medium;
 		padding: $default-border-radius;
@@ -144,6 +144,15 @@
 		vertical-align: middle;
 		@include inline-block;
 	}
+	.form-radio.form-label-inline,.form-checkbox.form-label-inline	{
+		display:inline-block;
+		padding-top:5px;
+		margin-bottom:0;
+		vertical-align:middle;
+	}
+	.form-radio.form-label-inline + .form-radio.form-label-inline,.form-checkbox.form-label-inline + .form-checkbox.form-label-inline {
+		margin-left:10px;
+	}
 
 	.form-input-prepend, .form-input-append {
 
@@ -164,7 +173,7 @@
 			*min-width: auto;
 			padding: 4px; 
 			text-align: center;
-			vertical-align: middle;
+			vertical-align: top;
 
 			&:first-child { @include border-left-radius; margin-right: -1px; }
 			&:last-child { @include border-right-radius; margin-left: -1px; }

src/grids/sass/includes/_list.scss

@@ -81,6 +81,11 @@
 
 	ul.menu-horizontal {
 		@include horizontal-list(2px);
+		margin: 0 10px;
+
+		li {
+			margin-bottom: 5px;
+		}
 	}
 
 /*ul,dl,ol{margin:0 10px 10px 40px;padding:0;}

src/grids/sass/includes/_module.scss

@@ -164,9 +164,23 @@
 				padding: 0;
 			}
 		}
+
+		img { 
+				margin-bottom: 0; 
+		}
 	}
 
-	.module-poster img { margin-bottom: 0; }
+	.module-contact{
+		.clear {
+			border-top:1px solid #eee;
+			visibility:visible;
+			width:auto;
+		}
+
+		&[class*="span-"]{
+				margin-bottom:0 !important;
+		}
+	}
 
 	.module-news {
 
@@ -208,6 +222,18 @@
 				margin-right: 10px;
 			}
 		}
+
+		img{
+			width:100px;
+			height:62px;
+			float:left;
+			margin-left:10px;
+		}
+
+		& > * {
+			padding:10px;
+			margin:0;
+		}
 	}
 
 	.module-comment {