10185101162
/
style-transform-master
3
4
Vork 2
Code Kwesties 0 Pull-aanvragen 0 Publicaties 0 Wiki Activiteit
Bladeren bron

Merge pull request '改了一点点前端' (#5) from 10174102126/style-transform-master:master into master 

Reviewed-on: http://gitea.shuishan.net.cn/10185101162/style-transform-master/pulls/5
master
刘冬煜 4 jaren geleden
bovenliggende
c4f8407eef 9dee5a5695
commit
85a67b6ac6
20 gewijzigde bestanden met toevoegingen van 72 en 42 verwijderingen
Zij-aan-zij weergave
Diff opties
Statistieken weergeven Download Patch-bestand Download Diff-bestand
  1. +0
    -0
      style-transform-master/style-transform-master/html/css/.keep
  2. +0
    -0
      style-transform-master/style-transform-master/html/css/font-awesome/.keep
  3. +0
    -0
      style-transform-master/style-transform-master/html/css/font-awesome/css/.keep
  4. +0
    -0
      style-transform-master/style-transform-master/html/css/font-awesome/fonts/.keep
  5. +0
    -0
      style-transform-master/style-transform-master/html/css/images/.keep
  6. +2
    -0
      style-transform-master/style-transform-master/html/css/normalize.css
  7. +28
    -0
      style-transform-master/style-transform-master/html/css/style.css
  8. +1
    -0
      style-transform-master/style-transform-master/html/debug.log
  9. +0
    -0
      style-transform-master/style-transform-master/html/elegant_font/.keep
  10. +0
    -0
      style-transform-master/style-transform-master/html/elegant_font/fonts/.keep
  11. +0
    -0
      style-transform-master/style-transform-master/html/fonts/.keep
  12. +0
    -0
      style-transform-master/style-transform-master/html/images/.keep
  13. +0
    -0
      style-transform-master/style-transform-master/html/images/clients/.keep
  14. +0
    -0
      style-transform-master/style-transform-master/html/images/img-portfolio/.keep
  15. +0
    -0
      style-transform-master/style-transform-master/html/images/img-teams/.keep
  16. +0
    -0
      style-transform-master/style-transform-master/html/images/slider/.keep
  17. +0
    -0
      style-transform-master/style-transform-master/html/img-teams/.keep
  18. +41
    -12
      style-transform-master/style-transform-master/html/index.html
  19. +0
    -0
      style-transform-master/style-transform-master/html/js/.keep
  20. +0
    -30
      style-transform-master/style-transform-master/html/说明.txt

+ 0
- 0
style-transform-master/style-transform-master/html/css/.keep Bestand weergeven


+ 0
- 0
style-transform-master/style-transform-master/html/css/font-awesome/.keep Bestand weergeven


+ 0
- 0
style-transform-master/style-transform-master/html/css/font-awesome/css/.keep Bestand weergeven


+ 0
- 0
style-transform-master/style-transform-master/html/css/font-awesome/fonts/.keep Bestand weergeven


+ 0
- 0
style-transform-master/style-transform-master/html/css/images/.keep Bestand weergeven


+ 2
- 0
style-transform-master/style-transform-master/html/css/normalize.css Bestand weergeven

@ -18,6 +18,8 @@ html {
body {
margin: 0;
background:url("images/slider/slider-img-1.jpg") no-repeat center center fixed;
background-size:cover;
}
/* HTML5 display definitions

+ 28
- 0
style-transform-master/style-transform-master/html/css/style.css Bestand weergeven

@ -637,7 +637,11 @@ header.page-header .main-menu{
display:inline;
}
.main-menu .navbar-nav li a{
<<<<<<< HEAD
font-size: 24px;
=======
font-size: 13px;
>>>>>>> 85ea074ebdbe80b4f8592ed7cc06d3c1d70712eb
font-weight: 700;
color: #fff;
padding-top: 6px;
@ -697,7 +701,11 @@ header.page-header .main-menu.minified{
}
.main-slides h1.slider-text-big{
<<<<<<< HEAD
font-size: 128px;
=======
font-size: 64px;
>>>>>>> 85ea074ebdbe80b4f8592ed7cc06d3c1d70712eb
color: #ffffff;
margin-top: 0;
margin-bottom: 25px;
@ -916,14 +924,30 @@ header.page-header .main-menu.minified{
.portfolio-items .portfolio-item{
width: 33%;
height: 400px;
<<<<<<< HEAD
position: absolute;
overflow: hidden;
=======
position: relative;
overflow: hidden;
display: table-cell;
vertical-align: middle;
text-align: center;
>>>>>>> 85ea074ebdbe80b4f8592ed7cc06d3c1d70712eb
}
.portfolio-items .portfolio-item img{
height: 100%;
<<<<<<< HEAD
border: 1px solid #ffffff;
width: 100%;
=======
display: table-cell;
vertical-align: middle;
border: 1px solid #ffffff;
width: 100%;
text-align: center;
>>>>>>> 85ea074ebdbe80b4f8592ed7cc06d3c1d70712eb
}
.portfolio-items .portfolio-item .portfolio-details-wrapper{
@ -2114,7 +2138,11 @@ footer ul li a i{
.main-slides h1.slider-text-big {
color: #ffffff;
<<<<<<< HEAD
font-size: 64px;
=======
font-size: 38px;
>>>>>>> 85ea074ebdbe80b4f8592ed7cc06d3c1d70712eb
margin-bottom: 25px;
margin-top: 0;
white-space: normal !important;

+ 1
- 0
style-transform-master/style-transform-master/html/debug.log Bestand weergeven

@ -0,0 +1 @@
[1223/220909.252:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

+ 0
- 0
style-transform-master/style-transform-master/html/elegant_font/.keep Bestand weergeven


+ 0
- 0
style-transform-master/style-transform-master/html/elegant_font/fonts/.keep Bestand weergeven


+ 0
- 0
style-transform-master/style-transform-master/html/fonts/.keep Bestand weergeven


+ 0
- 0
style-transform-master/style-transform-master/html/images/.keep Bestand weergeven


+ 0
- 0
style-transform-master/style-transform-master/html/images/clients/.keep Bestand weergeven


+ 0
- 0
style-transform-master/style-transform-master/html/images/img-portfolio/.keep Bestand weergeven


+ 0
- 0
style-transform-master/style-transform-master/html/images/img-teams/.keep Bestand weergeven


+ 0
- 0
style-transform-master/style-transform-master/html/images/slider/.keep Bestand weergeven


+ 0
- 0
style-transform-master/style-transform-master/html/img-teams/.keep Bestand weergeven


+ 41
- 12
style-transform-master/style-transform-master/html/index.html Bestand weergeven

@ -30,6 +30,7 @@
<![endif]-->
</head>
<body>
<!-- Preloader -->
<div class="preloader">
@ -56,6 +57,7 @@
<li>
<a href="#about">ABOUT</a>
</li>
<!-- <<<<<<< HEAD -->
<!-- <li>
<a href="#services">SERVICES</a>
</li> -->
@ -64,6 +66,13 @@
</li>
<li>
<a href="#menuCard">WAITING</a>
<!-- =======
<li>
<a href="#services">SERVICES</a>
</li>
<li>
<a href="#menuCard">MENU</a>
>>>>>>> 85ea074ebdbe80b4f8592ed7cc06d3c1d70712eb -->
</li>
<li>
<a href="#portfolio">RESULT</a>
@ -71,9 +80,18 @@
<li>
<a href="#team">MEMBERS</a>
</li>
<!-- <<<<<<< HEAD -->
<!-- <li>
<a href="#clients">FEEDBACK</a>
</li> -->
<!-- =======
<li>
<a href="#clients">FEEDBACK</a>
</li>
<li>
<a href="#contact">CONTACT US</a>
</li>
>>>>>>> 85ea074ebdbe80b4f8592ed7cc06d3c1d70712eb -->
</ul>
</div>
</div>
@ -95,7 +113,11 @@
<h1 class="sp-layer slider-text-big" data-position="left" data-show-transition="left"
data-hide-transition="right" data-show-delay="1500" data-hide-delay="200">
<!-- <<<<<<< HEAD -->
<span class="highlight-texts">Style Transfer</span>
<!-- =======
<span class="highlight-texts">Healthy Food</span>
>>>>>>> 85ea074ebdbe80b4f8592ed7cc06d3c1d70712eb -->
</h1>
<p class="sp-layer" data-position="left" data-vertical="15%" data-show-delay="2000"
@ -192,12 +214,21 @@
</div>
</section>
<!-- <<<<<<< HEAD -->
<!-- <section id="services" class="section-wrapper">
<div class="container">
<div class="row"> -->
<!-- Section Header -->
<!-- <div class="col-md-12 col-sm-12 col-xs-12 section-header wow fadeInDown">
=======
<section id="services" class="section-wrapper">
<div class="container">
<div class="row">
Section Header -->
<div class="col-md-12 col-sm-12 col-xs-12 section-header wow fadeInDown">
<!-- >>>>>>> 85ea074ebdbe80b4f8592ed7cc06d3c1d70712eb -->
<h2><span class="highlight-text">Services</span></h2>
<p class="col-md-8 col-sm-10 col-xs-12 col-md-offset-2 col-sm-offset-1">Lorem ipsum dolor sit amet,
@ -327,8 +358,8 @@
</div>
<div class="col-md-8 col-md-offset-2"><br>
<div id="success"> </div><button type="submit" class="btn btn-primary" onclick="window.location.href = '#portfolio'">Submit
Message</button>
<div id="success"> </div><button type="submit" class="btn btn-primary" onclick="window.location.href = '#portfolio'">Start Training
</button>
</div>
</form>
@ -555,10 +586,9 @@
<!-- Section Header -->
<div class="col-md-12 col-sm-12 col-xs-12 section-header wow fadeInDown">
<h2><span class="highlight-text">RESULT</span></h2>
<p class="col-md-8 col-sm-10 col-xs-12 col-md-offset-2 col-sm-offset-1">Lorem ipsum dolor sit amet,
<!-- <p class="col-md-8 col-sm-10 col-xs-12 col-md-offset-2 col-sm-offset-1">Lorem ipsum dolor sit amet,
consectetur adipisicing elit. Quod, nam corporis quas, saepe minima error aperiam dolorum
aliquam, quis deserunt eos eius quisquam odio itaque.</p>
aliquam, quis deserunt eos eius quisquam odio itaque.</p> -->
</div>
<!-- Section Header End -->
@ -567,7 +597,6 @@
<!-- Works -->
<div class="portfolio-works wow fadeIn" data-wow-duration="2s">
<!-- Filter Button Start -->
<div id="portfolio-filter" class="portfolio-filter-btn-group">
<ul>
@ -737,18 +766,18 @@
<!-- Portfolio Section End -->
<section id="info" class="info-section">
<div class="container text-xs-center">
<!-- <section id="info" class="info-section">
<div class="container text-xs-center"> -->
<!-- Section Header -->
<div class="col-md-12 col-sm-12 col-xs-12 section-header wow fadeInDown">
<!-- <div class="col-md-12 col-sm-12 col-xs-12 section-header wow fadeInDown">
<h2><span class="highlight-text">Stats</span></h2>
<p class="col-md-8 col-sm-10 col-xs-12 col-md-offset-2 col-sm-offset-1">Lorem ipsum dolor sit amet,
consectetur adipisicing elit. Quod, nam corporis quas, saepe minima error aperiam dolorum aliquam,
quis deserunt eos eius quisquam odio itaque.</p>
</div>
</div> -->
<!-- Section Header End -->
<div class="row wow fadeInUp" style="visibility: visible; animation-name: fadeInUp;">
<!-- <div class="row wow fadeInUp" style="visibility: visible; animation-name: fadeInUp;">
<div class="col-md-3 col-sm-6 col-xs-12 text-xs-center">
<i class="icon_mic_alt wow pulse" style="visibility: visible; animation-name: pulse;"></i>
@ -775,7 +804,7 @@
</div>
</div>
</div>
</section>
</section> -->
<section id="team" class="bgSection teams-section">
<div class="parallax-overlay"></div>

+ 0
- 0
style-transform-master/style-transform-master/html/js/.keep Bestand weergeven


+ 0
- 30
style-transform-master/style-transform-master/html/说明.txt Bestand weergeven

@ -1,30 +0,0 @@
==================================================================
www.baisheng999.com 免费精品模板站 打造一手精品网站模板 无门槛注册下载
==================================================================
本站力争为大家提供最好最全的网站模板、HTML5模板、Wordpress主题模板、CSS Menu等实用资源，
模板都是我们从国外大小网站收集而来，旨在为朋友们在工作或学习时提高效率、节省时间。
同时一个网站的发展也离不开大家的支持，希望各位朋友多多宣传我们的网站，谢谢。如有任何问题或者
好的建议，请给我们留言 。
关于wordpress和网站部分模板【预览演示】国内访问慢的问题，主要是调用了谷歌WEB字体，解决方法如下：
1、请使用免费VPN插件浏览，具体请百度搜索安装。
2、VPN付费翻墙插件应用，可以加速网站访问，所有网站不受限制，碰到被墙打不开的网站自动切换线路，
安装方法请自行百度！
3、wordpress模板需要到wp模板栏目下载，WordPress模板安装需要先安装WordPress程序。
==================================================================
==================================================================
使用问题：
1、由于网站大部份是英文网站，有的朋友下了某些HTML模板不知道怎么修改，可以百度Dreamweaver网站制作
软件下载安装，打开网页后即可以可视化操作修改。
2、由于低版本IE不支持HTML5和CSS3技术，对于部分HTML5模板在IE6、7、8错位问题，请使用360/搜狗浏
览器极速模式、Chrome谷歌浏览器、IE9+，FireFox浏览器等查看。
3、站内所有资源仅供学习与参考，请勿用于商业用途，否则产生的一切后果将由您自己承担！

Schrijf Voorbeeld
Laden…
Annuleren
Opslaan