Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo-1
Commits
cdce31b7
Unverified
Commit
cdce31b7
authored
Oct 07, 2018
by
Van
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐛
github 重复提交
parent
5e0d4b9e
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
32 additions
and
10 deletions
+32
-10
src/main/webapp/css/default-init.css
src/main/webapp/css/default-init.css
+17
-0
src/main/webapp/css/default-init.min.css
src/main/webapp/css/default-init.min.css
+1
-1
src/main/webapp/init.ftl
src/main/webapp/init.ftl
+5
-3
src/main/webapp/login.ftl
src/main/webapp/login.ftl
+4
-3
src/main/webapp/register.ftl
src/main/webapp/register.ftl
+5
-3
No files found.
src/main/webapp/css/default-init.css
View file @
cdce31b7
...
@@ -274,8 +274,25 @@ button:active {
...
@@ -274,8 +274,25 @@ button:active {
margin-left
:
10px
;
margin-left
:
10px
;
}
}
#github
{
#github
{
position
:
relative
;
text-align
:
center
;
text-align
:
center
;
}
}
#github
.github--loading
:after
{
content
:
"Loading..."
;
position
:
absolute
;
height
:
100%
;
width
:
100%
;
top
:
0
;
left
:
0
;
z-index
:
7
;
background-color
:
rgba
(
255
,
255
,
255
,
0.6
);
font-size
:
22px
;
text-align
:
center
;
padding-top
:
135px
;
color
:
#000
;
text-shadow
:
0
1px
2px
rgba
(
0
,
0
,
0
,
0.2
);
box-sizing
:
border-box
;
}
#github
.github__icon
{
#github
.github__icon
{
display
:
block
;
display
:
block
;
}
}
...
...
src/main/webapp/css/default-init.min.css
View file @
cdce31b7
This diff is collapsed.
Click to expand it.
src/main/webapp/init.ftl
View file @
cdce31b7
...
@@ -29,10 +29,12 @@
...
@@ -29,10 +29,12 @@
<div id="init">
<div id="init">
<div id="github">
<div id="github">
<a class="github__icon" href="${servePath}/oauth/github/redirect">
<div class="github__icon"
onclick="window.location.href = '${servePath}/oauth/github/redirect';$('#github').addClass('github--loading')">
<img src="${staticServePath}/images/github-init.gif"/>
<img src="${staticServePath}/images/github-init.gif"/>
</a>
</div>
<button class="hover" onclick="window.location.href = '${servePath}/oauth/github/redirect'">${useGitHubAccountLoginLabel}</button>
<button class="hover"
onclick="window.location.href = '${servePath}/oauth/github/redirect';$('#github').addClass('github--loading')">${useGitHubAccountLoginLabel}</button>
<br>
<br>
<span onclick="$('#github').hide();$('#user').show()">${useLocalAccountLabel}</span>
<span onclick="$('#github').hide();$('#user').show()">${useLocalAccountLabel}</span>
</div>
</div>
...
...
src/main/webapp/login.ftl
View file @
cdce31b7
...
@@ -24,10 +24,11 @@
...
@@ -24,10 +24,11 @@
${loginLabel}
${loginLabel}
</h2>
</h2>
<div id="github">
<div id="github">
<a class="github__icon" href="${servePath}/oauth/github/redirect">
<div class="github__icon"
onclick="window.location.href = '${servePath}/oauth/github/redirect';$('#github').addClass('github--loading')">
<img src="${staticServePath}/images/github-init.gif"/>
<img src="${staticServePath}/images/github-init.gif"/>
</
a
>
</
div
>
<button class="hover" onclick="window.location.href = '${servePath}/oauth/github/redirect'">${useGitHubAccountLoginLabel}</button>
<button class="hover" onclick="window.location.href = '${servePath}/oauth/github/redirect'
;$('#github').addClass('github--loading')
">${useGitHubAccountLoginLabel}</button>
<br>
<br>
<span onclick="$('#github').hide();$('.form').show()">${useLocalAccountLabel}</span>
<span onclick="$('#github').hide();$('.form').show()">${useLocalAccountLabel}</span>
</div>
</div>
...
...
src/main/webapp/register.ftl
View file @
cdce31b7
...
@@ -22,10 +22,12 @@
...
@@ -22,10 +22,12 @@
<@commonPage "${registerSoloUserLabel}!">
<@commonPage "${registerSoloUserLabel}!">
<h2>${registerSoloUserLabel}</h2>
<h2>${registerSoloUserLabel}</h2>
<div id="github">
<div id="github">
<a class="github__icon" href="${servePath}/oauth/github/redirect">
<div class="github__icon" href="${servePath}/oauth/github/redirect"
onclick="window.location.href = '${servePath}/oauth/github/redirect';$('#github').addClass('github--loading')">
<img src="${staticServePath}/images/github-init.gif"/>
<img src="${staticServePath}/images/github-init.gif"/>
</a>
</div>
<button class="hover" onclick="window.location.href = '${servePath}/oauth/github/redirect'">${useGitHubAccountLoginLabel}</button>
<button class="hover"
onclick="window.location.href = '${servePath}/oauth/github/redirect';$('#github').addClass('github--loading')">${useGitHubAccountLoginLabel}</button>
<br>
<br>
<span onclick="$('#github').hide();$('.form').show()">${useLocalAccountLabel}</span>
<span onclick="$('#github').hide();$('.form').show()">${useLocalAccountLabel}</span>
</div>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment