Skip to content

Commit

Permalink
Merge pull request otale#256 from otale/develop
Browse files Browse the repository at this point in the history 
🐌 fix install page css not import
  • Loading branch information
@hellokaton
hellokaton authored Sep 29, 2017
2 parents ee4477b + 2cc8e1a commit c41f7bc
Show file tree
Hide file tree
Showing 10 changed files with 370 additions and 27 deletions.
328 changes: 328 additions & 0 deletions src/main/resources/static/admin/plugins/jquery-steps/1.1.0/jquery.steps.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,328 @@
/*
Common
*/

.wizard,
.tabcontrol {
display: block;
width: 100%;
overflow: hidden;
}

.wizard a,
.tabcontrol a {
outline: 0;
}

.wizard ul,
.tabcontrol ul {
list-style: none !important;
padding: 0;
margin: 0;
}

.wizard ul > li,
.tabcontrol ul > li {
display: block;
padding: 0;
}

/* Accessibility */
.wizard > .steps .current-info,
.tabcontrol > .steps .current-info {
position: absolute;
left: -999em;
}

.wizard > .content > .title,
.tabcontrol > .content > .title {
position: absolute;
left: -999em;
}

/*
Wizard
*/

.wizard > .steps {
position: relative;
display: block;
width: 100%;
}

.wizard.vertical > .steps {
display: inline;
float: left;
width: 30%;
}

.wizard > .steps .number {
font-size: 1.429em;
}

.wizard > .steps > ul > li {
width: 25%;
}

.wizard > .steps > ul > li,
.wizard > .actions > ul > li {
float: left;
}

.wizard.vertical > .steps > ul > li {
float: none;
width: 100%;
}

.wizard > .steps a,
.wizard > .steps a:hover,
.wizard > .steps a:active {
display: block;
width: auto;
margin: 0 0.5em 0.5em;
padding: 1em 1em;
text-decoration: none;

-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}

.wizard > .steps .disabled a,
.wizard > .steps .disabled a:hover,
.wizard > .steps .disabled a:active {
background: #eee;
color: #aaa;
cursor: default;
}

.wizard > .steps .current a,
.wizard > .steps .current a:hover,
.wizard > .steps .current a:active {
background: #2184be;
color: #fff;
cursor: default;
}

.wizard > .steps .done a,
.wizard > .steps .done a:hover,
.wizard > .steps .done a:active {
background: #9dc8e2;
color: #fff;
}

.wizard > .steps .error a,
.wizard > .steps .error a:hover,
.wizard > .steps .error a:active {
background: #ff3111;
color: #fff;
}

.wizard > .content {
background: #eee;
display: block;
margin: 0.5em;
min-height: 35em;
overflow: hidden;
position: relative;
width: auto;

-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}

.wizard.vertical > .content {
display: inline;
float: left;
margin: 0 2.5% 0.5em 2.5%;
width: 65%;
}

.wizard > .content > .body {
float: left;
width: 100%;
/*height: 95%;*/
/*padding: 2.5%;*/
}

.wizard > .content > .body ul {
list-style: disc !important;
}

.wizard > .content > .body ul > li {
display: list-item;
}

.wizard > .content > .body > iframe {
border: 0 none;
width: 100%;
height: 100%;
}

.wizard > .content > .body input {
display: block;
border: 1px solid #ccc;
}

.wizard > .content > .body input[type="checkbox"] {
display: inline-block;
}

.wizard > .content > .body input.error {
background: rgb(251, 227, 228);
border: 1px solid #fbc2c4;
color: #8a1f11;
}

.wizard > .content > .body label {
display: inline-block;
margin-bottom: 0.5em;
}

.wizard > .content > .body label.error {
color: #8a1f11;
display: inline-block;
margin-left: 1.5em;
}

.wizard > .actions {
position: relative;
display: block;
text-align: right;
width: 100%;
}

.wizard.vertical > .actions {
display: inline;
float: right;
margin: 0 2.5%;
width: 95%;
}

.wizard > .actions > ul {
display: inline-block;
text-align: right;
}

.wizard > .actions > ul > li {
margin: 0 0.5em;
}

.wizard.vertical > .actions > ul > li {
margin: 0 0 0 1em;
}

.wizard > .actions a,
.wizard > .actions a:hover,
.wizard > .actions a:active {
background: #2184be;
color: #fff;
display: block;
padding: 0.5em 1em;
text-decoration: none;

-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}

.wizard > .actions .disabled a,
.wizard > .actions .disabled a:hover,
.wizard > .actions .disabled a:active {
background: #eee;
color: #aaa;
}

.wizard > .loading {
}

.wizard > .loading .spinner {
}

/*
Tabcontrol
*/

