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

# Conflicts:
#	public/css/gogs.min.css

2 files changed, 28 insertions, 12 deletions

diff --git a/public/less/_base.less b/public/less/_base.less
index 388160a565..ba7163346b 100644
--- a/public/less/_base.less
+++ b/public/less/_base.less
@@ -38,6 +38,9 @@ img {
 	.top.menu a.item:hover {
 		color: rgba(0,0,0,.45);
 	}
+	.top.menu .menu {
+		z-index: 900;
+	}
 	.head.link.item {
 		padding-right: 0!important;
 		.dropdown.icon,
@@ -74,12 +77,21 @@ img {
 		&.right {
 			text-align: right;
 		}
+		&.small {
+			font-size: 0.75em;
+		}
 	}
 
 	.message {
 		text-align: center;
 	}
+
+	.header > i + .content {
+		padding-left: 0.75rem;
+		vertical-align: middle;
+	}
 }
+
 footer {
 	margin-top: @footer-margin!important;
 	height: @footer-margin;
@@ -125,7 +137,8 @@ footer {
   .generate-img(@n, (@i + 1));
 }
 
-.octicon.icon {
+.octicon.icon,
+.mega-octicon.icon {
 	font-family: octicons;
 }
 
diff --git a/public/less/_repository.less b/public/less/_repository.less
index 9372ee4d95..f8f39421a8 100644
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -3,20 +3,25 @@
 
 	padding-top: 15px;
 	padding-bottom: @footer-margin * 3;
+
 	.head {
-		height: 40px;
-		background-color: #FCFCFC;
+		.column {
+			padding-top: 5px!important;
+			padding-bottom: 5px!important;
+		}
+		.ui.compact.menu {
+			margin-left: 1rem;
+		}
+		.ui.header {
+			margin-top: 0;
+		}
 		.mega-octicon {
 			width: @mega-octicon-width;
 			font-size: 30px;
 		}
-		a,
-		.fork-flag {
+		.ui.huge.breadcrumb {
 			font-weight: 300;
-		}
-		.ui.label {
-			margin-top: 5px;
-			vertical-align: top;
+			font-size: 1.7rem;
 		}
 		.fork-flag {
 			margin-left: @mega-octicon-width + 8px;
@@ -25,10 +30,8 @@
 			line-height: 10px;
 			white-space: nowrap;
 		}
-		.num {
-			font-weight: bold;
-		}
 	}
+
 	.metas {
 		.menu {
 			max-height: 300px;