Styling on hashtag & hashtag-list

swarmcity · Nov 29, 2018 · cbda617 · cbda617
1 parent 6397075
commit cbda617
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/src/pages/hashtag-list/hashtag-list-item.html b/src/pages/hashtag-list/hashtag-list-item.html
@@ -5,7 +5,6 @@
 -->
 <link rel="import" href="../../../bower_components/polymer/polymer-element.html">
 <link rel="import" href="../../../bower_components/iron-image/iron-image.html">
-<link rel="import" href="../../displays/display-divider.html">
 
 <dom-module id="hashtag-list-item">
     <template>
@@ -17,14 +16,12 @@
             .container {
                 box-sizing: border-box;
                 padding: 25px 10vw 25px;
-                width: 100%;
                 cursor: pointer;
                 background-color: none;
                 transition: background-color 0.5s ease;
                 @apply --layout-horizontal;
             }
 
-
             .flex {
                 @apply --layout-flex;
             }
@@ -49,6 +46,7 @@
             .container[wide-layout] .deals {
                 @apply --body-default;
                 font-size: 14px;
+                box-sizing: border-box;
                 margin: 0 0 4px 20px;
             }
 
@@ -91,7 +89,6 @@
             </div>
             <div class="right"></div>
         </div>
-        <display-divider></display-divider>
 
     </template>
     <script>

diff --git a/src/pages/hashtag-list/hashtag-list-router.html b/src/pages/hashtag-list/hashtag-list-router.html
@@ -16,6 +16,7 @@
 <link rel="import" href="../../displays/display-my-info.html">
 <link rel="import" href="../../displays/display-icon-back.html">
 <link rel="import" href="../../displays/display-hashtagadd-btn.html">
+<link rel="import" href="../../displays/display-divider.html">
 <link rel="import" href="./hashtag-list-item.html">
 
 <dom-module id="page-hashtag-list">
@@ -36,6 +37,10 @@
                 margin-top: 120px;
             }
 
+            display-divider {
+                width: 100%;
+            }
+
             display-hashtagadd-btn {
                 position: fixed;
                 bottom: 50px;
@@ -56,6 +61,7 @@
             <display-my-info avatarSmall path="{{path}}" on-wallet="_handleOnWallet" on-profile="_handleOnProfile"></display-my-info>
             <template is="dom-repeat" items="[[hashtagList]]" filter="_showHashtag">
                 <hashtag-list-item item="[[item]]" on-hashtag="_handleOnHashtag"></hashtag-list-item>
+                <display-divider></display-divider>
             </template>
             <display-hashtagadd-btn on-tap="_newHashtag">
             </display-hashtagadd-btn>

diff --git a/src/pages/hashtag/hashtag-simpledeal.html b/src/pages/hashtag/hashtag-simpledeal.html
@@ -27,8 +27,8 @@
             .container {
                 background-image: var(--sc-bg);
                 min-height: calc(100vh - 159px);
-                width: 100%;
                 margin-top: 159px;
+                max-width: 100vw;
             }
 
             .middle {
@@ -47,7 +47,6 @@
 
             .container[wide-layout] {
                 padding: 0px 0 10px 10vw;
-                padding-right: 22vw;
                 margin-top: 159px;
             }
 

diff --git a/src/shared-styles.html b/src/shared-styles.html
@@ -478,7 +478,7 @@
                 }
 
                 --general-divider: {
-                    width: 100vw;
+                    width: 100%;
                     background-color: #dddddd;
                     opacity: 1;
                     height: 1px;