Commit 0da7f893 authored by 汪波's avatar 汪波

Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev

# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
parent 8762a5aa
...@@ -14,29 +14,29 @@ $this->beginContent('@app/views/layouts/center.php'); ...@@ -14,29 +14,29 @@ $this->beginContent('@app/views/layouts/center.php');
<!-- Contenedor --> <!-- Contenedor -->
<ul id="accordion" class="accordion" data-route="<?=Yii::$app->controller->id?>_<?=Yii::$app->requestedAction->id?>"> <ul id="accordion" class="accordion" data-route="<?=Yii::$app->controller->id?>_<?=Yii::$app->requestedAction->id?>">
<li> <li>
<div class="link"><i class="icon-school"></i>我的课堂<i class="icon-navigate_next"></i></div> <div class="link">我的课堂<!--<i class="icon-navigate_next"></i>--></div>
<ul class="submenu"> <ul class="submenu">
<li class="RT_classes-info_index"><a href="/classes-info">课堂概况</a></li> <li class="RT_classes-info_index"><a href="/classes-info"><i class="icon-school"></i>课堂概况</a></li>
<li class="RT_teacher-manager_index RT_teacher-manager_edit RT_teacher-manager_add"><a href="/teacher-manager">讲师管理</a></li> <li class="RT_teacher-manager_index RT_teacher-manager_edit RT_teacher-manager_add"><a href="/teacher-manager"><i class="icon-folder_shared"></i>讲师管理</a></li>
</ul> </ul>
</li> </li>
<li> <li>
<div class="link"><i class="icon-play_circle_outline"></i>我的课程<i class="icon-navigate_next"></i></div> <div class="link">我的课程</div>
<ul class="submenu"> <ul class="submenu">
<li class="RT_my-course_publish RT_my-course_edit"><a href="/my-course/publish">发布课程</a></li> <li class="RT_my-course_publish RT_my-course_edit"><a href="/my-course/publish"><i class="icon-create_new_folder"></i>发布课程</a></li>
<li class="RT_my-course_index"><a href="/my-course">课程列表</a></li> <li class="RT_my-course_index"><a href="/my-course"><i class="icon-assignment"></i>课程列表</a></li>
</ul> </ul>
</li> </li>
<li> <li>
<div class="link"><i class="icon-person_pin"></i>我的会员<i class="icon-navigate_next"></i></div> <div class="link">我的会员</div>
<ul class="submenu"> <ul class="submenu">
<li class="RT_my-member_index"><a href="/my-member">会员列表</a></li> <li class="RT_my-member_index"><a href="/my-member"><i class="icon-person_pin"></i>会员列表</a></li>
</ul> </ul>
</li> </li>
<li> <li>
<div class="link"><i class="icon-layers"></i>知识有价<i class="icon-navigate_next"></i></div> <div class="link">知识有价</div>
<ul class="submenu"> <ul class="submenu">
<li class="RT_my-income_index"><a href="/my-income">购买记录</a></li> <li class="RT_my-income_index"><a href="/my-income"><i class="icon-shop"></i>购买记录</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
......
...@@ -21,7 +21,7 @@ AppAsset::addScript($this, '@web/assets/my_income.js'); ...@@ -21,7 +21,7 @@ AppAsset::addScript($this, '@web/assets/my_income.js');
<div class="clearfix"> <div class="clearfix">
<div class="band-wx-info pull-left"><img src="<?=SettleAccountWeixin::headResize($account['headimgurl'], SettleAccountWeixin::HEAD_SIZE_S)?>"> <div class="band-wx-info pull-left"><img src="<?=SettleAccountWeixin::headResize($account['headimgurl'], SettleAccountWeixin::HEAD_SIZE_S)?>">
<span><?=Html::encode($account['nickname'])?></span></div> <span><?=Html::encode($account['nickname'])?></span></div>
<button class="btn btn-default pull-left" @click="weixinUnbindClick">取消绑定</button> <button class="btn btn-link pull-left" @click="weixinUnbindClick">取消绑定</button>
</div> </div>
<?php } else { ?> <?php } else { ?>
<button type="button" class="btn btn-save" @click="weixinBindClick">绑定</button> <button type="button" class="btn btn-save" @click="weixinBindClick">绑定</button>
......
...@@ -826,6 +826,12 @@ a,a:hover,a:link { ...@@ -826,6 +826,12 @@ a,a:hover,a:link {
border-top: 1px solid #f3f3f3; border-top: 1px solid #f3f3f3;
z-index: 10 z-index: 10
} }
.logo {
margin-left: 15px;
}
.avatar {
padding-right: 15px;
}
} }
/*分享样式修改*/ /*分享样式修改*/
......
...@@ -255,15 +255,39 @@ i, em { ...@@ -255,15 +255,39 @@ i, em {
.icon-zan-full:before { .icon-zan-full:before {
content: "\e905"; content: "\e905";
} }
.icon-alarm:before {
content: "\e855";
}
.icon-access_alarms:before {
content: "\e191";
}
.icon-account_box:before {
content: "\e851";
}
.icon-add:before { .icon-add:before {
content: "\e145"; content: "\e145";
} }
.icon-add_to_queue:before {
content: "\e05c";
}
.icon-alarm_on:before {
content: "\e858";
}
.icon-arrow_drop_down:before { .icon-arrow_drop_down:before {
content: "\e5c5"; content: "\e5c5";
} }
.icon-arrow_drop_up:before { .icon-arrow_drop_up:before {
content: "\e5c7"; content: "\e5c7";
} }
.icon-assignment:before {
content: "\e85d";
}
.icon-assignment_ind:before {
content: "\e85e";
}
.icon-assignment_turned_in:before {
content: "\e862";
}
.icon-chat:before { .icon-chat:before {
content: "\e0b7"; content: "\e0b7";
} }
...@@ -285,9 +309,15 @@ i, em { ...@@ -285,9 +309,15 @@ i, em {
.icon-cloud_download:before { .icon-cloud_download:before {
content: "\e2c0"; content: "\e2c0";
} }
.icon-cloud_queue:before {
content: "\e2c2";
}
.icon-palette:before { .icon-palette:before {
content: "\e40a"; content: "\e40a";
} }
.icon-contacts:before {
content: "\e0ba";
}
.icon-mode_edit:before { .icon-mode_edit:before {
content: "\e254"; content: "\e254";
} }
...@@ -306,6 +336,18 @@ i, em { ...@@ -306,6 +336,18 @@ i, em {
.icon-fingerprint:before { .icon-fingerprint:before {
content: "\e90d"; content: "\e90d";
} }
.icon-folder_shared:before {
content: "\e2c9";
}
.icon-lock2:before {
content: "\e897";
}
.icon-local_cafe:before {
content: "\e541";
}
.icon-local_florist:before {
content: "\e545";
}
.icon-ondemand_video:before { .icon-ondemand_video:before {
content: "\e63a"; content: "\e63a";
} }
...@@ -342,6 +384,9 @@ i, em { ...@@ -342,6 +384,9 @@ i, em {
.icon-verified_user:before { .icon-verified_user:before {
content: "\e8e8"; content: "\e8e8";
} }
.icon-zoom_out_map:before {
content: "\e56b";
}
.icon-eye:before { .icon-eye:before {
content: "\e000"; content: "\e000";
} }
......
...@@ -29,6 +29,9 @@ a:link,a:active,a:visited { ...@@ -29,6 +29,9 @@ a:link,a:active,a:visited {
.tit { .tit {
font-size: 16px; font-size: 16px;
} }
.btn {
outline: none;
}
/*side bar*/ /*side bar*/
...@@ -66,12 +69,12 @@ a:link,a:active,a:visited { ...@@ -66,12 +69,12 @@ a:link,a:active,a:visited {
width: 100%; width: 100%;
} }
.accordion .link { .accordion .link {
cursor: pointer;
display: block; display: block;
padding: 15px 15px 15px 42px; padding: 15px 15px 5px 10px;
color: #7fa6ad; color: #7fa6ad;
font-size: 14px; font-size: 12px;
position: relative; position: relative;
-webkit-transition: all 0.4s ease; -webkit-transition: all 0.4s ease;
-o-transition: all 0.4s ease; -o-transition: all 0.4s ease;
...@@ -82,16 +85,6 @@ a:link,a:active,a:visited { ...@@ -82,16 +85,6 @@ a:link,a:active,a:visited {
.accordion li:last-child .link { .accordion li:last-child .link {
border-bottom: 0; border-bottom: 0;
} }
.accordion li i {
position: absolute;
top: 16px;
left: 12px;
font-size: 18px;
color: #7fa6ad;
-webkit-transition: all 0.4s ease;
-o-transition: all 0.4s ease;
transition: all 0.4s ease;
}
.accordion li i.icon-navigate_next { .accordion li i.icon-navigate_next {
right: 12px; right: 12px;
...@@ -125,17 +118,33 @@ a:link,a:active,a:visited { ...@@ -125,17 +118,33 @@ a:link,a:active,a:visited {
} }
.submenu li { .submenu li {
position: relative;
width: 100%; width: 100%;
} }
.submenu li a {
border-left: 2px solid transparent;
}
.submenu li i {
position: absolute;
top: 14px;
left: 14px;
font-size: 18px;
color: #7fa6ad;
-webkit-transition: all 0.4s ease;
-o-transition: all 0.4s ease;
transition: all 0.4s ease;
}
.submenu li.active a { .submenu li.active a {
color: #7fc1fc; background-color: #313a46;
border-left: 2px solid #607ca1;
color: #fff;
} }
.submenu a { .submenu a {
display: block; display: block;
text-decoration: none; text-decoration: none;
color: #fff; color: #fff;
padding: 12px 12px 12px 42px; padding: 12px 12px 12px 38px;
-webkit-transition: all 0.25s ease; -webkit-transition: all 0.25s ease;
-o-transition: all 0.25s ease; -o-transition: all 0.25s ease;
transition: all 0.25s ease; transition: all 0.25s ease;
...@@ -868,7 +877,7 @@ textarea.input-r-control { ...@@ -868,7 +877,7 @@ textarea.input-r-control {
font-size: 12px; font-size: 12px;
padding-top: 8px; padding-top: 8px;
} }
.upload-ready i { .upload-ready > i {
position: absolute; position: absolute;
left: 0; left: 0;
bottom: 0; bottom: 0;
...@@ -878,6 +887,43 @@ textarea.input-r-control { ...@@ -878,6 +887,43 @@ textarea.input-r-control {
border-radius: 0 0 0 3px; border-radius: 0 0 0 3px;
background-color: #4285f4; background-color: #4285f4;
} }
.upload-ready a.delete {
position: absolute;
right: 5px;
top: 5px;
display: inline-block;
width: 20px;
height: 20px;
border-radius: 100%;
color: #666;
text-align: center;
line-height: 20px;
}
.upload-ready a.delete i {
color: #999;
font-size: 12px;
}
.upload-ready a.delete:hover i {
color: #333;
}
.upload-ready .tip-upload-rdy {
position: absolute;
left: 0;
top: 0;
background-color: rgba(255,133,0,.8);
color: #fff;
display: inline-block;
width: 300px;
height: 90px;
font-size: 12px;
border-radius: 3px;
text-align: center;
}
.upload-ready .tip-upload-rdy i {
font-size: 18px;
display: block;
padding: 20px 0 10px 5px;
}
.cls-intro-textarea { .cls-intro-textarea {
margin-top: 10px; margin-top: 10px;
} }
......
This diff is collapsed.
...@@ -16,6 +16,13 @@ ...@@ -16,6 +16,13 @@
<div class="time pull-right">大约还剩 <span class="upload-info-remain">{{remain}}</span></div> <div class="time pull-right">大约还剩 <span class="upload-info-remain">{{remain}}</span></div>
</div> </div>
<i class="upload-progress" v-bind:style="{width:progress + '%'}"></i> <i class="upload-progress" v-bind:style="{width:progress + '%'}"></i>
<!--上传完成-->
<!--
<span class="tip-upload-rdy"><i class="icon-check"></i>上传完成</span>
-->
<a href="#" class="delete"><i class="icon-cross"></i></a>
</div> </div>
</div> </div>
</template> </template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment