Merge branch 'maerduq/tweaks'

maerduq · Oct 29, 2015 · e05b2c6 · e05b2c6
2 parents 7a0444f + 8a746bc
commit e05b2c6
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 3 deletions.
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
diff --git a/dist/css/bootstrap.css.map b/dist/css/bootstrap.css.map
diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/dist/css/bootstrap.min.css.map b/dist/css/bootstrap.min.css.map
diff --git a/examples/vertical-align/index.html b/examples/vertical-align/index.html
@@ -0,0 +1,40 @@
+
+<!DOCTYPE html>
+<html lang="en" class="vertical-align-middle">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+        <meta name="description" content="">
+        <meta name="author" content="">
+
+        <title>Theme Template for Bootstrap</title>
+
+        <!-- Bootstrap core CSS -->
+        <link href="../../dist/css/bootstrap.css" rel="stylesheet">
+
+    </head>
+
+    <body role="document">
+		<div class="table-row">
+			<section>
+				<div class="container text-center">
+					<h1>Part 1</h1>
+				</div>
+			</section>
+		</div>
+		<div class="table-row">
+			<section>
+				<div class="container text-center">
+					<h1>Part 2</h1>
+				</div>
+			</section>
+		</div>
+        <!-- Bootstrap core JavaScript
+        ================================================== -->
+        <!-- Placed at the end of the document so the pages load faster -->
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+        <script src="../../dist/js/bootstrap.js"></script>
+    </body>
+</html>
diff --git a/less/bootstrap.less b/less/bootstrap.less
@@ -22,6 +22,8 @@
 @import "forms.less";
 @import "buttons.less";
 
+@import "custom/vertical-align.less";
+
 // Components
 @import "component-animations.less";
 @import "dropdowns.less";

diff --git a/less/custom/vertical-align.less b/less/custom/vertical-align.less
@@ -0,0 +1,18 @@
+html.vertical-align-middle {
+    width: 100%;
+    height: 100%;
+	body {
+		display: table;
+		width: 100%;
+		height: 100%;
+		.table-row {
+			display: table-row;
+		}
+		.table-row > section, > section {
+			display: table-cell;
+			vertical-align: middle;
+			padding-top:20px;
+			padding-bottom:70px;
+		}
+	}
+}