Merge lp:~whosdaz/win2buntu/dev into lp:win2buntu

[Matthew Allen]

[Matthew Allen (whosdaz)]

review: Approve

=== added file 'css/buttons.css'
--- css/buttons.css	1970-01-01 00:00:00 +0000
+++ css/buttons.css	2016-01-29 04:35:47 +0000
@@ -0,0 +1,11 @@
+.button-next {
+	width: 300px;
+	height: 25px;
+	float:right;
+}
+
+.button-back {
+	width: 300px;
+	height: 25px;
+	float:left;
+}
 \ No newline at end of file
 
=== modified file 'css/terminal.css'
--- css/terminal.css	2016-01-29 03:36:00 +0000
+++ css/terminal.css	2016-01-29 04:35:47 +0000
@@ -1,5 +1,7 @@
 .terminal {
 	color: #AEA79F;
+	 overflow-y: scroll;
+	 height: 500px;
 }
 
 .terminal-header {
 
=== modified file 'index.html'
--- index.html	2016-01-29 03:36:00 +0000
+++ index.html	2016-01-29 04:35:47 +0000
@@ -5,7 +5,9 @@
 
 		<link rel="stylesheet" type="text/css" href="css/default.css">
 		<link rel="stylesheet" type="text/css" href="css/terminal.css">
-
+		<link rel="stylesheet" type="text/css" href="css/buttons.css">
+		
+		<link rel="stylesheet" type="text/css" media="all" href="http://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css"/>
 		<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">
 	</head>
 
@@ -35,6 +37,10 @@
 					<p class="terminal-comment"> /* do this thing */</p>
 				</div>
 			</div> 
+			<div class="buttons">
+				<button class="button-back" type="button">Previous</button>
+				<button class="button-next" type="button">Next</button>
+			</div>
 		</div>
 	</body>
 </html>
 \ No newline at end of file