Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2

# Conflicts:
#	modules/bindata/bindata.go
#	public/css/gogs.min.css
#	templates/repo/header.tmpl

1 files changed, 27 insertions, 27 deletions

diff --git a/public/less/_base.less b/public/less/_base.less
index fd0b168b..0da54d97 100644
--- a/public/less/_base.less
+++ b/public/less/_base.less
@@ -9,27 +9,25 @@ img {
 }
 .full.height {
 	padding: 0;
-  margin: 0 0 -87px 0;
+  margin: 0 0 -@footer-margin*2 0;
   min-height: 100%;
 }
 .following.bar {
 	z-index: 900;
 	left: 0;
 	width: 100%;
-	padding: 0.7em 0;
+	padding: 5px 0;
 	&.light {
 		background-color: white;
 		border-bottom: 1px solid #DDDDDD;
 		box-shadow: 0 2px 3px rgba(0, 0, 0, 0.04);
 	}
-	.ui.secondary.menu {
-		height: 30px;
-	}
 	.column .menu {
 		margin-top: 0;
 	}
 	.brand {
 		float: left;
+		margin-top: 5px;
 		margin-right: 5px;
 	}
 	.head.link.item {
@@ -41,7 +39,6 @@ img {
 	}
 	.user.avatar {
 		padding: 0;
-		margin-top: 1px;
 	}
 	.searchbox {
   	background-color: rgb(244, 244, 244)!important;
@@ -51,7 +48,6 @@ img {
 	}
 	.octicon {
     width: 16px;
-    opacity: 1!important;
     text-align: center;
   }
 }
@@ -68,28 +64,36 @@ img {
 			color: #d95c5c!important;
 		}
 	}
+
+	.message {
+		text-align: center;
+	}
 }
 footer {
 	margin-top: @footer-margin!important;
+	height: @footer-margin;
 	background-color: white;
 	border-top: 1px solid #d6d6d6;
 	clear: both;
 	width: 100%;
 	color: #888888;
-	.fa {
-		width: 16px;
-  	text-align: center;
-  	color: #428bca;
-	}
-	.ui.language.dropdown {
-		z-index: 10000;
-	}
-	.links >* {
-		border-left: 1px solid #d6d6d6;
-		padding-left: 8px;
-		margin-left: 5px;
-		&:first-child {
-			border-left: none;
+	.container {
+		padding-top: 10px;
+		.fa {
+			width: 16px;
+	  	text-align: center;
+	  	color: #428bca;
+		}
+		.ui.language.dropdown {
+			z-index: 10000;
+		}
+		.links >* {
+			border-left: 1px solid #d6d6d6;
+			padding-left: 8px;
+			margin-left: 5px;
+			&:first-child {
+				border-left: none;
+			}
 		}
 	}
 }
@@ -101,15 +105,11 @@ footer {
 	text-align: center;
 }
 
-.text-error {
-	color: #d95c5c !important;
-}
-
 .generate-img(16);
 .generate-img(@n, @i: 1) when (@i =< @n) {
   .img-@{i} {
-    width: (2px * @i);
-    height: (2px * @i);
+    width: (2px * @i)!important;
+    height: (2px * @i)!important;
   }
   .generate-img(@n, (@i + 1));
 }