From 406f5de18cb2fef293830abeae909e7f1baaf155 Mon Sep 17 00:00:00 2001
From: Antoine GIRARD <sapk@users.noreply.github.com>
Date: Tue, 11 Jul 2017 03:25:30 +0200
Subject: [PATCH] Fix missing less sources for oauth (backport #1288) (#2135)

---
 public/css/index.css   | 42 +++++++++++++++++++++---------------------
 public/less/_form.less | 23 ++++++++++++++++++++++-
 public/less/_user.less |  4 ++++
 3 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/public/css/index.css b/public/css/index.css
index a35351e17..7aff1bd0b 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -949,6 +949,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,
@@ -2742,6 +2759,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;
@@ -2983,24 +3004,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;
-}
\ No newline at end of file
diff --git a/public/less/_form.less b/public/less/_form.less
index 1fe48d97a..fc0fdddad 100644
--- 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 5411c1d06..ce0f1fa1d 100644
--- a/public/less/_user.less
+++ b/public/less/_user.less
@@ -114,4 +114,8 @@
             }
         }
     }
+    &.link-account:not(.icon) {
+        padding-top: 15px;
+        padding-bottom: 5px;
+    }
 }