From aa9befcef04de7163b8fe3c62c5426d0fc8475c5 Mon Sep 17 00:00:00 2001 From: teppei machida Date: Mon, 15 Nov 2021 12:19:27 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AE=E3=82=A2=E3=82=A4?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=82=B5=E3=82=A4=E3=82=BA=E3=81=8C=E3=81=8A?= =?UTF-8?q?=E3=81=8B=E3=81=97=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=81Google?= =?UTF-8?q?=E3=82=AB=E3=83=AC=E3=83=B3=E3=83=80=E3=83=BC=E3=81=AB=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE=E3=83=87=E3=82=B6?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E5=B4=A9=E3=82=8C=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/blocks/event/_event-meta.sass | 2 +- app/assets/stylesheets/blocks/thread/_thread-comments.sass | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/blocks/event/_event-meta.sass b/app/assets/stylesheets/blocks/event/_event-meta.sass index 0b764398fc5..b887e4fdcda 100644 --- a/app/assets/stylesheets/blocks/event/_event-meta.sass +++ b/app/assets/stylesheets/blocks/event/_event-meta.sass @@ -39,7 +39,7 @@ +media-breakpoint-up(md) display: flex align-items: center - a + a:not(.a-button) +default-link +hover-link-reversal diff --git a/app/assets/stylesheets/blocks/thread/_thread-comments.sass b/app/assets/stylesheets/blocks/thread/_thread-comments.sass index b7a1011d7d4..0bbe75d9f64 100644 --- a/app/assets/stylesheets/blocks/thread/_thread-comments.sass +++ b/app/assets/stylesheets/blocks/thread/_thread-comments.sass @@ -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) @@ -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) From 31cba062885b35e0341b0a83b7e28c4e4e17d275 Mon Sep 17 00:00:00 2001 From: teppei machida Date: Mon, 15 Nov 2021 12:38:51 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=9F=E4=B8=80=E8=A6=A7=E3=81=AB?= =?UTF-8?q?=E6=88=BB=E3=82=8B=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE=E3=83=87?= =?UTF-8?q?=E3=82=B6=E3=82=A4=E3=83=B3=E5=B4=A9=E3=82=8C=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/atoms/_a-button.sass | 9 +++++++++ .../blocks/page/_page-header-actions.sass | 7 ------- app/views/generations/show.html.slim | 16 +++++++++------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/atoms/_a-button.sass b/app/assets/stylesheets/atoms/_a-button.sass index cb9ce775f6a..45764cd3e8b 100644 --- a/app/assets/stylesheets/atoms/_a-button.sass +++ b/app/assets/stylesheets/atoms/_a-button.sass @@ -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"], diff --git a/app/assets/stylesheets/blocks/page/_page-header-actions.sass b/app/assets/stylesheets/blocks/page/_page-header-actions.sass index 73e9db3aff9..d84b130fee0 100644 --- a/app/assets/stylesheets/blocks/page/_page-header-actions.sass +++ b/app/assets/stylesheets/blocks/page/_page-header-actions.sass @@ -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%) diff --git a/app/views/generations/show.html.slim b/app/views/generations/show.html.slim index 9640c614b9b..3ee4a3b2957 100644 --- a/app/views/generations/show.html.slim +++ b/app/views/generations/show.html.slim @@ -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