Skip to content

石磊 / cihai

Go to a project
Commit cd00176d by 石头
Options

pc端调整完成

1 parent 87275811
Expand all
Inline Side-by-side
Showing 10 changed files with 16 additions and 82 deletions
serverside/cihai-app/src/main/webapp/static/js/echarts-gl.js 0 → 100644
This diff could not be displayed because it is too large.
serverside/cihai-app/src/main/webapp/static/js/echarts.min.js 0 → 100644
This diff could not be displayed because it is too large.
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/character_paraph.jsp
...@@ -19,46 +19,7 @@ ...@@ -19,46 +19,7 @@
</div> </div>
</div> </div>
<div class="calligraphy-main"> <div class="calligraphy-main">
<section class="calligraphy-section"> <img src="${ctx}/static/images/xiang.jpg" />
<div class="calligraphy-section__hd">
<div class="title-base title-primary">【六体书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="/static/temp/calligraphy1.png">
</div>
</section>
<section class="calligraphy-section">
<div class="calligraphy-section__hd">
<div class="title-base title-primary">【楷书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="/static/temp/calligraphy2.png">
</div>
</section>
<section class="calligraphy-section">
<div class="calligraphy-section__hd">
<div class="title-base title-primary">【行书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="/static/temp/calligraphy3.png">
</div>
</section>
<section class="calligraphy-section">
<div class="calligraphy-section__hd">
<div class="title-base title-primary">【篆书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="/static/temp/calligraphy4.png">
</div>
</section>
<section class="calligraphy-section">
<div class="calligraphy-section__hd">
<div class="title-base title-primary">【隶书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="/static/temp/calligraphy5.png">
</div>
</section>
</div> </div>
</div> </div>
<div class="content"> <div class="content">
......
serverside/cihai-pc/src/main/webapp/static/2-1字-语词义.html
...@@ -57,46 +57,7 @@ ...@@ -57,46 +57,7 @@
<b>象</b>的书法</div> <b>象</b>的书法</div>
</div> </div>
<div class="calligraphy-main"> <div class="calligraphy-main">
<section class="calligraphy-section"> <img src="" />
<div class="calligraphy-section__hd">
<div class="title-base title-primary">【六体书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="temp/calligraphy1.png">
</div>
</section>
<section class="calligraphy-section">
<div class="calligraphy-section__hd">
<div class="title-base title-primary">【楷书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="temp/calligraphy2.png">
</div>
</section>
<section class="calligraphy-section">
<div class="calligraphy-section__hd">
<div class="title-base title-primary">【行书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="temp/calligraphy3.png">
</div>
</section>
<section class="calligraphy-section">
<div class="calligraphy-section__hd">
<div class="title-base title-primary">【篆书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="temp/calligraphy4.png">
</div>
</section>
<section class="calligraphy-section">
<div class="calligraphy-section__hd">
<div class="title-base title-primary">【隶书书法】</div>
</div>
<div class="calligraphy-section__bd">
<img src="temp/calligraphy5.png">
</div>
</section>
</div> </div>
</div> </div>
<div class="content"> <div class="content">
......
serverside/cihai-pc/src/main/webapp/static/css/index.css
body,html{height:100%}.wrapper-index{position:relative;height:100%;min-height:770px;background:url(../images/bg-index.jpg) top center no-repeat}.wrapper-index .navbar-default{padding:40px 0}.wrapper-index .navbar-default,.wrapper-index .navbar-default .navbar-collapse{background-color:transparent;border-color:transparent}.wrapper-index .navbar-nav{top:18px}.wrapper-index .navbar-form .navbar-main-list{margin-top:20px}.wrapper-index .logo{position:absolute;left:40px;top:40px}.wrapper-index .search-main{padding-top:400px}.wrapper-index .search-main .navbar-form{width:775px}.wrapper-index .search-main .navbar-form .btn-link{float:left;margin-left:15px}.wrapper-index .search-main .navbar-form .logo-search{text-align:center;width:380px;height:70px;margin:0 auto 30px}.wrapper-index .search-main .navbar-form .logo-search img{display:inline-block}.wrapper-index .push-main{padding:0 50px}.wrapper-index .push-main .footer-main .qr{float:right;margin-top:-2px}.wrapper-index .push-main .footer-main .qr a:hover .icon-qr{background-image:url(../images/sprite-2.png);background-position:0 0}.wrapper-index .push-main .footer-main .copyright{text-align:left}.wrapper-index .search-main-input-wrapper{position:relative;float:left;padding:0 6px 4px 0;background:url(../images/right.png) right 0 no-repeat}.wrapper-index .search-main-input-wrapper .search-main-input-inner{padding:0 0 6px 0;background:url(../images/bottom.png) 4px bottom no-repeat}.wrapper-index .search-main-input-img{position:absolute;left:-60px;bottom:100%}.btn-search{border:none;width:160px!important;height:75px!important;outline:0;background:url(../images/btn-search.png) center no-repeat}.btn-search:active,.btn-search:focus{background:url(../images/btn-search.png) center no-repeat}.navbar-form .form-group{padding:13px 0!important}.container-fluid .navbar-form .form-group{border-color:#c13633}@media (min-width:1400px){.wrapper-index .navbar-form .navbar-main-list{width:103%;font-size:22px;line-height:30px}.wrapper-index .navbar-form .navbar-main-list .icon-search{margin-top:-4px}.wrapper-index .navbar-form .navbar-main-list a{margin:0 18px}.wrapper-index .navbar .navbar-form{width:1005px}}@media (max-width:1400px){.wrapper-index .container .navbar-form .form-group,.wrapper-index .container-fluid .navbar-form .form-group{width:531px}.wrapper-index .container .navbar-form .form-group .form-control,.wrapper-index .container-fluid .navbar-form .form-group .form-control{width:441px!important}.wrapper-index .container .navbar-form .form-group .btn,.wrapper-index .container-fluid .navbar-form .form-group .btn{width:38px}.wrapper-index .push-main{padding:0 40px}}@media (max-width:1200px){.container-fluid .navbar-header{margin-left:0}.container-fluid .navbar-collapse{margin-right:0}.wrapper-index .push-main{padding:0 10px}}@media (max-width:1200px){.container-fluid .navbar-header{margin-left:-10px}.container-fluid .navbar-collapse{margin-right:0}.wrapper-index .push-main{padding:0}}.word{padding:35px 0;height:230px;background-clip:content-box;background-position:center;background-repeat:no-repeat;background-size:contain;background-image:url(../images/ciyun.png)}.calendar{position:absolute;right:0;top:0}.container-fluid .navbar-links{padding:15px 0 40px;font-size:16px}.container-fluid .navbar-links>a{color:#999;margin-right:20px}.container-fluid .navbar-links>a:hover{color:#187bb2}
\ No newline at end of file \ No newline at end of file
body,html{height:100%}.wrapper-index{position:relative;height:100%;min-height:770px;background:url(../images/bg-index.jpg) top center no-repeat}.wrapper-index .navbar-default{padding:40px 0}.wrapper-index .navbar-default,.wrapper-index .navbar-default .navbar-collapse{background-color:transparent;border-color:transparent}.wrapper-index .navbar-nav{top:18px}.wrapper-index .navbar-form .navbar-main-list{margin-top:20px}.wrapper-index .logo{position:absolute;left:40px;top:40px}.wrapper-index .search-main{padding-top:400px}.wrapper-index .search-main .navbar-form{width:775px}.wrapper-index .search-main .navbar-form .btn-link{float:left;margin-left:15px}.wrapper-index .search-main .navbar-form .logo-search{text-align:center;width:380px;height:70px;margin:0 auto 30px}.wrapper-index .search-main .navbar-form .logo-search img{display:inline-block}.wrapper-index .push-main{padding:0 50px}.wrapper-index .push-main .footer-main .qr{float:right;margin-top:-2px}.wrapper-index .push-main .footer-main .qr a:hover .icon-qr{background-image:url(../images/sprite-2.png);background-position:0 0}.wrapper-index .push-main .footer-main .copyright{text-align:left}.wrapper-index .search-main-input-wrapper{position:relative;float:left;padding:0 6px 4px 0;background:url(../images/right.png) right 0 no-repeat}.wrapper-index .search-main-input-wrapper .search-main-input-inner{padding:0 0 6px 0;background:url(../images/bottom.png) 4px bottom no-repeat}.wrapper-index .search-main-input-img{position:absolute;left:-60px;bottom:100%}.btn-search{border:none;width:160px!important;height:75px!important;outline:0;background:url(../images/btn-search.png) center no-repeat}.btn-search:active,.btn-search:focus{background:url(../images/btn-search.png) center no-repeat}.navbar-form .form-group{padding:13px 0!important}.container-fluid .navbar-form .form-group{border-color:#c13633}@media (min-width:1400px){.wrapper-index .navbar-form .navbar-main-list{width:103%;font-size:22px;line-height:30px}.wrapper-index .navbar-form .navbar-main-list .icon-search{margin-top:-4px}.wrapper-index .navbar-form .navbar-main-list a{margin:0 18px}.wrapper-index .navbar .navbar-form{width:1005px}}@media (max-width:1400px){.wrapper-index .container .navbar-form .form-group,.wrapper-index .container-fluid .navbar-form .form-group{width:531px}.wrapper-index .container .navbar-form .form-group .form-control,.wrapper-index .container-fluid .navbar-form .form-group .form-control{width:441px!important}.wrapper-index .container .navbar-form .form-group .btn,.wrapper-index .container-fluid .navbar-form .form-group .btn{width:38px}.wrapper-index .push-main{padding:0 40px}}@media (max-width:1200px){.container-fluid .navbar-header{margin-left:0}.container-fluid .navbar-collapse{margin-right:0}.wrapper-index .push-main{padding:0 10px}}@media (max-width:1200px){.container-fluid .navbar-header{margin-left:-10px}.container-fluid .navbar-collapse{margin-right:0}.wrapper-index .push-main{padding:0}}.word{height:230px;padding:32px 0;background-clip:content-box;background-position:center;background-repeat:no-repeat;background-size:contain;background-image:url(../images/ciyun3.png)}.calendar{position:absolute;right:0;top:0}.container-fluid .navbar-links{padding:15px 0 40px;font-size:16px}.container-fluid .navbar-links>a{color:#999;margin-right:20px}.container-fluid .navbar-links>a:hover{color:#187bb2}
\ No newline at end of file \ No newline at end of file
serverside/cihai-pc/src/main/webapp/static/css/vendor.css
This diff could not be displayed because it is too large.
serverside/cihai-pc/src/main/webapp/static/index.html
...@@ -114,6 +114,18 @@ ...@@ -114,6 +114,18 @@
</div> </div>
<script src="js/plugins/jquery.min.js"></script> <script src="js/plugins/jquery.min.js"></script>
<script src="js/vendor.js" merge="true"></script> <script src="js/vendor.js" merge="true"></script>
<script src="./js/wordcloud2.js"></script> <script>
var ciyun = ['ciyun', 'ciyun2', 'ciyun3']
function getRandomInt(min, max) {
min = Math.ceil(min);
max = Math.floor(max);
return Math.floor(Math.random() * (max - min)) + min; //The maximum is exclusive and the minimum is inclusive
}
var ran = getRandomInt(0, 3)
$(".word").css({
"background-image": "url(./images/" + ciyun[ran] + ".png)"
})
</script>
</body> </body>
</html> </html>
\ No newline at end of file \ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!