Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
梁建民
/
xinhot
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
280c65f2
authored
Mar 15, 2019
by
林翔
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'lx_xinhot_h5_20190314'
parents
88ffae1e
18b769aa
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
h5/css/style.css
h5/product.html
h5/css/style.css
View file @
280c65f2
...
@@ -183,7 +183,9 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus{ -webkit-box-
...
@@ -183,7 +183,9 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus{ -webkit-box-
.product-mask-content
.product-mask-text
p
{
font-size
:
0.26rem
;
color
:
#666
;
line-height
:
0.4rem
;
display
:
inline-block
;
}
.product-mask-content
.product-mask-text
p
{
font-size
:
0.26rem
;
color
:
#666
;
line-height
:
0.4rem
;
display
:
inline-block
;
}
.product-mask-content
.product-mask-img
{
margin
:
0
auto
;
text-align
:
center
;
}
.product-mask-content
.product-mask-img
{
margin
:
0
auto
;
text-align
:
center
;
}
.product-mask-content
.product-mask-img
li
{
margin
:
0
0.1rem
;
display
:
inline-block
;
}
.product-mask-content
.product-mask-img
li
{
margin
:
0
0.1rem
;
display
:
inline-block
;
}
.product-mask-content
.product-mask-img
li
img
{
width
:
1.7rem
;
height
:
1.3rem
;
}
.product-mask-content
.product-mask-img
li
img
{
width
:
6.1rem
;
height
:
1.3rem
;
}
/*.product-mask-content .product-mask-img li img{ width: 1.7rem; height: 1.3rem; }*/
.product-mask-content
.product-mask-introduce
{
margin
:
0
0.5rem
;
max-height
:
3rem
;
overflow-y
:
auto
;
}
.product-mask-content
.product-mask-introduce
{
margin
:
0
0.5rem
;
max-height
:
3rem
;
overflow-y
:
auto
;
}
.product-mask-content
.product-mask-introduce
p
{
text-indent
:
2em
;
font-size
:
0.26rem
!important
;
color
:
#666
!important
;
line-height
:
0.4rem
!important
;
}
.product-mask-content
.product-mask-introduce
p
{
text-indent
:
2em
;
font-size
:
0.26rem
!important
;
color
:
#666
!important
;
line-height
:
0.4rem
!important
;
}
...
...
h5/product.html
View file @
280c65f2
...
@@ -114,8 +114,8 @@
...
@@ -114,8 +114,8 @@
<div
class=
"product-mask-text"
>
成立时间:
<p
class=
"product-mask-time"
></p></div>
<div
class=
"product-mask-text"
>
成立时间:
<p
class=
"product-mask-time"
></p></div>
<ul
class=
"product-mask-img"
>
<ul
class=
"product-mask-img"
>
<li
class=
"product-img-0"
><img
src=
""
alt=
""
></li>
<li
class=
"product-img-0"
><img
src=
""
alt=
""
></li>
<li
class=
"product-img-1"
><img
src=
""
alt=
""
></li>
<
!-- <
li class="product-img-1"><img src="" alt=""></li>
<li
class=
"product-img-2"
><img
src=
""
alt=
""
></li>
<li class="product-img-2"><img src="" alt=""></li>
-->
</ul>
</ul>
<div
class=
"product-mask-introduce"
></div>
<div
class=
"product-mask-introduce"
></div>
</div>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment