Fix missing less sources for oauth (#1288)

diff --git a/public/css/index.css b/public/css/index.css
index e61daddcba0ee5462fd6136303fbaf008856bfe3..d4404e32b0c3d2609518ee05c3458187aa26813a 100644 (file)
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -957,6 +957,23 @@ footer .ui.language .menu {
 #create-page-form form textarea {
   width: 50%!important;
 }
+.signin .oauth2 div {
+  display: inline-block;
+}
+.signin .oauth2 div p {
+  margin: 10px 5px 0 0;
+  float: left;
+}
+.signin .oauth2 a {
+  margin-right: 5px;
+}
+.signin .oauth2 a:last-child {
+  margin-right: 0px;
+}
+.signin .oauth2 img {
+  width: 32px;
+  height: 32px;
+}
 .user.activate form,
 .user.forgot.password form,
 .user.reset.password form,
@@ -1414,17 +1431,6 @@ footer .ui.language .menu {
 .repository.file.editor .commit-form-wrapper {
   padding-left: 64px;
 }
-.repository.file.editor .tab[data-tab="write"] {
-    padding: 0 !important;
-}
-.repository.file.editor .tab[data-tab="write"] .editor-toolbar {
-    border: none !important;
-}
-.repository.file.editor .tab[data-tab="write"] .CodeMirror {
-    border-left: none;
-    border-right: none;
-    border-bottom: none;
-}
 .repository.file.editor .commit-form-wrapper .commit-avatar {
   float: left;
   margin-left: -64px;
@@ -2557,6 +2563,17 @@ footer .ui.language .menu {
 .CodeMirror .cm-comment {
   background: inherit !important;
 }
+.repository.file.editor .tab[data-tab="write"] {
+  padding: 0 !important;
+}
+.repository.file.editor .tab[data-tab="write"] .editor-toolbar {
+  border: none !important;
+}
+.repository.file.editor .tab[data-tab="write"] .CodeMirror {
+  border-left: none;
+  border-right: none;
+  border-bottom: none;
+}
 .organization {
   padding-top: 15px;
   padding-bottom: 80px;
@@ -2764,6 +2781,10 @@ footer .ui.language .menu {
 .user.notification .octicon.blue {
   color: #2185d0;
 }
+.user.link-account:not(.icon) {
+  padding-top: 15px;
+  padding-bottom: 5px;
+}
 .dashboard {
   padding-top: 15px;
   padding-bottom: 80px;
@@ -3013,24 +3034,3 @@ footer .ui.language .menu {
 .ui.user.list .item .description a:hover {
   text-decoration: underline;
 }
-.user.link-account:not(.icon) {
-  padding-top: 15px;
-  padding-bottom: 5px;
-}
-.signin .oauth2 div {
-  display: inline-block;
-}
-.signin .oauth2 div p {
-  margin: 10px 5px 0 0;
-  float: left;
-}
-.signin .oauth2 a {
-  margin-right: 5px;
-}
-.signin .oauth2 a:last-child {
-  margin-right: 0px;
-}
-.signin .oauth2 img {
-  width: 32px;
-  height: 32px;
-}

diff --git a/public/less/_form.less b/public/less/_form.less
index 1fe48d97acec80ab08c77ff714441feff63bb48c..fc0fdddad1061508c4356486b8c581ae4863db46 100644 (file)
--- a/public/less/_form.less
+++ b/public/less/_form.less
@@ -46,6 +46,27 @@
        }
 }
 
+.signin {
+       .oauth2{
+               div {
+                 display: inline-block;
+                       p {
+                         margin: 10px 5px 0 0;
+                         float: left;
+                       }
+               }
+               a {
+                 margin-right: 5px;
+                       &:last-child {
+                         margin-right: 0px;
+                       }
+               }
+               img {
+                 width: 32px;
+                 height: 32px;
+               }
+       }
+}
 .user.activate,
 .user.forgot.password,
 .user.reset.password,
@@ -85,7 +106,7 @@
                        .header {
                                padding-left: 0 !important;
                                text-align: center;
-                       }                       
+                       }
                }
        }
 

diff --git a/public/less/_user.less b/public/less/_user.less
index 5411c1d062ad19df19aa31f1bfbe3369fb8541f5..ce0f1fa1d38e4797fa4d30d76c5e424262c4f9e4 100644 (file)
--- a/public/less/_user.less
+++ b/public/less/_user.less
@@ -114,4 +114,8 @@
             }
         }
     }
+    &.link-account:not(.icon) {
+        padding-top: 15px;
+        padding-bottom: 5px;
+    }
 }