4 Комити 215e49a4a8 ... ea0652e968

Аутор SHA1 Порука Датум
  xiesj ea0652e968 德玛西亚 пре 6 година
  xiesj bf8024aa4c Merge branch '2018zt' of http://svn.ouj.com:3000/FED/dwweb-pc into 2018zt пре 6 година
  xiesj 7d367c9c03 德玛西亚杯 пре 6 година
  xiesj 21efa3e994 德玛西亚杯 пре 6 година

+ 1 - 1
2018专题/德玛西亚杯/fis-conf.js

@@ -1,5 +1,5 @@
 var version = '';
-var path = '/zt2018/1808lolyyh/';
+var path = '/zt2018/1812demacia/';
 
 fis.set('project.files', ['*.html', 'map.json']);
 fis.set('project.exclude', ['tpl/**.tmpl', '_dest/**']);

+ 1 - 1
2018专题/德玛西亚杯/package.json

@@ -5,6 +5,6 @@
   "main": "index.js",
   "scripts": {
     "debug": "fis3 server restart && fis3 release dev -w ",
-    "build": "fis3 release prod -d ../../../pub/zt2018/1808lolyyh/"
+    "build": "fis3 release prod -d ../../../pub/zt2018/1812demacia/"
   }
 }

+ 16 - 16
2018专题/德玛西亚杯/src/_index.html

@@ -390,7 +390,7 @@
                                 <div class="team_win">
                                     <div class="team_logo team_com">
                                         <div class="team_logo_logo">
-                                            <img src="/src/img/edg.png" alt="">
+                                           
                                         </div>
                                     </div>
                                     <div class="team_name team_com">
@@ -874,42 +874,42 @@
                     <div class="allstar-pic__left">
                         <a href="http://lol.duowan.com/1810/404077990015.html">
                             <img src="http://img5.dwstatic.com/lol/1810/404078385861/1540123244017.jpg" alt="淘汰赛第二日图集:EDG已经精疲力竭">
-                            <!-- <div class="pic-hover">
+                            <div class="pic-hover">
                                 <div class="pic-title">淘汰赛第二日图集:EDG已经精疲力竭</div>
-                                <span class="pic-ver"></span>
-                            </div> -->
+                                <!-- <span class="pic-ver"></span> -->
+                            </div>
                         </a>
                     </div>
                     <div class="allstar-pic__mid">
                         <a href="http://lol.duowan.com/1811/405200109477.html" class="pic-top">
                             <img src="http://img3.dwstatic.com/lol/1811/405200811135/1541245615379.jpg" alt="S8全球总决赛决赛日图集:我们是冠军">
-                            <!-- <div class="pic-hover">
+                            <div class="pic-hover">
                                 <div class="pic-title">S8全球总决赛决赛日图集:我们是冠军</div>
-                                <span class="pic-ver"></span>
-                            </div> -->
+                                <!-- <span class="pic-ver"></span> -->
+                            </div>
                         </a>
                         <a href="http://lol.duowan.com/1810/404682790990.html" class="pic-bot ">
                             <img src="http://img2.dwstatic.com/lol/1810/404684014949/1540728818923.jpg" alt="S8总决赛出征仪式:FNC与IG相约决赛">
-                            <!-- <div class="pic-hover">
+                            <div class="pic-hover">
                                 <div class="pic-title">S8总决赛出征仪式:FNC与IG相约决赛</div>
-                                <span class="pic-ver"></span>
-                            </div> -->
+                                <!-- <span class="pic-ver"></span> -->
+                            </div>
                         </a>
                     </div>
                     <div class="allstar-pic__rig">
                         <a href="http://lol.duowan.com/1810/403717335947.html" class="pic-top">
                             <img src="http://img3.dwstatic.com/lol/1810/403717454799/1539762257571.jpg" alt="C组出线之争图集:大师兄赛后掩面哭泣">
-                            <!-- <div class="pic-hover">
+                            <div class="pic-hover">
                                 <div class="pic-title">C组出线之争图集:大师兄赛后掩面哭泣</div>
-                                <span class="pic-ver"></span>
-                            </div> -->
+                                <!-- <span class="pic-ver"></span> -->
+                            </div>
                         </a>
                         <a href="http://lol.duowan.com/1810/403990985860.html" class="pic-bot">
                             <img src="http://img5.dwstatic.com/lol/1810/403991263551/1540036066663.jpg" alt="淘汰赛第一日图集:IG的华丽成长之路">
-                            <!-- <div class="pic-hover">
+                            <div class="pic-hover">
                                 <div class="pic-title">淘汰赛第一日图集:IG的华丽成长之路</div>
-                                <span class="pic-ver"></span>
-                            </div> -->
+                                <!-- <span class="pic-ver"></span> -->
+                            </div>
                         </a>
                     </div>
                 </div>

+ 2 - 4
2018专题/德玛西亚杯/src/_wap.html

@@ -588,8 +588,7 @@
                         <span>07-09</span>
                     </a>
                 </li>
-            </ul>
-            <ul>
+         
                 <li>
                     <a href="/1807/395094192994.html" target="_blank" title="决胜日!RW临危受命RNG助LPL卫冕">
                         <h3>决胜日!RW临危受命RNG助LPL卫冕</h3>
