Skip to content

Fix missing less sources for oauth #1288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2017
Merged

Fix missing less sources for oauth #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions public/css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
23 changes: 22 additions & 1 deletion public/less/_form.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -85,7 +106,7 @@
.header {
padding-left: 0 !important;
text-align: center;
}
}
}
}

Expand Down
4 changes: 4 additions & 0 deletions public/less/_user.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,8 @@
}
}
}
&.link-account:not(.icon) {
padding-top: 15px;
padding-bottom: 5px;
}
}