Authored by 毕凯

侧边栏 样式调整

@@ -7,20 +7,40 @@ @@ -7,20 +7,40 @@
7 left: 0; 7 left: 0;
8 right: 100rem / $pxConvertRem; 8 right: 100rem / $pxConvertRem;
9 width: 540rem / $pxConvertRem; 9 width: 540rem / $pxConvertRem;
  10 + background: #f0f0f0;
10 overflow: hidden; 11 overflow: hidden;
  12 + overflow-y: auto;
11 @include transition(all .3s); 13 @include transition(all .3s);
12 14
13 - ul {  
14 - background: #f0f0f0; 15 + > ul {
  16 + margin-bottom: 20rem / $pxConvertRem;
  17 + background: #fff;
  18 + border-top: 1px solid #e0e0e0;
  19 + border-bottom: 1px solid #e0e0e0;
15 } 20 }
16 21
17 li { 22 li {
18 position: relative; 23 position: relative;
19 - height: 128rem / $pxConvertRem;  
20 - line-height: 128rem / $pxConvertRem;  
21 - border-bottom: 1px solid #e0e0e0; 24 + height: 80rem / $pxConvertRem;
  25 + line-height: 80rem / $pxConvertRem;
22 background: #fff; 26 background: #fff;
23 27
  28 + &:after {
  29 + content: '';
  30 + position: absolute;
  31 + right: 0;
  32 + bottom: 0;
  33 + width: 430rem / $pxConvertRem;
  34 + height: 0;
  35 + border-top: 1px solid #e0e0e0;
  36 + }
  37 +
  38 + &:last-child {
  39 + &:after {
  40 + content: none;
  41 + }
  42 + }
  43 +
24 a { 44 a {
25 display: block; 45 display: block;
26 height: 100%; 46 height: 100%;
@@ -29,6 +49,15 @@ @@ -29,6 +49,15 @@
29 font-size: 24rem / $pxConvertRem; 49 font-size: 24rem / $pxConvertRem;
30 } 50 }
31 51
  52 + .title {
  53 + display: inline-block;
  54 + padding-left: 10rem / $pxConvertRem;
  55 + font-size: 30rem / $pxConvertRem;
  56 + vertical-align: baseline;
  57 + // 此处字体小于 12px, 先扩大,再scale缩小
  58 + @include transform(scale(0.75));
  59 + }
  60 +
32 .nav-icon, .nav-img { 61 .nav-icon, .nav-img {
33 position: absolute; 62 position: absolute;
34 width: 60rem / $pxConvertRem; 63 width: 60rem / $pxConvertRem;
@@ -51,9 +80,38 @@ @@ -51,9 +80,38 @@
51 } 80 }
52 81
53 em { 82 em {
54 - margin-right: 10rem / $pxConvertRem;  
55 font-weight: bold; 83 font-weight: bold;
56 - font-size: 34rem / $pxConvertRem; 84 + font-size: 30rem / $pxConvertRem;
  85 + }
  86 + }
  87 +
  88 + .first {
  89 +
  90 + li {
  91 + height: 100rem / $pxConvertRem;
  92 + line-height: 100rem / $pxConvertRem;
  93 + border-bottom: 1px solid #e0e0e0;
  94 +
  95 + &:last-child {
  96 + border-bottom: none;
  97 + }
  98 +
  99 + &:after {
  100 + content: none;
  101 + }
  102 +
  103 + a {
  104 + font-size: 40rem / $pxConvertRem;
  105 + }
  106 +
  107 + em {
  108 + font-size: 40rem / $pxConvertRem;
  109 + }
  110 +
  111 + .title {
  112 + font-size: 24rem / $pxConvertRem;
  113 + @include transform(scale(1));
  114 + }
57 } 115 }
58 } 116 }
59 117
@@ -85,17 +143,17 @@ @@ -85,17 +143,17 @@
85 } 143 }
86 } 144 }
87 145
88 - li.new {  
89 - margin: (19rem / $pxConvertRem) 0 0;  
90 - border-top: 1px solid #e0e0e0;  
91 -  
92 - a {}  
93 -  
94 - i {  
95 - background: image-url("side-nav/new.png") no-repeat left center;  
96 - background-size: 100% 100%;  
97 - }  
98 - } 146 + // li.new {
  147 + // margin: (19rem / $pxConvertRem) 0 0;
  148 + // border-top: 1px solid #e0e0e0;
  149 + //
  150 + // a {}
  151 + //
  152 + // i {
  153 + // background: image-url("side-nav/new.png") no-repeat left center;
  154 + // background-size: 100% 100%;
  155 + // }
  156 + // }
