Merge branch 'master' of https://github.com/gogits/gogs

Conflicts:
	routers/repo/download.go

6 files changed, 416 insertions, 12 deletions

diff --git a/public/less/_base.less b/public/less/_base.less
index 5f22bc32..fd0b168b 100644
--- a/public/less/_base.less
+++ b/public/less/_base.less
@@ -2,7 +2,10 @@
  
 body {
 	font-family: 'Helvetica Neue',Arial,Helvetica,sans-serif,'微软雅黑';
-	background-color: #FFFFFF;
+	background-color: #FAFAFA;
+}
+img {
+	border-radius: 3px;
 }
 .full.height {
 	padding: 0;
@@ -15,10 +18,13 @@ body {
 	width: 100%;
 	padding: 0.7em 0;
 	&.light {
-		background-color: #FFFFFF;
+		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;
 	}
@@ -26,12 +32,42 @@ body {
 		float: left;
 		margin-right: 5px;
 	}
+	.head.link.item {
+		padding-right: 0!important;
+		.dropdown.icon,
+		.menu .octicon {
+			margin-right: 5px;
+		}
+	}
+	.user.avatar {
+		padding: 0;
+		margin-top: 1px;
+	}
 	.searchbox {
   	background-color: rgb(244, 244, 244)!important;
   	&:focus {
   		background-color: rgb(233, 233, 233)!important;
   	}
 	}
+	.octicon {
+    width: 16px;
+    opacity: 1!important;
+    text-align: center;
+  }
+}
+.ui {
+	&.left {
+		float: left;
+	}
+	&.right {
+		float: right;
+	}
+
+	.text {
+		&.red {
+			color: #d95c5c!important;
+		}
+	}
 }
 footer {
 	margin-top: @footer-margin!important;
@@ -40,19 +76,14 @@ footer {
 	clear: both;
 	width: 100%;
 	color: #888888;
-	.ui {
-		&.left {
-			float: left;
-		}
-		&.right {
-			float: right;
-		}
-	}
 	.fa {
 		width: 16px;
   	text-align: center;
   	color: #428bca;
 	}
+	.ui.language.dropdown {
+		z-index: 10000;
+	}
 	.links >* {
 		border-left: 1px solid #d6d6d6;
 		padding-left: 8px;
@@ -62,6 +93,18 @@ footer {
 		}
 	}
 }
+
+.hide {
+	display: none;
+}
+.center {
+	text-align: center;
+}
+
+.text-error {
+	color: #d95c5c !important;
+}
+
 .generate-img(16);
 .generate-img(@n, @i: 1) when (@i =< @n) {
   .img-@{i} {
diff --git a/public/less/_form.less b/public/less/_form.less
new file mode 100644
index 00000000..e219637d
--- /dev/null
+++ b/public/less/_form.less
@@ -0,0 +1,50 @@
+.form {
+	.help {
+		color: #999999;
+	  padding-top: .6em;
+	  padding-bottom: .6em;
+	  display: inline-block;
+	}
+}
+.ui.attached.header {
+	background: #f0f0f0;
+	.right {
+		margin-top: -5px;
+	}
+}
+.repository.new.fork {
+	form {
+		margin: auto;
+		width: 800px!important;
+		.ui.message {
+			text-align: center;
+		}
+		@input-padding: 250px !important;
+		.header {
+			padding-left: @input-padding+20px;
+		}
+		.inline.field > label {
+			text-align: right;
+			width: @input-padding;
+			word-wrap: break-word;
+		}
+		.help {
+			margin-left: @input-padding+10px;
+		}
+		.dropdown {
+			.dropdown.icon {
+				margin-top: -7px!important;
+			}
+			.text {
+				margin-right: 0!important;
+				i {
+					margin-right: 0!important;
+				}
+			}
+		}
+		input,
+		textarea {
+			width: 50%!important;
+		}
+	}
+}
\ No newline at end of file
diff --git a/public/less/_home.less b/public/less/_home.less
index 14517fa9..93df7b19 100644
--- a/public/less/_home.less
+++ b/public/less/_home.less
@@ -1,5 +1,5 @@
 .home {
-	padding-bottom: @footer-margin * 2;
+	padding-bottom: @footer-margin * 3;
 	.logo {
 		max-width: 250px;
 	}
diff --git a/public/less/_install.less b/public/less/_install.less
new file mode 100644
index 00000000..ffc53252
--- /dev/null
+++ b/public/less/_install.less
@@ -0,0 +1,30 @@
+.install {
+	padding-top: 45px;
+	padding-bottom: @footer-margin * 3;
+	form {
+		label {
+			text-align: right;
+			width: 40% !important;
+		}
+		input {
+			width: 35% !important;
+		}
+		.field {
+			text-align: left;
+			.help {
+				margin-left: 41%;
+			}
+			&.optional .title {
+				margin-left: 38%;
+			}
+		}
+	}
+	.ui {
+		.checkbox {
+			margin-left: 40% !important;
+			label {
+				width: auto !important;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/public/less/_repository.less b/public/less/_repository.less
new file mode 100644
index 00000000..bdea35c0
--- /dev/null
+++ b/public/less/_repository.less
@@ -0,0 +1,278 @@
+.repository {
+	@mega-octicon-width: 30px;
+
+	padding-top: 15px;
+	padding-bottom: @footer-margin * 3;
+	.head {
+		height: 75px;
+		padding-top: 20px;
+		background-color: #FCFCFC;
+		.mega-octicon {
+			width: @mega-octicon-width;
+		}
+		a,
+		.fork-flag {
+			font-weight: 300;
+		}
+		.ui.label {
+			margin-top: 5px;
+			vertical-align: top;
+		}
+		.fork-flag {
+			margin-left: @mega-octicon-width + 8px;
+			display: block;
+			font-size: 11px;
+			line-height: 10px;
+			white-space: nowrap;
+		}
+		.button {
+			margin-left: 10px;
+			i {
+				margin-right: 5px;
+			}
+		}
+		.num {
+			font-weight: bold;
+		}
+		.octicon {
+			height: 5px;
+		}
+	}
+	.navbar {
+		height: 60px;
+		padding-top: 20px;
+		.ui.secondary.menu .item {
+			margin-left: -10px;
+			margin-top: -7px;
+			&>.input {
+				.new-label-input,
+				.color-picker {
+					background-color: white;
+					border: 1px solid rgba(0,0,0,.15);
+				}
+			}
+			&.input {
+				margin-right: -7px;
+			}
+			.new-label-input {
+				width: 150px;
+			}
+			.color-picker {
+				height: 35px;
+				width: auto;
+				padding-left: 30px;
+			}
+			.minicolors-swatch.minicolors-sprite {
+				top: 10px;
+				left: 10px;
+				width: 15px;
+				height: 15px;
+			}
+			&.precolors {
+				padding-left: 0;
+				padding-right: 0;
+				margin-right: 10px;
+				width: 120px;
+				.color {
+					float: left;
+					width: 15px;
+					height: 15px;
+				}
+			}
+		}
+	}
+	.filter.menu {
+		.label.color {
+			margin-left: 17px;
+			padding: 0 8px;
+		}
+		.octicon {
+			float: left;
+			margin-left: -5px;
+			margin-right: -7px;
+		}
+		.menu {
+			max-height: 300px;
+			overflow-x: auto;
+		  right: 0!important;
+  		left: auto!important;
+  		.clickable .name {
+  			padding-left: 15px!important;
+  		}
+		}
+	}
+
+	.page.buttons {
+		padding-top: 15px;
+	}
+	.issue.list {
+		clear: both;
+		list-style: none;
+		>.item {
+			padding-top: 15px;
+			padding-bottom: 10px;
+			border-bottom: 1px dashed #AAA;
+			.title {
+				color: #444;
+				font-size: 15px;
+				font-weight: bold;
+				margin: 0 6px;
+				&:hover {
+					color: #000;
+				}
+			}
+			.comment {
+				padding-right: 10px;
+				color: #666;
+			}
+			.desc {
+				padding-top: 5px;
+				color: #999;
+				a.milestone {
+					padding-left: 5px;
+					color: #999!important;
+					&:hover {
+						color: #000!important;
+					}
+				}
+			}
+		}
+	}
+
+	.label.list {
+		clear: both;
+		list-style: none;
+		.item {
+			padding-top: 10px;
+			padding-bottom: 10px;
+			border-bottom: 1px dashed #AAA;
+			a {
+				font-size: 15px;
+				padding-top: 5px;
+				padding-right: 10px;
+				color: #666;
+				&:hover {
+					color: #000;
+				}
+				&.open-issues {
+					margin-right: 30px;
+				}
+			}
+		}
+	}
+
+	.milestone.list {
+		clear: both;
+		list-style: none;
+		> .item {
+			padding-top: 10px;
+			padding-bottom: 10px;
+			border-bottom: 1px dashed #AAA;
+			> a {
+				padding-top: 5px;
+				padding-right: 10px;
+				color: #000;
+				&:hover {
+					color: #4078c0;
+				}
+			}
+			.ui.progress {
+				width: 40%;
+				padding: 0;
+				border: 0;
+				margin: 0;
+				.bar {
+					height: 20px;
+				}
+			}
+			.meta {
+				color: #999;
+				padding-top: 5px;
+				.issue-stats .octicon{
+					padding-left: 5px;
+				}
+				.overdue {
+					color: red;
+				}
+			}
+			.operate {
+				margin-top: -15px;
+				> a {
+					font-size: 15px;
+					padding-top: 5px;
+					padding-right: 10px;
+					color: #666;
+					&:hover {
+						color: #000;
+					}
+				}
+			}
+			.content {
+				padding-top: 10px;
+			}
+		}
+	}
+	&.new.milestone {
+		textarea {
+			height: 200px;
+		}
+	}
+
+	&.settings {
+		.content {
+			padding-left: 20px!important;
+		}
+	}
+}
+
+.settings .key.list {
+	.item:not(:first-child) {
+		border-top: 1px solid #eaeaea;
+	}
+	.ssh-key-state-indicator {
+		float: left;
+		color: gray;
+		padding-left: 10px;
+    padding-top: 10px;
+    &.active {
+    	color: #6cc644;
+    }
+	}
+	.meta {
+		padding-top: 5px;
+	}
+	.print {
+		color: #767676;
+	}
+	.activity {
+		color: #666;
+	}
+}
+
+.edit-label.modal {
+	.color-picker {
+		margin-top: -8px!important;
+		height: 35px;
+		width: auto!important;
+		padding-left: 30px!important;
+	}
+	.minicolors-swatch.minicolors-sprite {
+		top: 1px;
+		left: 10px;
+		width: 15px;
+		height: 15px;
+	}
+	.precolors {
+		margin-bottom: -11px!important;
+		padding-left: 0!important;
+		padding-right: 0!important;
+		margin-right: 10px!important;
+		width: 120px!important;
+		.color {
+			float: left;
+			margin: 0!important;
+			width: 15px;
+			height: 15px;
+		}
+	}
+}
\ No newline at end of file
diff --git a/public/less/gogs.less b/public/less/gogs.less
index d4d8f846..28ad7c63 100644
--- a/public/less/gogs.less
+++ b/public/less/gogs.less
@@ -1,3 +1,6 @@
 @import "_octicons";
 @import "_base";
-@import "_home";
\ No newline at end of file
+@import "_home";
+@import "_install";
+@import "_form";
+@import "_repository";
\ No newline at end of file