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

Conflicts:
	models/oauth2.go

1 files changed, 39 insertions, 1 deletions

diff --git a/public/css/gogs.css b/public/css/gogs.css
index da2a7fd1..dcfb2758 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -309,6 +309,18 @@ html, body {
     height: 8em;
 }
 
+#repo-import-auth{
+    width: 100%;
+    margin-top: 48px;
+    box-sizing: border-box;
+}
+
+#repo-import-auth .form-group{
+    box-sizing: border-box;
+    margin-left: 0;
+    margin-right: 0;
+}
+
 /* gogits user setting */
 
 #user-setting-nav > h4, #user-setting-container > h4, #user-setting-container > div > h4,
@@ -444,6 +456,32 @@ html, body {
     margin-right: 1em;
 }
 
+#user-dashboard-repo-new .btn-sm.dropdown-toggle {
+    padding: 3px 8px;
+}
+
+#user-dashboard-repo-new .dropdown-menu {
+    padding: 0;
+    margin: 0;
+}
+
+#user-dashboard-repo-new ul {
+    margin: 0;
+    width: 200px;
+}
+
+#user-dashboard-repo-new li a {
+    line-height: 36px;
+    display: block;
+    padding: 0 18px;
+    color: #444;
+}
+
+#user-dashboard-repo-new li a:hover {
+    background: #0093c4;
+    color: #FFF;
+}
+
 /* gogits repo single page */
 
 #body-nav.repo-nav {
@@ -1372,6 +1410,6 @@ html, body {
     margin: 16px 0;
 }
 
-#release-preview{
+#release-preview {
     margin: 6px 0;
 }
\ No newline at end of file