Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

コメントユーザーのアイコンサイズがおかしくなっているのを修正、Googleカレンダーに追加ボタンのデザイン、期一覧に戻るボタンのデザイン崩れ修正崩れ修正 #3569

Merged
merged 2 commits into from
Nov 15, 2021
Merged

コメントユーザーのアイコンサイズがおかしくなっているのを修正、Googleカレンダーに追加ボタンのデザイン、期一覧に戻るボタンのデザイン崩れ修正崩れ修正 #3569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa9befc
コメントユーザーのアイコンサイズがおかしくなっているのを修正、Googleカレンダーに追加ボタンのデザイン崩れ修正
machida Nov 15, 2021
31cba06
期一覧に戻るボタンのデザイン崩れ修正
machida Nov 15, 2021
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
9 changes: 9 additions & 0 deletions app/assets/stylesheets/atoms/_a-button.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,15 @@
input[type="submit"]
padding-right: 2.25em

//icon
&.is-back
+position(relative)
+padding(horizontal, .75em 0)
&::before
+fa(fas '\f104')
+position(absolute, left .75em, top 50%)
transform: translate(0, -50%)


input[type="submit"],
input[type="reset"],
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/blocks/event/_event-meta.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
+media-breakpoint-up(md)
display: flex
align-items: center
a
a:not(.a-button)
+default-link
+hover-link-reversal

Expand Down
7 changes: 0 additions & 7 deletions app/assets/stylesheets/blocks/page/_page-header-actions.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,3 @@
.a-button
+media-breakpoint-up(md)
height: 2.125rem
&.is-back
+position(relative)
+padding(horizontal, .75em 0)
&::before
+fa(fas '\f104')
+position(absolute, left .75em, top 50%)
transform: translate(0, -50%)
6 changes: 2 additions & 4 deletions app/assets/stylesheets/blocks/thread/_thread-comments.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
+media-breakpoint-down(sm)
display: none

.thread-comment__user-icon
+size(3.5rem)

.thread-comment__title
width: 100%
+text-block(.875rem 1.4, 600)
Expand Down Expand Up @@ -103,7 +100,8 @@
align-self: flex-end

.thread-comment__user-icon
+size(2.75rem auto)
+size(3.5rem)
object-fit: cover
border-radius: 50%
+position(absolute, left 0, top 0)
+margin(vertical, .75rem)
Expand Down
16 changes: 9 additions & 7 deletions app/views/generations/show.html.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ main.page-main
header.page-main-header
.container
.page-main-header__inner
h1.page-main-header__title
= title
.page-header-actions
ul.page-header-actions__items
li.page-header-actions__item
= link_to generations_path, class: 'a-button is-md is-block is-secondary is-back' do
| 期一覧
.page-main-header__start
h1.page-main-header__title
= title
.page-main-header__end
.page-main-header-actions
ul.page-main-header-actions__items
li.page-main-header-actions__item
= link_to generations_path, class: 'a-button is-sm is-block is-secondary is-back' do
| 期一覧

.page-body
.container
Expand Down