Merge pull request #3641 from fjordllc/iOS-safari-follow-button

iOS Safariでフォローボタンが崩れるのを修正
fjordllc · Nov 30, 2021 · 31c3efd · 31c3efd
2 parents bd0f2a5 + f41e6c1
commit 31c3efd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/app/assets/stylesheets/blocks/page/_page-tabs.sass b/app/assets/stylesheets/blocks/page/_page-tabs.sass
@@ -31,7 +31,7 @@
 
 .page-tabs__item-link
   +flex-link
-  +text-block(.825rem 1, $semi-muted-text 600)
+  +text-block(.825rem 1, $semi-muted-text 600 nowrap)
   align-items: center
   justify-content: center
   height: 2.75rem

diff --git a/app/assets/stylesheets/blocks/user/_following.sass b/app/assets/stylesheets/blocks/user/_following.sass
@@ -1,8 +1,9 @@
 .following
   position: relative
-  .a-button
-    list-style: none
-  .a-button::-webkit-details-marker
+  summary
+    display: block
+  summary::-webkit-details-marker,
+  summary::marker
     display: none
 
 .following__dropdown

diff --git a/app/javascript/following.vue b/app/javascript/following.vue
@@ -1,17 +1,16 @@
 <template lang="pug">
 details.following(ref='followingDetailsRef')
-  summary.a-button.is-warning.is-md.is-block(v-if='following && watching')
-    i.fas.fa-check
-    span
-      | コメントあり
-  summary.a-button.is-warning.is-md.is-block(
-    v-else-if='following && !watching'
-  )
-    i.fas.fa-check
-    span
-      | コメントなし
-  summary.a-button.is-secondary.is-md.is-block(v-else)
-    | {{ buttonLabel }}
+  summary.following__summary
+    span.a-button.is-warning.is-md.is-block(v-if='following && watching')
+      i.fas.fa-check
+      span
+        | コメントあり
+    span.a-button.is-warning.is-md.is-block(v-else-if='following && !watching')
+      i.fas.fa-check
+      span
+        | コメントなし
+    span.a-button.is-secondary.is-md.is-block(v-else)
+      | {{ buttonLabel }}
   .following__dropdown.a-dropdown
     ul.a-dropdown__items
       li.following__dropdown-item.a-dropdown__item