summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine GIRARD <sapk@users.noreply.github.com>2017-03-17 01:49:24 +0100
committerLunny Xiao <xiaolunwen@gmail.com>2017-03-17 08:49:24 +0800
commit925b2529273b95c5b1c9165525e0daede4fa82ee (patch)
treea2f01b7c0194b965b21cd59d1fe9064862f46592
parent1476bf909e4f852b4f80187dc544c2832c606949 (diff)
downloadgitea-925b2529273b95c5b1c9165525e0daede4fa82ee.tar.gz
gitea-925b2529273b95c5b1c9165525e0daede4fa82ee.zip
Fix missing less sources for oauth (#1288)
-rw-r--r--public/css/index.css64
-rw-r--r--public/less/_form.less23
-rw-r--r--public/less/_user.less4
3 files changed, 58 insertions, 33 deletions
diff --git a/public/css/index.css b/public/css/index.css
index e61daddcba..d4404e32b0 100644
--- 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 1fe48d97ac..fc0fdddad1 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 5411c1d062..ce0f1fa1d3 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;
+ }
}