Merge pull request #881 from swarmcity/#880_cosmetics2-readyformerging

#880 cosmetics2 readyformerging
swarmcity · Dec 5, 2018 · 9430d7a · 9430d7a
2 parents cdc5dbe + da493bd
commit 9430d7a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/src/displays/display-simpledeal-title.html b/src/displays/display-simpledeal-title.html
@@ -32,7 +32,8 @@
       }
 
       .container[wide-layout] {
-        padding: 0px 10vw 15px 10vw;
+        padding: 20px 10vw 15px 10vw;
+        top: 117px;
       }
 
       .hashtagloading {

diff --git a/src/pages/detail/detail-simpledeal-main.html b/src/pages/detail/detail-simpledeal-main.html
@@ -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 {

diff --git a/src/pages/detail/detail-simpledeal.html b/src/pages/detail/detail-simpledeal.html
@@ -52,6 +52,8 @@
 
       .container[wide-layout] {
         padding: 0px 0px 0px 0px;
+        margin-top: 189px;
+        min-height: calc(100vh - 189px);
       }
 
       .itemcontainer {

diff --git a/src/pages/hashtag/hashtag-simpledeal-item.html b/src/pages/hashtag/hashtag-simpledeal-item.html
@@ -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;
             }

diff --git a/src/pages/hashtag/hashtag-simpledeal.html b/src/pages/hashtag/hashtag-simpledeal.html
@@ -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;