Skip to content

M
mr-julyedu
Commit d46c0810 by xuzhenghua
Options

样式优话

parent 3019c4e7
Showing with 49 additions and 18 deletions
src/assets/font/iconfont.eot 100755 → 100644
No preview for this file type
src/assets/font/iconfont.js 100755 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/font/iconfont.ttf 100755 → 100644
No preview for this file type
src/assets/font/iconfont.woff 100755 → 100644
No preview for this file type
src/assets/font/iconfont.woff2 100755 → 100644
No preview for this file type
src/common/Course/course.scss
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
margin-top: 15px; margin-top: 15px;
margin-bottom: 5px; margin-bottom: 5px;
position: relative; position: relative;
img { img {
width: 100%; width: 100%;
height: 119px; height: 119px;
min-height: 119px; min-height: 119px;
border-radius: 4px; border-radius: 4px;
vertical-align: bottom;
} }
.course-status{ .course-status{
width: 100%; width: 100%;
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
} }
.course-title { .course-title {
height: 45px;
font-size: 14px; font-size: 14px;
color: $color_525B65; color: $color_525B65;
min-height: 38px; min-height: 38px;
......
src/common/HeaderBar/index.scss
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
text-align: center; text-align: center;
i { i {
font-size: 22px !important; font-size: 20px !important;
} }
i:nth-of-type(1) { i:nth-of-type(1) {
......
src/common/HeaderSearch/index.scss
...@@ -24,6 +24,6 @@ ...@@ -24,6 +24,6 @@
} }
.shopping-cart, .return { .shopping-cart, .return {
font-size: 18px !important; font-size: 20px;
} }
} }
\ No newline at end of file
src/common/NavBar/index.js
...@@ -52,6 +52,7 @@ const NavBar = React.memo(({location}) => { ...@@ -52,6 +52,7 @@ const NavBar = React.memo(({location}) => {
) )
}) })
} }
<div className={'click-able'}></div>
</div> </div>
) )
}) })
......
src/common/NavBar/index.scss
...@@ -7,30 +7,36 @@ ...@@ -7,30 +7,36 @@
left: 0; left: 0;
z-index: 50; z-index: 50;
background: $white; background: $white;
border-top: 1px solid #ddd; //border-top: 1px solid #ddd;
.index-icon { .index-icon {
background-image: url("./image/grey_sy_icon.png"); background-image: url("./image/grey_sy_icon.png");
} }
.index-icon-active { .index-icon-active {
background-image: url("./image/sy_icon.png"); background-image: url("./image/sy_icon.png");
} }
.classify-icon{ .classify-icon {
background-image: url("./image/grey_liebiao_ed_icon.png"); background-image: url("./image/grey_liebiao_ed_icon.png");
} }
.classify-icon-active { .classify-icon-active {
background-image: url("./image/liebiao_ed_icon.png"); background-image: url("./image/liebiao_ed_icon.png");
} }
.study-icon { .study-icon {
background-image: url("./image/grey_study_icon.png"); background-image: url("./image/grey_study_icon.png");
} }
.study-icon-active { .study-icon-active {
background-image: url("./image/study_icon.png"); background-image: url("./image/study_icon.png");
} }
.my-icon { .my-icon {
background-image: url("./image/grey_my_icon.png"); background-image: url("./image/grey_my_icon.png");
} }
.my-icon-active { .my-icon-active {
background-image: url("./image/my.png"); background-image: url("./image/my.png");
} }
...@@ -60,6 +66,16 @@ ...@@ -60,6 +66,16 @@
color: $active; color: $active;
} }
} }
&:after {
content: " ";
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 1px;
background-image: linear-gradient(0deg, #ddd 50%, transparent 50%);
}
} }
......
src/components/intelligent-recommend/index.scss
...@@ -32,9 +32,8 @@ ...@@ -32,9 +32,8 @@
} }
.iconfont { .iconfont {
font-size: 16px; font-size: 20px;
color: #222; color: #222;
font-weight: 600;
} }
.title { .title {
......
src/components/preferential/index.scss
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
img { img {
width: 100%; width: 100%;
height: 100%;
} }
.course-status { .course-status {
......
src/components/search/search-result.scss
...@@ -85,5 +85,6 @@ ...@@ -85,5 +85,6 @@
font-size: 13px; font-size: 13px;
color: $white; color: $white;
background-color: rgba(224, 46, 36, 0.6); background-color: rgba(224, 46, 36, 0.6);
border-radius: 0 0 4px 4px;
} }
} }
\ No newline at end of file
src/components/search/search_header.scss
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
display: block; display: block;
padding: 15px; padding: 15px;
} }
.iconfont {
font-size: 20px;
}
} }
.center { .center {
...@@ -32,6 +36,8 @@ ...@@ -32,6 +36,8 @@
border-radius:13px; border-radius:13px;
color: #333; color: #333;
font-size: 12px; font-size: 12px;
outline: none;
background-color: #fff;
} }
} }
......
src/components/video/video-catalog/index.js
...@@ -28,9 +28,7 @@ class VideoCatalog extends Component { ...@@ -28,9 +28,7 @@ class VideoCatalog extends Component {
<span className="title text-overflow-2">{item.name}</span> <span className="title text-overflow-2">{item.name}</span>
{/*<span className='duration'>{item.duration}</span>*/} {/*<span className='duration'>{item.duration}</span>*/}
<i className={classnames(`iconfont`, <i className={classnames(`iconfont`,
[item.video_auth === 0 [item.video_auth === 0 ? 'iconRectangleCopy1' : this.props.activeIndex === index ? 'iconcelluar':'icontimeout'],
? 'iconiconfront-74'
: 'iconplay_hovericon'],
)}/> )}/>
</div> </div>
{ {
...@@ -44,7 +42,7 @@ class VideoCatalog extends Component { ...@@ -44,7 +42,7 @@ class VideoCatalog extends Component {
}}> }}>
<div className="exercise"> <div className="exercise">
<span className={'text-overflow-one'}>课后练习：{item.practice.title}</span> <span className={'text-overflow-one'}>课后练习：{item.practice.title}</span>
<i className={classnames('iconfont', item.practice.is_tested ? 'iconiconfront-3' : '')}/> <i className={classnames('iconfont', item.practice.is_tested ? 'iconRectangleCopy' : '')}/>
</div> </div>
</Link> </Link>
: null : null
...@@ -52,7 +50,7 @@ class VideoCatalog extends Component { ...@@ -52,7 +50,7 @@ class VideoCatalog extends Component {
<a href="javascript:void(0)"> <a href="javascript:void(0)">
<div className="exercise"> <div className="exercise">
<span className={'text-overflow-one'}>课后练习：{item.practice.title}</span> <span className={'text-overflow-one'}>课后练习：{item.practice.title}</span>
<i className={classnames('iconfont','iconiconfront-74')}/> <i className={classnames('iconfont','iconRectangleCopy1')}/>
</div> </div>
</a> </a>
) )
...@@ -67,14 +65,14 @@ class VideoCatalog extends Component { ...@@ -67,14 +65,14 @@ class VideoCatalog extends Component {
}} key={index}> }} key={index}>
<div className="exercise"> <div className="exercise">
<span className={'text-overflow-one'}>课后练习：{commonItem.title}</span> <span className={'text-overflow-one'}>课后练习：{commonItem.title}</span>
<i className={classnames('iconfont',commonItem.is_tested ? 'iconiconfront-3' : '')}/> <i className={classnames('iconfont',commonItem.is_tested ? 'iconRectangleCopy' : '')}/>
</div> </div>
</Link> </Link>
) : ( ) : (
<a href="javascript:void(0)"> <a href="javascript:void(0)">
<div className="exercise"> <div className="exercise">
<span className={'text-overflow-one'}>课后练习：{commonItem.title}</span> <span className={'text-overflow-one'}>课后练习：{commonItem.title}</span>
<i className={classnames('iconfont','iconiconfront-74')}/> <i className={classnames('iconfont','iconRectangleCopy1')}/>
</div> </div>
</a> </a>
) )
......
src/components/video/video-catalog/video-catalog.scss
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
} }
.exercise{ .exercise{
font-size: $font_12; font-size: $font_12;
.iconiconfront-3{ .iconRectangleCopy{
font-weight: bold; font-weight: 500;
color: $active; color: $active;
} }
} }
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
align-items: center; align-items: center;
.iconfont{ .iconfont{
font-size: 15px; font-size: 18px;
} }
} }
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
margin-bottom: 15px; margin-bottom: 15px;
} }
.iconfont { .iconfont {
font-size: 16px; font-size: 18px;
} }
} }
} }
...@@ -83,4 +83,9 @@ ...@@ -83,4 +83,9 @@
.iconplay_hovericon{ .iconplay_hovericon{
color: $active; color: $active;
} }
.icontimeout {
font-size: 20px!important;
color: $active;
}
} }
\ No newline at end of file
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