merge base line grid update

Daemonite · Jul 3, 2015 · d1f62bb · d1f62bb
2 parents 36f24d2 + 0181bef
commit d1f62bb
Show file tree

Hide file tree

Showing 62 changed files with 1,381 additions and 1,060 deletions.
diff --git a/css/base.css b/css/base.css
diff --git a/css/base.min.css b/css/base.min.css
diff --git a/index.html b/index.html
@@ -47,7 +47,7 @@
 			<li>
 				<a data-toggle="menu" href="#profile">
 					<span class="access-hide">John Smith</span>
-					<span class="avatar avatar-sm"><img alt="alt text for John Smith avatar" src="images/users/avatar-001.jpg"></span>
+					<span class="avatar"><img alt="alt text for John Smith avatar" src="images/users/avatar-001.jpg"></span>
 				</a>
 			</li>
 		</ul>
@@ -175,10 +175,10 @@ <h1 class="heading">Material</h1>
 				</div>
 			</div>
 		</div>
-		<div class="content-inner">
-			<div class="container">
-				<div class="row">
-					<div class="col-lg-6 col-lg-push-3 col-sm-10 col-sm-push-1">
+		<div class="container">
+			<div class="row">
+				<div class="col-lg-6 col-lg-push-3 col-sm-10 col-sm-push-1">
+					<section class="content-inner">
 						<p>Material is an HTML5 UI design based on Google Material.</p>
 						<blockquote>
 							<p>A visual language for our users that synthesizes the classic principles of good design with the innovation and possibility of technology and science. This is material design.</p>
@@ -284,7 +284,7 @@ <h2 class="content-sub-heading">Sample Pages</h2>
 								</div>
 							</a>
 						</div>
-					</div>
+					</section>
 				</div>
 			</div>
 		</div>

diff --git a/js/base.js b/js/base.js
diff --git a/js/base.min.js b/js/base.min.js
diff --git a/js/src/footer.js b/js/src/footer.js
@@ -1,6 +1,6 @@
 // footer push
 	footerPush = function () {
 		if ($('.footer').length) {
-			$('body').css('margin-bottom', $('.footer').outerHeight());
+			$('body').css('padding-bottom', $('.footer').outerHeight());
 		};
 	}
diff --git a/js/src/wave.js b/js/src/wave.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "material",
-  "version": "0.1.1",
+  "version": "1.1.0",
   "repository": "https://github.com/Daemonite/material.git",
   "devDependencies": {
     "autoprefixer-core": "^5.2.1",

diff --git a/page-404.html b/page-404.html
@@ -47,7 +47,7 @@
 			<li>
 				<a data-toggle="menu" href="#profile">
 					<span class="access-hide">John Smith</span>
-					<span class="avatar avatar-sm"><img alt="alt text for John Smith avatar" src="images/users/avatar-001.jpg"></span>
+					<span class="avatar"><img alt="alt text for John Smith avatar" src="images/users/avatar-001.jpg"></span>
 				</a>
 			</li>
 		</ul>
@@ -171,13 +171,13 @@
 				<h1 class="heading">404!</h1>
 			</div>
 		</div>
-		<div class="content-inner">
-			<div class="container">
-				<div class="row">
-					<div class="col-lg-8 col-md-10">
+		<div class="container">
+			<div class="row">
+				<div class="col-lg-8 col-md-10">
+					<section class="content-inner">
 						<h2 class="content-sub-heading">Oops! Something went wrong...</h2>
 						<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur in massa vitae nisl hendrerit sollicitudin at vel purus. Quisque leo est, posuere a dignissim id, posuere non quam. Nulla dapibus quis leo eu pulvinar. Phasellus ultrices condimentum dolor, non condimentum nibh. Curabitur tempor sollicitudin eros vitae posuere.</p>
-					</div>
+					</section>
 				</div>
 			</div>
 		</div>