.tabcontrol > .steps {
position: relative;
display: block;
width: 100%;
}

.tabcontrol > .steps > ul {
position: relative;
margin: 6px 0 0 0;
top: 1px;
z-index: 1;
}

.tabcontrol > .steps > ul > li {
float: left;
margin: 5px 2px 0 0;
padding: 1px;

-webkit-border-top-left-radius: 5px;
-webkit-border-top-right-radius: 5px;
-moz-border-radius-topleft: 5px;
-moz-border-radius-topright: 5px;
border-top-left-radius: 5px;
border-top-right-radius: 5px;
}

.tabcontrol > .steps > ul > li:hover {
background: #edecec;
border: 1px solid #bbb;
padding: 0;
}

.tabcontrol > .steps > ul > li.current {
background: #fff;
border: 1px solid #bbb;
border-bottom: 0 none;
padding: 0 0 1px 0;
margin-top: 0;
}

.tabcontrol > .steps > ul > li > a {
color: #5f5f5f;
display: inline-block;
border: 0 none;
margin: 0;
padding: 10px 30px;
text-decoration: none;
}

.tabcontrol > .steps > ul > li > a:hover {
text-decoration: none;
}

.tabcontrol > .steps > ul > li.current > a {
padding: 15px 30px 10px 30px;
}

.tabcontrol > .content {
position: relative;
display: inline-block;
width: 100%;
height: 35em;
overflow: hidden;
border-top: 1px solid #bbb;
padding-top: 20px;
}

.tabcontrol > .content > .body {
float: left;
position: absolute;
width: 95%;
height: 95%;
padding: 2.5%;
}

.tabcontrol > .content > .body ul {
list-style: disc !important;
}

.tabcontrol > .content > .body ul > li {
display: list-item;
}
2 changes: 2 additions & 0 deletions src/main/resources/templates/comm/macros.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@
<script src="/static/admin/plugins/jquery/3.2.1/jquery.min.js"></script>
<script src="/static/admin/plugins/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="/static/admin/plugins/limonte-sweetalert2/6.4.1/sweetalert2.min.js"></script>
#elseif(type == "jquery")
<script src="/static/admin/plugins/jquery/3.2.1/jquery.min.js"></script>
#end
#end
#end
2 changes: 1 addition & 1 deletion src/main/resources/templates/install.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="shortcut icon" href="/static/admin/images/favicon.png"/>
<title>Tale - 博客安装</title>
<link href="/static/admin/plugins/jquery.steps/demo/css/jquery.steps.css" rel="stylesheet" type="text/css">
<link href="/static/admin/plugins/jquery-steps/1.1.0/jquery.steps.css" rel="stylesheet" type="text/css">
#call cdn_url('install_head')
<link href="/static/admin/css/style.min.css" rel="stylesheet" type="text/css">
<style>
Expand Down
28 changes: 4 additions & 24 deletions src/main/resources/templates/themes/default/partial/footer.html
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,7 @@
<footer id="footer" class="footer bg-white">
<div class="footer-social">
<div class="footer-container clearfix">
<div class="social-list">
#if(null != theme_option('social_weibo'))
<a class="social weibo" target="blank" href="http://weibo.com/${theme_option('social_weibo')}">微博</a>
#end

#if(null != theme_option('social_zhihu'))
<a class="social zhihu" target="blank"
href="https://www.zhihu.com/people/${theme_option('social_zhihu')}">知乎</a>
#end

<a class="social rss" target="blank" href="/feed">RSS</a>

#if(null != theme_option('social_github'))
<a class="social github" target="blank"
href="https://github.com/${theme_option('social_github')}">Github</a>
#end

#if(null != theme_option('social_twitter'))
<a class="social twitter" target="blank" href="https://twitter.com/${theme_option('social_twitter')}">Twitter</a>
#end
</div>
#include("./social.html")
</div>
</div>
<div class="footer-meta">
Expand Down Expand Up @@ -157,9 +137,9 @@ <h3 class="meta-title">最新评论</h3>
postDirectoryBuild();
</script>
#end
<script src="//cdn.bootcss.com/headroom/0.9.1/headroom.min.js"></script>
<script src="//cdn.bootcss.com/highlight.js/9.9.0/highlight.min.js"></script>
<script src="//cdn.bootcss.com/instantclick/3.0.1/instantclick.min.js"></script>
<script src="${theme_url('/static/js/headroom.min.js')}"></script>
<script src="${theme_url('/static/js/highlight.min.js')}"></script>
<script src="${theme_url('/static/js/instantclick.min.js')}"></script>
<script type="text/javascript">
#if(is_post)
var postDirectory = new Headroom(document.getElementById("directory-content"), {
Expand Down
Loading

0 comments on commit c41f7bc

Please sign in to comment.