Commit 9ac4950a 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 0db6d548
...@@ -109,6 +109,13 @@ $this->registerCss('[v-cloak] {display:none;}'); ...@@ -109,6 +109,13 @@ $this->registerCss('[v-cloak] {display:none;}');
turmbh = turmbw*5/9; turmbh = turmbw*5/9;
$('.video-img-box img,.play-mask').css('height',turmbh); $('.video-img-box img,.play-mask').css('height',turmbh);
$('.play-mask').css('padding-top',turmbh/2-20); $('.play-mask').css('padding-top',turmbh/2-20);
//设置主体内容最大宽度
if(justic < 1300){
$('.container').css('max-width','980px');
}
}) })
</script> </script>
......
...@@ -1599,6 +1599,9 @@ textarea.input-r-control { ...@@ -1599,6 +1599,9 @@ textarea.input-r-control {
.simditor-body { .simditor-body {
text-align: left !important; text-align: left !important;
} }
.simditor-body li, .simditor-body ol, .simditor-body ul {
list-style: inherit;
}
/*选项卡*/ /*选项卡*/
.tab-headbox { .tab-headbox {
......
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