@@ -620,8 +619,7 @@
                         <span>07-09</span>
                     </a>
                 </li>
-            </ul>
-            <ul>
+           
                 <li>
                     <a href="/1807/395094192994.html" target="_blank" title="决胜日!RW临危受命RNG助LPL卫冕">
                         <h3>决胜日!RW临危受命RNG助LPL卫冕</h3>

BIN
2018专题/德玛西亚杯/src/img/menu_active.png


+ 52 - 14
2018专题/德玛西亚杯/src/sass/global.scss

@@ -154,17 +154,20 @@ $titleFont: PingFang sc,"Helvetica Neue",Helvetica,Tahoma,Arial,"Liberation Sans
                     position: relative;
                     &:hover,
                     &.is-active {
-                        &::after{
-                            content: '';
-                            position: absolute;
-                            height: 92px;
-                            width: 100%;
-                            left: 0;
-                            top: 0;
-                        }
+                       
                         background: url(/src/img/menu_active.png) no-repeat bottom center;
-                        a{
+                        a{  
+                            position: relative;
                             color: #fff;
+                             &::after {
+                                 content: '';
+                                 position: absolute;
+                                 height: 92px;
+                                 width: 100%;
+                                 left: 0;
+                                 top: 0;
+
+                             }
                         }
                     }
                     a {
@@ -206,8 +209,8 @@ $titleFont: PingFang sc,"Helvetica Neue",Helvetica,Tahoma,Arial,"Liberation Sans
         background: #081929 url(/src/img/bg.jpg) no-repeat top center;
         .game_live {
             width: 1136px;
-            height: 474px;
             margin: 0 auto;
+            padding:  80px 0;
         }
         .mod-main{
             width: 1136px;
@@ -249,6 +252,7 @@ $titleFont: PingFang sc,"Helvetica Neue",Helvetica,Tahoma,Arial,"Liberation Sans
                                     }
                                     h3{
                                         font-size: 22px;
+                                        color: #fff;
                                         
                                     }
                                     p{
@@ -426,7 +430,10 @@ $titleFont: PingFang sc,"Helvetica Neue",Helvetica,Tahoma,Arial,"Liberation Sans
                                         i{
                                             background: $showColor;
                                         }
-                                        span,a{
+                                        span{
+                                            color: #118cb4 !important;
+                                        }
+                                        a{
                                             color: $showColor;
                                         }
                                     }
@@ -448,7 +455,7 @@ $titleFont: PingFang sc,"Helvetica Neue",Helvetica,Tahoma,Arial,"Liberation Sans
                                     span{
                                         float: right;
                                         display: block;
-                                         color: #0b384e;
+                                        color: #0b384e;
                                     }
                                     &:nth-child(6n+1) {
                                         &::before {
@@ -752,7 +759,9 @@ $titleFont: PingFang sc,"Helvetica Neue",Helvetica,Tahoma,Arial,"Liberation Sans
                                 display: inline-block;
                                 // padding: 3px 5px;
                                 background: $maincolor;
-                                color: #0b2540;
+                                a{
+                                    color: #0b2540;
+                                }
                             }
                         }
                         .team_logo{
@@ -764,6 +773,12 @@ $titleFont: PingFang sc,"Helvetica Neue",Helvetica,Tahoma,Arial,"Liberation Sans
                                border-radius: 50%;
                                overflow: hidden;
                                margin: 5px auto;
+                               background: #245065;
+                               text-align: center;
+                               img{
+                                   width: 100%;
+                                   vertical-align: top;
+                               }
                            }
                           
 
@@ -948,13 +963,36 @@ $titleFont: PingFang sc,"Helvetica Neue",Helvetica,Tahoma,Arial,"Liberation Sans
                 display: flex;
                padding-bottom: 120px;
                 a{
+                    position: relative;
                     display: block;
                     overflow: hidden;
-                      background: #f5f5f5;
+                    background: #f5f5f5;
                        img {
                            width: 100%;
                            height: 100%;
                        }
+                       .pic-hover{
+                            position: absolute;
+                            width: 100%;
+                            height: 100%;
+                            background: rgba(0, 0, 0, 00.7);
+                            top: -100%;
+                            left: 0;
+                            display: flex;
+                            align-items: center;
+                            .pic-title{
+                                text-align: center;
+                                flex: 1;
+                                font-size: 14px;
+                                color: #fff;
+                            }
+                       }
+                       &:hover{
+                            .pic-hover{
+                                top: 0;
+                                transition: all 0.2s linear;
+                            }
+                       }
                 }
                 .allstar-pic__left{
                     flex: 0 0 283px;

+ 10 - 0
2018专题/德玛西亚杯/src/sass/wap.scss

@@ -116,6 +116,16 @@ body{
             padding: 16px 0;
             border-bottom: 1px #0D516D solid;
             li{
+                &:nth-child(5n+6) {
+                    &::before {
+                        display: block;
+                        content: ' ';
+                        border-top: 1px #0D516D solid;
+                        width: 100%;
+                        padding-top: 10px;
+                        margin-top: 10px;
+                    }
+                }
                 a{
                     display: flex;
                     align-items: center;