Skip to content
This repository has been archived by the owner on May 2, 2022. It is now read-only.

#880 cosmetics2 readyformerging #881

Merged
merged 2 commits into from
Dec 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/displays/display-simpledeal-title.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
}

.container[wide-layout] {
padding: 0px 10vw 15px 10vw;
padding: 20px 10vw 15px 10vw;
top: 117px;
}

.hashtagloading {
Expand Down
4 changes: 2 additions & 2 deletions src/pages/detail/detail-simpledeal-main.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@
@apply --layout-end-justified;
@apply --body-detail;
color: var(--sc-grey4);
margin: 20px 30px 0 30px;
margin: -10px 30px 0 30px;
-webkit-user-select: text;
-moz-user-select: text;
-ms-user-select: text;
user-select: text;
}

.container[wide-layout] .description {
margin: 20px 20px 0 30px;
margin: -10px 20px 0 30px;
}

.pricebox {
Expand Down
2 changes: 2 additions & 0 deletions src/pages/detail/detail-simpledeal.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@

.container[wide-layout] {
padding: 0px 0px 0px 0px;
margin-top: 189px;
min-height: calc(100vh - 189px);
}

.itemcontainer {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/hashtag/hashtag-simpledeal-item.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
cursor: pointer;
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
box-sizing: border-box;
padding: 30px 30px 20px 30px;
padding: 30px 30px 26px 30px;
margin: 0px 10px 4px 10px;
min-height: 121px;
}
Expand Down
5 changes: 4 additions & 1 deletion src/pages/hashtag/hashtag-simpledeal.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,14 @@

.container[wide-layout] {
padding: 0px 0 10px 10vw;
margin-top: 159px;
margin-top: 189px;
min-height: calc(100vh - 189px);
}

.container[wide-layout] .middle {
max-width: 68vw;
top: 189px;
padding: 0px 0px 15px 0px;
}
.filterbox {
@apply --small-bold;
Expand Down