99 157
100 li.guang, li.trendfinder { 158 li.guang, li.trendfinder {
101 .nav-icon { 159 .nav-icon {
@@ -126,13 +184,17 @@ @@ -126,13 +184,17 @@
126 height: 109rem / $pxConvertRem; 184 height: 109rem / $pxConvertRem;
127 line-height: 109rem / $pxConvertRem; 185 line-height: 109rem / $pxConvertRem;
128 border: none; 186 border: none;
  187 + border-bottom: 1px solid #e0e0e0;
  188 +
  189 + &:after {
  190 + content: none;
  191 + }
129 192
130 a { 193 a {
131 position: relative; 194 position: relative;
132 display: block; 195 display: block;
133 margin: 0 0 0 (30rem / $pxConvertRem); 196 margin: 0 0 0 (30rem / $pxConvertRem);
134 padding-left: 50rem / $pxConvertRem; 197 padding-left: 50rem / $pxConvertRem;
135 - border-bottom: 1px solid #e0e0e0;  
136 font-size: 36rem / $pxConvertRem; 198 font-size: 36rem / $pxConvertRem;
137 z-index: 2; 199 z-index: 2;
138 } 200 }
1 <div class="side-nav"> 1 <div class="side-nav">
2 {{# sideNav}} 2 {{# sideNav}}
3 - <ul> 3 + <ul {{#if @first}}class="first"{{/if}}>
4 {{# this}} 4 {{# this}}
5 - <li class="{{styleClass}}"> 5 + <li class="{{styleClass}}" style="{{#if color}}color:{{color}};{{/if}}">
6 {{# url}} 6 {{# url}}
7 <a href="{{.}}"> 7 <a href="{{.}}">
8 {{/ url}} 8 {{/ url}}
@@ -15,7 +15,8 @@ @@ -15,7 +15,8 @@
15 {{^ img}} 15 {{^ img}}
16 <i class="nav-icon"></i> 16 <i class="nav-icon"></i>
17 {{/ img}} 17 {{/ img}}
18 - <em>{{textCn}}</em>{{textEn}} 18 + <em>{{textCn}}</em>
  19 + <span class="title">{{textEn}}</span>
19 {{# subNav}} 20 {{# subNav}}
20 <span class="enter-subnav iconfont">&#xe614;</span> 21 <span class="enter-subnav iconfont">&#xe614;</span>
21 {{/ subNav}} 22 {{/ subNav}}
@@ -23,7 +24,7 @@ @@ -23,7 +24,7 @@
23 {{# subNav}} 24 {{# subNav}}
24 <ul class="sub-nav"> 25 <ul class="sub-nav">
25 {{# list}} 26 {{# list}}
26 - <li class="{{# isSelect}}current{{/ isSelect}}" style="background-color:{{bgColor}}"> 27 + <li class="{{# isSelect}}current{{/ isSelect}}" style="background-color:{{bgColor}};{{#if color}}color:{{color}};{{/if}}">
27 {{# url}} 28 {{# url}}
28 <a href="{{.}}"> 29 <a href="{{.}}">
29 {{/ url}} 30 {{/ url}}
@@ -37,7 +38,7 @@ @@ -37,7 +38,7 @@
37 <i class="nav-back iconfont">&#xe610;</i> 38 <i class="nav-back iconfont">&#xe610;</i>
38 {{/ back}} 39 {{/ back}}
39 <em>{{textCn}}</em> 40 <em>{{textCn}}</em>
40 - {{textEn}} 41 + <span class="title">{{textEn}}</span>
41 </a> 42 </a>
42 </li> 43 </li>
43 {{/ list}} 44 {{/ list}}
@@ -47,4 +48,4 @@ @@ -47,4 +48,4 @@
47 {{/ this}} 48 {{/ this}}
48 </ul> 49 </ul>
49 {{/sideNav}} 50 {{/sideNav}}
50 -</div>  
  51 +</div>
@@ -8,7 +8,7 @@ use Plugin\Helpers; @@ -8,7 +8,7 @@ use Plugin\Helpers;
8 use Plugin\Cache; 8 use Plugin\Cache;
9 9
10 /** 10 /**
11 - * 11 + *
12 * @name SideModel 12 * @name SideModel
13 * @package models/Index 13 * @package models/Index
14 * @copyright yoho.inc 14 * @copyright yoho.inc
@@ -20,7 +20,7 @@ class SideModel @@ -20,7 +20,7 @@ class SideModel
20 20
21 /** 21 /**
22 * 获取左侧边栏数据 22 * 获取左侧边栏数据
23 - * 23 + *
24 * @param string $guangChoosed 逛默认选中项 "all"表示全部,"boys":只看男生,"girls":只看女生 24 * @param string $guangChoosed 逛默认选中项 "all"表示全部,"boys":只看男生,"girls":只看女生
25 */ 25 */
26 public static function getLeftNav($guangChoosed = 'all') 26 public static function getLeftNav($guangChoosed = 'all')
@@ -88,13 +88,12 @@ class SideModel @@ -88,13 +88,12 @@ class SideModel
88 88
89 // 追加逛的子分类数据 89 // 追加逛的子分类数据
90 $result[] = self::genLeftNavGuang($guangChoosed); 90 $result[] = self::genLeftNavGuang($guangChoosed);
91 -  
92 return $result; 91 return $result;
93 } 92 }
94 93
95 /** 94 /**
96 * 获取并生成左侧边栏中逛的数据 95 * 获取并生成左侧边栏中逛的数据
97 - * 96 + *
98 * @param string $guangChoosed 逛默认选中项 "all"表示全部,"boys":只看男生,"girls":只看女生 97 * @param string $guangChoosed 逛默认选中项 "all"表示全部,"boys":只看男生,"girls":只看女生
99 * @return array 98 * @return array
100 */ 99 */