Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yoho-blk
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
1
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
石坚
9 years ago
Commit
b5b44f32858b70ff185d4484246870803ce6653e
1 parent
f20e7e70
blk修改
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
33 additions
and
20 deletions
apps/me/views/partial/setting/act/step2.hbs
apps/me/views/partial/setting/act/step3.hbs
public/scss/components/_dialog.css
public/scss/components/_header.css
public/scss/components/_pagination.css
public/scss/me/setting/_footer.css
public/scss/product/_item.css
public/scss/product/_shop.css
public/scss/shopping/_order.css
apps/me/views/partial/setting/act/step2.hbs
View file @
b5b44f3
...
...
@@ -6,7 +6,7 @@
<div
class=
"progress-bar"
style=
"width: 66%"
></div>
<div
class=
"visual-state"
>
<ul>
<li>
<li
class=
"act"
>
<span
class=
"iconfont state-bg"
>

</span>
<div
class=
"number"
>
1
</div>
<div>
验证身份
</div>
...
...
apps/me/views/partial/setting/act/step3.hbs
View file @
b5b44f3
...
...
@@ -5,12 +5,12 @@
<div
class=
"progress-bar"
style=
"width: 100%"
></div>
<div
class=
"visual-state"
>
<ul>
<li>
<li
class=
"act"
>
<span
class=
"iconfont state-bg"
>

</span>
<div
class=
"number"
>
1
</div>
<div>
验证身份
</div>
</li>
<li>
<li
class=
"act"
>
<span
class=
"iconfont state-bg"
>

</span>
<div
class=
"number"
>
2
</div>
<div>
{{
proTitle
}}
</div>
...
...
public/scss/components/_dialog.css
View file @
b5b44f3
...
...
@@ -7,7 +7,6 @@
min-width
:
420px
;
background
:
#ffffff
;
z-index
:
1001
;
padding-right
:
0
;
/*border: 1px solid #8f8f8f;*/
.close
{
...
...
public/scss/components/_header.css
View file @
b5b44f3
...
...
@@ -346,7 +346,7 @@
.search-wrapper
{
width
:
360px
;
padding
:
16px
0
10
px
;
padding
:
6px
0
16
px
;
font-size
:
14px
;
top
:
50px
;
right
:
0
;
...
...
public/scss/components/_pagination.css
View file @
b5b44f3
...
...
@@ -6,7 +6,7 @@
a
{
display
:
inline-block
;
font-size
:
14px
;
line-height
:
2
8
px
;
line-height
:
2
6
px
;
width
:
26px
;
height
:
26px
;
...
...
@@ -46,9 +46,9 @@
.pre-page
,
.next-page
{
line-height
:
23px
;
width
:
24px
;
height
:
24px
;
line-height
:
24px
;
width
:
26px
;
height
:
26px
;
font-weight
:
700
;
}
}
...
...
public/scss/me/setting/_footer.css
View file @
b5b44f3
...
...
@@ -4,6 +4,8 @@
hr
{
color
:
#f0f0f0
;
margin-bottom
:
20px
;
border
:
none
;
border-bottom
:
1px
solid
#eee
;
}
p
{
padding-bottom
:
20px
;
...
...
public/scss/product/_item.css
View file @
b5b44f3
...
...
@@ -65,15 +65,14 @@
.brand-name
{
font-size
:
24px
;
font-weight
:
bold
;
margin
:
0
40px
;
line-height
:
1.3
;
}
.name
{
font-size
:
14px
;
font-weight
:
bold
;
line-height
:
1.5
;
margin
:
16px
0
8px
;
margin
:
16px
40px
8px
;
line-height
:
1.3
;
}
.intro
{
...
...
public/scss/product/_shop.css
View file @
b5b44f3
...
...
@@ -265,9 +265,16 @@
}
}
.yoho-dialog.item-more-intro-dialog
{
.nano-pane{
}
}
.yoho-dialog.brand-info-dialog
{
width
:
900px
;
height
:
600px
;
padding-right
:
0
;
.brand-info
{
height
:
520px
;
...
...
public/scss/shopping/_order.css
View file @
b5b44f3
...
...
@@ -26,7 +26,7 @@
}
.title
{
font-size
:
1
5
px
;
font-size
:
1
4
px
;
}
}
...
...
@@ -138,12 +138,15 @@
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
}
.phone
{
font-size
:
14px
;
}
}
.address-chosed
{
position
:
absolute
;
bottom
:
0
;
bottom
:
-1px
\
9
;
/* stylelint-disable-line */
bottom
:
-1px
;
right
:
0
;
}
...
...
@@ -211,7 +214,7 @@
.chose-block
{
border-color
:
#000
;
font-size
:
1
5
px
;
font-size
:
1
4
px
;
}
.tip-text
{
font-size
:
14px
;
...
...
@@ -267,7 +270,7 @@
}
.order-inner
{
border
:
1px
solid
#
ccc
;
border
:
1px
solid
#
eee
;
.title
{
padding
:
0
15px
;
...
...
@@ -452,11 +455,12 @@
white-space
:
nowrap
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
font-size
:
14px
;
}
.name
{
display
:
inline-block
;
font-size
:
1
4
px
;
font-size
:
1
2
px
;
line-height
:
16px
;
max-height
:
32px
;
}
...
...
@@ -515,13 +519,15 @@
cursor
:
pointer
;
&.iconfont
{
font-size
:
16px
;
font-size
:
14px
;
position
:
relative
;
top
:
-1px
;
}
}
.balance
{
padding
:
10px
20px
;
border
:
1px
solid
#
ccc
;
border
:
1px
solid
#
eee
;
font-size
:
14px
;
margin-bottom
:
80px
;
}
...
...
Please
register
or
login
to post a comment