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
adc48c3b
Unverified
Commit
adc48c3b
authored
Dec 14, 2019
by
Van
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
✨
update start ui
parent
1afd7f41
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
238 additions
and
271 deletions
+238
-271
src/main/resources/admin/admin-about.ftl
src/main/resources/admin/admin-about.ftl
+1
-1
src/main/resources/common-template/start.ftl
src/main/resources/common-template/start.ftl
+30
-22
src/main/resources/images/github-icon.png
src/main/resources/images/github-icon.png
+0
-0
src/main/resources/images/hacpai.png
src/main/resources/images/hacpai.png
+0
-0
src/main/resources/scss/start.css
src/main/resources/scss/start.css
+1
-1
src/main/resources/scss/start.scss
src/main/resources/scss/start.scss
+206
-247
No files found.
src/main/resources/admin/admin-about.ftl
View file @
adc48c3b
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
${checkingVersionLabel}
${checkingVersionLabel}
</div>
</div>
<iframe src="https://ghbtns.com/github-btn.html?user=
b3log
&repo=solo&type=star&count=true&size=large"
<iframe src="https://ghbtns.com/github-btn.html?user=
88250
&repo=solo&type=star&count=true&size=large"
frameborder="0" scrolling="0" width="160px" height="30px" class="about__iframe"
frameborder="0" scrolling="0" width="160px" height="30px" class="about__iframe"
style="margin: 21px 0 0 20px;border: 0"
style="margin: 21px 0 0 20px;border: 0"
class="fn__left"></iframe>
class="fn__left"></iframe>
...
...
src/main/resources/common-template/start.ftl
View file @
adc48c3b
...
@@ -20,31 +20,39 @@
...
@@ -20,31 +20,39 @@
<#include "macro-common_page.ftl">
<#include "macro-common_page.ftl">
<@commonPage "${welcomeToSoloLabel}!">
<@commonPage "${welcomeToSoloLabel}!">
<h2>
<h2>
<span>${welcomeToSoloLabel}</span>
<span>${welcomeToSoloLabel}</span>
<a target="_blank" href="https://solo.b3log.org">
<a target="_blank" href="https://solo.b3log.org">
<span class="error"> Solo</span>
<span class="error"> Solo</span>
</a>
</a>
</h2>
</h2>
<div id="github">
<div class="start">
<div class="github__icon startAction">
<a href="${servePath}/login/redirect?referer=${referer}">
<img src="${staticServePath}/images/hacpai.png"/>
<svg class="start__icon" viewBox="0 0 32 32">
<path fill="#d23f31" style="fill: var(--color1, #d23f31)"
d="M5.787 17.226h17.033l5.954 9.528c0.47 0.752 0.003 1.361-1.042 1.361h-15.141z"></path>
<path d="M10.74 3.927h17.033c1.045 0 1.512 0.609 1.042 1.361l-5.954 9.528h-19.872l6.379-10.209c0.235-0.376 0.849-0.681 1.372-0.681z"></path>
<path d="M2.953 17.226h2.839l6.804 10.889h-1.892c-0.523 0-1.137-0.305-1.372-0.681z"></path>
</svg>
</a>
<div class="start__action">
<a class="btn" href="${servePath}/login/redirect?referer=${referer}">${useHacPaiAccountLoginLabel}</a>
<a href="https://hacpai.com/article/1576294445994" target="_blank">
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
<path d="M19.652 25v6c0 0.55-0.45 1-1 1h-6c-0.55 0-1-0.45-1-1v-6c0-0.55 0.45-1 1-1h6c0.55 0 1 0.45 1 1zM27.552 10c0 4.75-3.225 6.575-5.6 7.9-1.475 0.85-2.4 2.575-2.4 3.3v0c0 0.55-0.425 1.2-1 1.2h-6c-0.55 0-0.9-0.85-0.9-1.4v-1.125c0-3.025 3-5.625 5.2-6.625 1.925-0.875 2.725-1.7 2.725-3.3 0-1.4-1.825-2.65-3.85-2.65-1.125 0-2.15 0.35-2.7 0.725-0.6 0.425-1.2 1.025-2.675 2.875-0.2 0.25-0.5 0.4-0.775 0.4-0.225 0-0.425-0.075-0.625-0.2l-4.1-3.125c-0.425-0.325-0.525-0.875-0.25-1.325 2.7-4.475 6.5-6.65 11.6-6.65 5.35 0 11.35 4.275 11.35 10z"></path>
</svg>
</a>
</div>
</div>
</div>
<br>
<script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
<button class="startAction">${useHacPaiAccountLoginLabel}</button><br>
<script type="text/javascript">
</div>
(function () {
<script type="text/javascript" src="${staticServePath}/js/lib/jquery/jquery.min.js" charset="utf-8"></script>
<script type="text/javascript">
(function () {
try {
try {
$('.startAction').click(function () {
$('.startAction')
window.location.href = '${servePath}/login/redirect?referer=${referer}'
$('#github').addClass('github--loading')
})
} catch (e) {
} catch (e) {
document.querySelector('.main').innerHTML = "${staticErrorLabel}"
document.querySelector('.main').innerHTML = "${staticErrorLabel}"
}
}
})()
})()
</script>
</script>
</@commonPage>
</@commonPage>
src/main/resources/images/github-icon.png
deleted
100644 → 0
View file @
1afd7f41
4.31 KB
src/main/resources/images/hacpai.png
deleted
100644 → 0
View file @
1afd7f41
10 KB
src/main/resources/scss/start.css
View file @
adc48c3b
This diff is collapsed.
Click to expand it.
src/main/resources/scss/start.scss
View file @
adc48c3b
This diff is collapsed.
Click to expand it.
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