Merge branch 'dev' of github.com:gogits/gogs into dev

7 files changed, 215 insertions, 219 deletions

diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css
index 506479d0e7..16232542c0 100644
--- a/public/ng/css/gogs.css
+++ b/public/ng/css/gogs.css
@@ -1610,12 +1610,16 @@ The register and sign-in page style
   background-color: #FFF;
   border-color: #DDD;
 }
+.pr-title {
+  padding: 4px 0;
+}
 .pr-title .pr-num {
   font-weight: normal;
   color: #888;
 }
 .pr-meta {
   color: #888;
+  padding: 4px 0 8px 0;
 }
 .pr-meta .pr-author {
   margin: 0 8px;
@@ -1689,7 +1693,7 @@ The register and sign-in page style
 .issue-line,
 .issue-merge,
 .issue-add-comment {
-  margin-bottom: 16px;
+  margin-bottom: 24px;
 }
 .issue-comment .author-avatar img {
   margin-right: 12px;
@@ -1793,6 +1797,7 @@ textarea#issue-add-content {
   width: 100%;
   box-sizing: border-box;
   height: 120px;
+  resize: vertical;
 }
 .org-header-alert .alert {
   margin-top: 10px;
@@ -1827,7 +1832,11 @@ textarea#issue-add-content {
   color: #d9453d;
 }
 #org-header > div > .menu-line > li.right > a .octicon {
-  margin-right: 6px;
+  margin-right: 4px;
+}
+#org-header > div > .menu-line > li.right > a .label {
+  margin-left: 4px;
+  font-size: .6em;
 }
 #org-header > div > .menu-line > li.right .current {
   border-bottom: 2px solid #D26911;
diff --git a/public/ng/fonts/octicons.css b/public/ng/fonts/octicons.css
index 2d66bd6cf3..a5dcd153a8 100755
--- a/public/ng/fonts/octicons.css
+++ b/public/ng/fonts/octicons.css
@@ -14,22 +14,20 @@
 .mega-octicon is optimized for 32px but can be used larger.
 
 */
-.octicon {
-  font: normal normal 16px octicons;
-  line-height: 1;
-  display: inline-block;
-  text-decoration: none;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-.mega-octicon {
-  font: normal normal 32px octicons;
-  line-height: 1;
+.octicon, .mega-octicon {
+  font: normal normal normal 16px/1 octicons;
   display: inline-block;
   text-decoration: none;
+  text-rendering: auto;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
+.mega-octicon { font-size: 32px; }
+
 
 .octicon-alert:before { content: '\f02d'} /*  */
 .octicon-alignment-align:before { content: '\f08a'} /*  */
diff --git a/public/ng/fonts/octicons.eot b/public/ng/fonts/octicons.eot
index e4edc6e56d..22881a8b6c 100755
--- a/public/ng/fonts/octicons.eot
+++ b/public/ng/fonts/octicons.eot
diff --git a/public/ng/fonts/octicons.ttf b/public/ng/fonts/octicons.ttf
index b850701aea..189ca2813d 100755
--- a/public/ng/fonts/octicons.ttf
+++ b/public/ng/fonts/octicons.ttf
diff --git a/public/ng/fonts/octicons.woff b/public/ng/fonts/octicons.woff
index c1e76ab4a3..2b770e429f 100755
--- a/public/ng/fonts/octicons.woff
+++ b/public/ng/fonts/octicons.woff
diff --git a/public/ng/less/gogs/issue.less b/public/ng/less/gogs/issue.less
index ae481f0e20..a2209bcca9 100644
--- a/public/ng/less/gogs/issue.less
+++ b/public/ng/less/gogs/issue.less
@@ -1,19 +1,15 @@
 @import "../ui/var";
-
 .repo-issue-wrapper {
   padding: 18px 0;
 }
-
 .pr-main {
   padding-right: 40px;
   box-sizing: border-box;
 }
-
 .pr-sidebar {
   border-left: 1px solid #DDD;
   box-sizing: border-box;
 }
-
 #pr-sidebar-nav {
   margin-top: 6px;
   li {
@@ -39,16 +35,16 @@
     }
   }
 }
-
 .pr-title {
   .pr-num {
     font-weight: normal;
     color: #888;
   }
+  padding: 4px 0;
 }
-
 .pr-meta {
   color: #888;
+  padding: 4px 0 8px 0;
   .pr-author {
     margin: 0 8px;
     color: #444;
@@ -62,7 +58,6 @@
     padding: 4px 6px;
   }
 }
-
 .pr-nav {
   border-bottom: 1px solid #DDD;
   margin-top: 16px;
@@ -89,7 +84,6 @@
     }
   }
 }
