fe / yoho-blk · Commits

Go to a project

Authored by 石坚
Commit 00d1301d5f32812625e1e303ec1cfe522f81a50a 1 parent c490ee08

blk标题样式修改2

Inline Side-by-side
Showing 4 changed files with 4 additions and 1203 deletions
... ... @@ -22,10 +22,10 @@ module.exports = {
},
cookieDomain: 'yohoblk.com',
domains: {
// singleApi: 'http://192.168.102.31:8092/brower',
api: 'http://testapi.yoho.cn:28078/',
service: 'http://testservice.yoho.cn:28077/',
singleApi: 'http://192.168.102.31:8092/'
singleApi: 'http://192.168.102.31:8092/',
api: 'http://api.yoho.yohoops.org/',
service: 'http://service.yoho.yohoops.org/',
search: 'http://192.168.102.216:8080/yohosearch/'
},
useOneapm: false,
useCache: false,
... ...
<<<<<<< HEAD
.brand-page {
padding-bottom: 80px;
.brands-tabs {
position: relative;
margin-bottom: 20px;
overflow: hidden;
height: 304px;
a {
display: block;
width: 370px;
height: 304px;
img {
width: 100%;
height: 100%;
display: block;
}
.g-mask {
width: 100%;
height: 100%;
display: block;
position: absolute;
z-index: 1;
background: #ffec07;
border: 1px solid #ffec07;
opacity: 0;
}
}
li {
float: left;
margin-left: 20px;
position: relative;
p {
display: block;
font-size: 30px;
text-align: center;
color: #ffec07;
position: absolute;
top: 50%;
width: 100%;
margin-top: -15px;
z-index: 3;
}
}
li:first-child {
margin-left: 0;
}
li:hover {
.g-mask {
opacity: 0.3;
}
}
}
.category-nav {
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
width: 1150px;
height: 44px;
line-height: 44px;
font-size: 12px;
font-weight: bold;
position: relative;
z-index: 100;
background-color: #fff;
overflow: hidden;
a {
display: inline-block;
padding-left: 29px;
text-align: center;
color: #222;
cursor: pointer;
font-size: 14px;
}
}
.brands-list {
dt {
height: 58px;
line-height: 58px;
font-weight: bold;
font-size: 16px;
}
dd {
width: 1180px;
li {
float: left;
display: block;
width: 275px;
height: 250px;
margin-right: 15px;
border: 1px solid #eee;
margin-top: 20px;
}
li:nth-child(-n+4) {
margin-top: 0;
}
a {
font-size: 16px;
display: block;
width: 100%;
height: 100%;
img {
width: 275px;
height: 190px;
}
span {
display: block;
height: 60px;
line-height: 60px;
text-align: center;
font-size: 16px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
}
}
}
.category-fix {
position: fixed;
top: 0;
z-index: 100;
margin-top: 0 !important;
}
}
=======
.brand-page {
padding-bottom: 80px;
... ... @@ -282,4 +139,3 @@
margin-top: 0 !important;
}
}
>>>>>>> fdb22f3939ca93c7a170f5f00241d413ae2905d7
... ...
<<<<<<< HEAD
.editorial-detail-page {
width: 990px;
.detail-body {
width: 990px;
margin: 30px auto;
}
.detail-title {
font-size: 24px;
text-align: center;
line-height: 40px;
word-wrap: break-word;
}
.article-info {
width: 580px;
margin: 10px auto;
clear: both;
margin-bottom: 20px;
}
.article-author {
float: left;
line-height: 64px;
}
.author-avatar {
width: 45px;
height: 64px;
a {
text-decoration: none;
color: #000;
vertical-align: middle;
}
img {
width: 38px;
height: 38px;
border-radius: 50%;
margin-top: 13px;
}
}
.author-info {
float: left;
margin-left: 10px;
font-size: 14px;
max-width: 447px;
}
.author-name {
display: block;
height: 64px;
line-height: 64px;
cursor: pointer;
color: #000;
margin-right: 100px;
}
.author-name:hover {
color: #c30;
}
.article-status {
height: 64px;
line-height: 64px;
color: #999;
font-size: 14px;
span {
margin-right: 30px;
}
}
.article-main {
text-align: center;
margin: 0 auto;
}
.article-pict {
max-width: 930px;
margin: 0 auto;
overflow: hidden;
display: block;
img {
max-width: 930px;
display: inherit;
margin: auto;
}
}
.article-pictwo {
max-width: 930px;
margin: 0 auto;
overflow: hidden;
display: block;
img {
display: inline-block;
max-width: 460px;
margin-right: 2px;
}
}
.article-text {
width: 700px;
margin: 25px auto;
p {
text-align: center;
display: block;
width: 700px;
font-size: 14px;
margin: 25px auto;
line-height: 24px;
}
}
.related-reco {
width: 990px;
padding-top: 30px;
overflow: hidden;
position: relative;
.collocation {
margin-left: 30px;
}
.btn {
position: relative;
}
.btn-left {
position: absolute;
display: block;
width: 30px;
height: 50px;
left: 0;
top: 200px;
color: #fff;
background: #ccc;
text-align: center;
line-height: 50px;
cursor: pointer;
}
.left:hover {
background: #7f7f7f;
}
.right:hover {
background: #7f7f7f;
}
.btn-right {
position: absolute;
display: block;
width: 30px;
height: 50px;
right: 0;
top: 200px;
color: #fff;
background: #ccc;
text-align: center;
line-height: 50px;
cursor: pointer;
}
}
.related-group {
position: relative;
height: 450px;
}
.related-groups {
width: 930px;
overflow: hidden;
position: relative;
height: 420px;
margin-left: 30px;
}
.related-goods {
padding-top: 60px;
.good-info {
width: 219px;
float: left;
margin: 0 18px 15px 0;
img {
width: 219px;
height: 295px;
}
.name {
font-size: 12px;
line-height: 30px;
height: 30px;
overflow: hidden;
display: block;
text-overflow: ellipsis;
white-space: nowrap;
text-align: center;
}
.price {
display: block;
line-height: 30px;
height: 30px;
text-align: center;
}
}
}
.goods {
height: 420px;
overflow: hidden;
position: absolute;
.good-info:nth-child(4n) {
margin-right: 0;
}
}
.related-brand {
margin-top: 30px;
}
.brands {
width: 975px;
padding: 30px 0 0 30px;
overflow: hidden;
}
.brand {
margin: 35px 15px 0 0;
float: left;
.thumb {
display: table-cell;
border: 1px solid #f5f5f5;
height: 120px;
width: 120px;
box-sizing: border-box;
text-align: center;
vertical-align: middle;
img {
display: block;
max-width: 120px;
max-height: 120px;
margin: 0 auto;
}
}
.brand-name {
width: 120px;
height: 30px;
font-size: 12px;
line-height: 30px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
text-align: center;
color: #333;
}
}
.brand:nth-child(7n) {
margin-right: 0;
}
.user-handle {
float: right;
ul {
display: inline-block;
li {
float: left;
margin: 0 15px;
cursor: pointer;
a {
position: relative;
display: block;
padding: 0 10px;
height: 36px;
line-height: 36px;
color: #535353;
font-size: 0;
text-align: left;
}
span {
display: inline-block;
font-style: normal;
font-size: 14px;
}
i {
display: inline-block;
font-style: normal;
margin: 0 5px 0 0;
font-size: 20px;
opacity: 0.5;
}
}
.cancel-collect {
display: none;
}
.like-status.liked i,
.like-status.hover i {
opacity: 1;
}
.like-statis.hover .like-num {
color: #000;
}
.sort-collect a {
i {
width: 21px;
}
}
.sort-collect.collected a {
i {
opacity: 1;
}
.cancel-collect {
display: inline;
}
}
.sort-collect.hover i {
opacity: 1;
}
.sort-collect.hover span {
color: #000;
}
}
}
.article-tag {
float: left;
width: 940px;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
padding: 20px 0 20px 10px;
overflow: hidden;
margin-left: 30px;
.tag-icon {
float: left;
margin: 0 12px 0 0;
font-size: 20px;
font-style: normal;
}
ul {
float: left;
width: 890px;
li {
float: left;
margin: 0 10px 10px 0;
a {
display: block;
text-align: center;
width: 70px;
height: 30px;
line-height: 30px;
font-size: 12px;
color: #1b1b1b;
background: #eee;
}
&:hover a {
background: #333;
color: #fff;
}
}
li:first-child {
margin-left: 0;
}
}
}
.chapter {
padding-top: 15px;
line-height: 25px;
border: 1px solid #fff;
overflow: hidden;
width: 940px;
margin-left: 30px;
a {
color: #afafaf;
}
}
.chapter-right {
float: right;
span {
float: right;
}
a {
float: right;
}
}
.comment-area {
margin-top: 58px;
width: 935px;
margin-left: 30px;
.comment-publish {
height: 48px;
}
}
.comment-textarea {
textarea {
display: block;
width: 100%;
height: 110px;
padding: 12px;
resize: none;
outline: none;
font-size: 14px;
line-height: 18px;
color: #535353;
border: 1px solid #e7e7e7;
}
}
.word-count-tip {
display: block;
height: 48px;
line-height: 48px;
font-size: 12px;
color: #c8c8c8;
float: right;
.exceed-count {
color: #f00;
}
}
.publish-btn {
margin-top: 10px;
float: left;
width: 100px;
height: 30px;
line-height: 33px;
text-align: center;
color: #fff;
font-size: 14px;
background: #000;
cursor: pointer;
}
.disable {
background: #999;
}
.able {
background: #000;
}
.comments-wrap {
width: 100%;
overflow: hidden;
margin-bottom: 80px;
h4 {
font-size: 14px;
position: relative;
line-height: 32px;
border-bottom: 1px solid #bbb;
position: relative;
.comment-num {
color: #379ed6;
}
b {
display: block;
width: 12px;
height: 7px;
background: #fff;
background-image: resolve("layout/down.png");
position: absolute;
left: 15px;
}
}
.comment-pager {
float: right;
margin: 20px 0;
}
}
.comments-empty {
display: none;
color: #ccc;
margin: 20px 0;
font-size: 12px;
line-height: 12px;
text-align: center;
}
.comments-list {
li {
margin: 14px 0 0;
padding: 0 0 15px;
border-bottom: 1px dotted #e7e7e7;
.author {
width: 100%;
height: 40px;
overflow: hidden;
img {
float: left;
display: block;
width: 40px;
height: 40px;
margin-right: 15px;
}
.comment-user-name {
font-size: 14px;
line-height: 40px;
height: 40px;
font-weight: bold;
}
}
.comment-info {
.comment-content {
margin-top: 10px;
line-height: 16px;
font-size: 12px;
word-wrap: break-word;
}
.comment-time {
margin-top: 10px;
color: #c8c8c8;
font-size: 12px;
line-height: 12px;
clear: both;
}
}
}
}
.share {
padding-left: 30px;
width: 330px;
margin-top: 30px;
margin-bottom: 15px;
.share-title {
margin-right: 5px;
}
}
.hide {
display: none;
}
}
=======
.editorial-detail-page {
width: 990px;
... ... @@ -1172,4 +584,3 @@
display: none;
}
}
>>>>>>> fdb22f3939ca93c7a170f5f00241d413ae2905d7
... ...
<<<<<<< HEAD
.yoho-product-list {
@import "order-area";
font-size: 14px;
.btn {
cursor: pointer;
}
.center-content {
.left {
width: 250px;
}
.right {
width: 850px;
}
}
.input-radio {
padding: 10px 1px;
cursor: pointer;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
.radio {
margin-left: 0;
font-size: 14px;
display: inline-block;
color: #999;
}
.checkbox {
font-size: 14px;
}
.checked {
color: #1b1b1b;
}
.round-color {
width: 22px;
height: 21px;
vertical-align: middle;
.iconfont {
font-size: 22px;
}
.iconfont.icon-cover {
font-size: 22px;
}
}
}
.input-radio label {
font-size: 14px;
font-weight: normal;
margin-left: 10px;
cursor: pointer;
}
.input-radio label.round-color {
margin-left: 0;
}
.blank-div {
height: 70px;
}
.title {
font-size: 14px;
font-weight: 700;
height: 40px;
line-height: 40px;
border-bottom: 1px solid #eee;
}
.list-body,
.size-body,
.color-body,
.brand-list,
.standard-body {
max-height: 240px;
overflow-y: auto;
}
.style-body {
max-height: 240px;
overflow-y: auto;
.input-radio {
display: inline-block;
width: 80px;
}
}
.style-mulit-btn {
margin: 15px 0;
.btn {
width: 50px;
}
.btn.white {
color: #111;
}
}
.brand-body {
margin: 5px 0;
.brand-search {
border: 0;
background-color: #eae9e9;
width: 100%;
height: 40px;
padding: 0 8px;
color: #333;
font-weight: 700;
}
}
.brand-letter-items {
margin: 15px 0;
font-size: 12px;
font-weight: bolder;
span {
padding: 5px 0;
margin: 5px 11px 5px 0;
display: inline-block;
cursor: pointer;
}
.select {
color: #379ed6;
}
.mulit-choose {
border: 1px solid #1b1b1b;
padding: 5px 10px;
cursor: pointer;
}
}
.brand-btns,
.style-btns {
text-align: center;
margin-top: 10px;
display: none;
height: 38px;
.btn {
width: auto;
padding: 0 42px;
float: left;
}
.btn.cancel {
float: right;
}
}
.btn {
display: inline-block;
}
.btn.large {
height: 38px;
line-height: 38px;
font-size: 14px;
}
.price-btns {
.price-input {
background-color: #eee;
width: 72px;
height: 38px;
line-height: 38px;
position: relative;
vertical-align: bottom;
span {
height: 30px;
line-height: 30px;
margin-top: 5px;
display: inline-block;
}
input {
border: 0;
background-color: transparent;
width: 45px;
height: 38px;
line-height: 38px;
padding: 0;
font-size: 14px;
float: right;
font-weight: 700;
}
}
.btn {
margin-left: 4px;
}
}
.yoho-ui-accordion {
h3 {
font-size: 14px;
font-weight: 700;
height: 40px;
line-height: 40px;
border-bottom: 1px solid #eee;
display: block;
cursor: pointer;
position: relative;
.ui-accordion-header-icon {
position: absolute;
right: 0.5em;
top: 50%;
margin-top: -20px;
}
.ui-accordion-header-icon:after {
font-family: "iconfont" !important;
display: inline-block;
content: "\e616";
}
}
h3.ui-accordion-header-active {
.ui-accordion-header-icon:after {
font-family: "iconfont" !important;
display: inline-block;
content: "\e617";
}
}
> .body {
padding: 10px 0;
border-bottom: 1px solid #eee;
}
}
.filter-area {
background-color: #eae9e9;
margin-bottom: 30px;
label {
font-size: 14px;
font-weight: 700;
margin-left: 20px;
}
label.cancel {
float: right;
color: #878787;
margin: 27px 20px 0 0;
cursor: pointer;
}
.filter-item {
display: inline-block;
margin: 12px 10px;
font-size: 14px;
border: 1px solid #adacad;
background-color: #fff;
padding: 8px;
cursor: pointer;
span {
font-size: 14px;
display: inline-block;
height: 21px;
line-height: 21px;
}
span.label {
margin: 0 4px;
}
span.cancel {
font-size: 14px;
}
.round-color {
width: 22px;
height: 20px;
vertical-align: middle;
margin-left: 5px;
.iconfont {
font-size: 22px;
}
.iconfont.icon-cover {
font-size: 22px;
}
}
}
}
.goods-area {
margin: 0 -15px;
position: relative;
.goods {
margin: 10px 0 16px;
padding: 10px 13px;
float: left;
text-align: center;
border: 2px solid #fff;
cursor: pointer;
width: 289px;
.goods-brand {
font-weight: 700;
padding: 10px 10px 4px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.goods-img {
position: relative;
overflow: hidden;
width: 263px;
height: 351px;
img {
margin: 0;
}
.label {
background-color: #408ccc;
height: 24px;
width: 100%;
position: absolute;
bottom: 0;
z-index: 1;
line-height: 24px;
color: #fff;
}
}
.goods-name {
padding: 10px;
width: 263px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
a {
line-height: 17px;
font-size: 12px;
}
}
.goods-price {
padding: 10px;
font-size: 16px;
font-weight: 700;
b {
font-size: 12px;
color: #878787;
margin-left: 15px;
text-decoration: line-through;
}
}
}
.goods-wrapper {
border: 2px solid #eae9e9;
position: absolute;
background: #fff;
z-index: 2;
top: 10px;
padding-right: 10px;
min-width: 383px;
display: none;
.goods {
margin: 0;
border: 0;
}
.goods-img-list {
margin: 2px 0 2px 10px;
float: left;
.goods-img-col {
display: inline-block;
vertical-align: top;
width: 60px;
margin-right: 10px;
}
img {
margin: 8px 0;
cursor: pointer;
}
}
}
}
.blk-pagination {
text-align: center;
margin: 20px 0 40px;
width: auto;
li {
width: auto;
margin: 0 4px;
}
li:first-child,
li:last-child {
border-width: 2px;
}
}
}
.yoho-list-empty {
height: 800px;
.tip-search {
padding-top: 100px;
text-align: center;
.iconfont {
font-size: 100px;
color: #666;
}
}
p {
text-align: center;
}
.tip-cn {
margin-top: 30px;
font-size: 18px;
font-weight: 700;
span {
color: #379ed6;
}
}
.tip-en {
margin-top: 15px;
font-size: 14px;
}
.tip-cn-sm {
margin-top: 20px;
}
}
=======
.yoho-product-list {
@import "order-area";
... ... @@ -928,4 +463,3 @@
margin-top: 20px;
}
}
>>>>>>> fdb22f3939ca93c7a170f5f00241d413ae2905d7
... ...