1 files changed, 78 insertions, 26 deletions

diff --git a/data/css/style.css b/data/css/style.css
index 435721073..1ee0cbfb9 100644
--- a/data/css/style.css
+++ b/data/css/style.css
@@ -1,3 +1,67 @@
+.form-signin input[type="text"] {
+	margin-bottom: -1px;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+}
+
+.form-signin input[type="password"] {
+	margin-bottom: 10px;
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
+}
+
+.form-signin a,
+.form-signin a:visited,
+.form-signin a:active {
+	color: inherit !important;
+}
+
+.login-page {
+	max-width: 300px;
+}
+
+.divider {
+	height:50px;
+	margin:0 9px;
+	border-left:1px solid #e1e1e1;
+}
+@media (max-width: 768px) {
+	.dont-float {
+		float: left;
+		margin-top: 0;
+		margin-bottom: 0;
+	}
+	.dont-float > li {
+		float: left;
+	}
+	.dont-float > li > a {
+		padding-top: 15px;
+		padding-bottom: 15px;
+	}
+	.dont-float:first-child {
+		margin-left: 0px;
+	}
+	.dont-float.navbar-right:last-child {
+		margin-right: -15px;
+	}
+}
+
+.nav-history {
+	margin-bottom: 1em;
+}
+
+.navbar-paste {
+	margin-bottom: 0;
+}
+
+.inline-input {
+	width: 200px;
+}
+
+.navbar-nav > li > .dropdown-menu {
+	margin-top: 2px;
+}
+
 .anchor {
 	visibility: hidden;
 	padding-top: 20px;
@@ -5,37 +69,35 @@
 }
 
 @media (max-width: 767px) {
-	.navbar-static-top {
-		margin-left: 0;
-		margin-right: 0;
+	.navbar-fixed-top {
+		position: relative;
 	}
 }
 
-@media (min-width: 980px) {
-	#navbar-height {
-		height: 60px;
-	}
-
+@media (min-width: 768px) {
 	.anchor {
 		visibility: hidden;
 		padding-top: 60px;
 		margin-top: -60px;
 	}
 
+	#navbar-height {
+		height: 70px;
+	}
 }
 
-.text-upload {
+textarea.text-upload {
 	height: 200px;
 }
 
 @media (min-height: 700px) {
-	.text-upload {
+	textarea.text-upload {
 		height: 300px;
 	}
 }
 
 @media (min-height: 800px) {
-	.text-upload {
+	textarea.text-upload {
 		height: 400px;
 	}
 }
@@ -64,7 +126,7 @@ code, pre, textarea {
 
 /* Sticky footer styles
  * Source: http://twitter.github.io/bootstrap/examples/sticky-footer.html
--------------------------------------------------- */
+ -------------------------------------------------- */
 .footer {
 	background-color: #f5f5f5;
 	border-top: 1px solid #e5e5e5;
@@ -86,12 +148,12 @@ body {
 	height: auto !important;
 	height: 100%;
 	/* Negative indent footer by it's height */
-	margin: 0 auto -81px;
+	margin: 0 auto -83px;
 }
 
 /* Set the fixed height of the footer here */
 #footer {
-	height: 50px;
+	height: 83px;
 	font-size: 12px;
 	padding: 15px 0;
 }
@@ -103,17 +165,7 @@ body {
 
 /* Set to footer height + 70px "padding" */
 #push {
-	height: 120px;
-}
-
-/* Lastly, apply responsive CSS fixes as necessary */
-@media (max-width: 767px) {
-	#footer {
-		margin-left: -20px;
-		margin-right: -20px;
-		padding-left: 20px;
-		padding-right: 20px;
-	}
+	height: 153px;
 }
 
 #footer p,
@@ -132,7 +184,7 @@ body {
 	padding-top: 40px;
 	background: #eee;
 	padding: 3px;
-	width: auto;
+	max-width: 100%;
 	margin-left: 20px;
 	margin-right: 20px;
 }