-
 .diff-bar {
   .diff-add {
     color: @btnGreenColor;
@@ -114,26 +108,22 @@
     border-bottom-left-radius: .2em;
   }
 }
-
 #pr-commit,
 #pr-file-diff,
 #issue-add-comment-preview {
   display: none;
 }
-
 #pr-conversation-list {
   padding-right: 30px;
   box-sizing: border-box;
 }
-
 .issue-comment,
 .issue-commit,
 .issue-line,
 .issue-merge,
 .issue-add-comment {
-  margin-bottom: 16px;
+  margin-bottom: 24px;
 }
-
 .issue-comment {
   .author-avatar {
     img {
@@ -165,7 +155,6 @@
     }
   }
 }
-
 .issue-commit {
   line-height: 32px;
   i, .author-avatar img {
@@ -181,7 +170,6 @@
     line-height: 24px;
   }
 }
-
 .issue-merge {
   .ico {
     width: 40px;
@@ -202,7 +190,6 @@
     font-size: 13px;
   }
 }
-
 .issue-merge-ok {
   .ico {
     background-color: #65AD4E;
@@ -217,12 +204,10 @@
     color: darken(#65AD4E, 10%);
   }
 }
-
 .issue-line {
   height: 4px;
   background-color: #E6E6E6;
 }
-
 .issue-add-comment {
   .panel {
     margin-left: 60px;
@@ -254,9 +239,9 @@
     }
   }
 }
-
 textarea#issue-add-content {
   width: 100%;
   box-sizing: border-box;
   height: 120px;
+  resize: vertical;
 }
\ No newline at end of file
diff --git a/public/ng/less/gogs/organization.less b/public/ng/less/gogs/organization.less
index b6e31940a5..3bf11c8cee 100644
--- a/public/ng/less/gogs/organization.less
+++ b/public/ng/less/gogs/organization.less
@@ -1,229 +1,233 @@
 @import "../ui/var";
 .org-header-alert .alert {
-	margin-top: 10px;
+  margin-top: 10px;
 }
 .org-header {
-	padding: 16px 0;
-	background-color: #FFF;
-	border-bottom: 1px solid #DDD;
-	img {
-		padding-right: 10px;
-	}
+  padding: 16px 0;
+  background-color: #FFF;
+  border-bottom: 1px solid #DDD;
+  img {
+    padding-right: 10px;
+  }
 }
 #org-home-header {
-	min-height: 100px;
+  min-height: 100px;
 }
 #org-header {
-	height: 48px;
-	.org-name {
-		padding-left: 10px;
-		font-size: 1.4em;
-		height: 50px;
-		line-height: 50px;
-		margin-bottom: 0;
-	}
-	> div {
-		> .menu-line {
-			> li {
-				&.right {
-					> a {
-						font-size: 1.2em;
-						color: @dashboardHeaderLinkColor;
-						&:hover {
-							background-color: transparent;
-							color: @dashboardHeaderLinkHoverColor;
-						}
-						.octicon {
-							margin-right: 6px;
-						}
-					}
-					.current {
-						border-bottom: 2px solid #D26911;
-					}
-				}
-			}
-		}
-	}
+  height: 48px;
+  .org-name {
+    padding-left: 10px;
+    font-size: 1.4em;
+    height: 50px;
+    line-height: 50px;
+    margin-bottom: 0;
+  }
+  > div {
+    > .menu-line {
+      > li {
+        &.right {
+          > a {
+            font-size: 1.2em;
+            color: @dashboardHeaderLinkColor;
+            &:hover {
+              background-color: transparent;
+              color: @dashboardHeaderLinkHoverColor;
+            }
+            .octicon {
+              margin-right: 4px;
+            }
+            .label{
+              margin-left: 4px;
+              font-size: .6em;
+            }
+          }
+          .current {
+            border-bottom: 2px solid #D26911;
+          }
+        }
+      }
+    }
+  }
 }
 #org-home-header-info {
-	padding-top: 10px;
-	h2 {
-		font-size: 30px;
-	}
-	ul {
-		list-style: none;
-		li {
-		    float: left;
-			padding-right: 5px;
-		}
-	}
+  padding-top: 10px;
+  h2 {
+    font-size: 30px;
+  }
+  ul {
+    list-style: none;
+    li {
+      float: left;
+      padding-right: 5px;
+    }
+  }
 }
 #org-home-repo-list {
-	padding: 10px 0;
+  padding: 10px 0;
 }
 #org-repo-list {
-	padding: 10px 0;
-	.org-repo-item {
-		border-top: 1px solid #eee;
-		padding: 30px 20px;
-		.org-repo-status {
-			list-style: none;
-			color: #888;
-			li {
-				float: left;
-				margin-right: 6px;
-			}
-		}
-		h2 {
-			margin-bottom: 5px;
-		}
-		.org-repo-description {
-			margin: 0;
-			font-size: 14px;
-			color: #666;
-		}
-		.org-repo-updated {
-			font-size: 12px;
-			display: block;
-			margin: 5px 0 0;
-			color: #808080;
-		}
-	}
+  padding: 10px 0;
+  .org-repo-item {
+    border-top: 1px solid #eee;
+    padding: 30px 20px;
+    .org-repo-status {
+      list-style: none;
+      color: #888;
+      li {
+        float: left;
+        margin-right: 6px;
+      }
+    }
+    h2 {
+      margin-bottom: 5px;
+    }
+    .org-repo-description {
+      margin: 0;
+      font-size: 14px;
+      color: #666;
+    }
+    .org-repo-updated {
+      font-size: 12px;
+      display: block;
+      margin: 5px 0 0;
+      color: #808080;
+    }
+  }
 }
 .org-sidebar {
-	margin: -80px 0 0 20px;
-	.panel-footer {
-		padding: .8em 1.2em;
-	}
-	.member-avatar-group {
-		padding: 15px;
-		img {
-			width: 59px;
-			height: 59px;
-			border-radius: 3px;
-		}
-	}
+  margin: -80px 0 0 20px;
+  .panel-footer {
+    padding: .8em 1.2em;
+  }
+  .member-avatar-group {
+    padding: 15px;
+    img {
+      width: 59px;
+      height: 59px;
+      border-radius: 3px;
+    }
+  }
 }
 #org-home-team-list {
-	padding: 0 15px;
-	ul {
-		list-style: none;
-		padding-top: 10px;
-		li {
-			padding: 10px 0;
-			border-bottom: 1px solid #eee;
-			&:last-child {
-				border-bottom: 0;
-			}
-		}
-	}
+  padding: 0 15px;
+  ul {
+    list-style: none;
+    padding-top: 10px;
+    li {
+      padding: 10px 0;
+      border-bottom: 1px solid #eee;
+      &:last-child {
+        border-bottom: 0;
+      }
+    }
+  }
 }
 .team-name {
-	display: block;
-	font-size: 14px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
+  display: block;
+  font-size: 14px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .team-meta {
-	margin-top: 0;
-	margin-bottom: 0;
-	color: #777;
+  margin-top: 0;
+  margin-bottom: 0;
+  color: #777;
 }
 .org-toolbar {
-	padding: 10px 0;
-	border-bottom: 1px solid #eee;
+  padding: 10px 0;
+  border-bottom: 1px solid #eee;
 }
 #org-member-list {
-	.org-member-item {
-		height: 50px;
-		line-height: 50px;
-		border-bottom: 1px solid #eee;
-		padding: 15px 20px;
-		.member-name {
-			padding-left: 15px;
-		}
-		ul {
-			list-style: none;
-			li {
-				text-align: center;
-				display: inline-block;
-			}
-		}
-	}
+  .org-member-item {
+    height: 50px;
+    line-height: 50px;
+    border-bottom: 1px solid #eee;
+    padding: 15px 20px;
+    .member-name {
+      padding-left: 15px;
+    }
+    ul {
+      list-style: none;
+      li {
+        text-align: center;
+        display: inline-block;
+      }
+    }
+  }
 }
 .invite-box {
-	padding: 50px 0;
-	min-height: 130px;
-	margin: 0 auto;
-	width: 50%;
-	input {
-		width: 300px;
-	}
+  padding: 50px 0;
+  min-height: 130px;
+  margin: 0 auto;
+  width: 50%;
+  input {
+    width: 300px;
+  }
 }
 #org-member-list-block {
-	padding-top: 2px;
+  padding-top: 2px;
 }
 .org-team-list {
-	.org-team-list-item {
-		float: left;
-		padding: 15px;
-		width: 555px;
-		.member-avatar-group {
-			padding: 5px 15px;
-			img {
-				width: 38px;
-				height: 38px;
-				border-radius: 3px;
-			}
-		}
-	}
+  .org-team-list-item {
+    float: left;
+    padding: 15px;
+    width: 555px;
+    .member-avatar-group {
+      padding: 5px 15px;
+      img {
+        width: 38px;
+        height: 38px;
+        border-radius: 3px;
+      }
+    }
+  }
 }
 #team-create-form {
-	.note {
-		margin-left: 153px;
-	}
+  .note {
+    margin-left: 153px;
+  }
 }
 #org-team-card {
-	.desc {
-		font-size: 14px;
-		padding: 10px 20px;
-	}
-	.team-stats {
-		padding: 0 20px 10px 20px;
-		text-transform: uppercase;
-		border-bottom: 1px solid #dddddd;
-	}
-	.panel-footer {
-		padding: 10px 20px;
-	}
+  .desc {
+    font-size: 14px;
+    padding: 10px 20px;
+  }
+  .team-stats {
+    padding: 0 20px 10px 20px;
+    text-transform: uppercase;
+    border-bottom: 1px solid #dddddd;
+  }
+  .panel-footer {
+    padding: 10px 20px;
+  }
 }
 #team-repositories-list,
 #team-members-list {
-	.panel-body .search {
-		padding: 4px 0 10px 10px;
-		border-bottom: 1px solid #dddddd;
-	}
-	li {
-		&.collab {
-			padding-top: 10px !important;
-			border-bottom: 1px solid #dddddd;
-		}
-		&:last-child {
-			border-bottom: 0 !important;
-		}
-	}
+  .panel-body .search {
+    padding: 4px 0 10px 10px;
+    border-bottom: 1px solid #dddddd;
+  }
+  li {
+    &.collab {
+      padding-top: 10px !important;
+      border-bottom: 1px solid #dddddd;
+    }
+    &:last-child {
+      border-bottom: 0 !important;
+    }
+  }
 }
 #team-repositories-list {
-	li {
-		a .octicon {
-			color: #888;
-		}
-		.member {
-			color: @linkColor;
-			font-size: 14px;
-			height: 40px;
-			line-height: 40px;
-		}
-	}
+  li {
+    a .octicon {
+      color: #888;
+    }
+    .member {
+      color: @linkColor;
+      font-size: 14px;
+      height: 40px;
+      line-height: 40px;
+    }
+  }
 }
\ No newline at end of file