From af16564409254f6f93f375224013d75714e49078 Mon Sep 17 00:00:00 2001 From: rira <101010hayakawa@gmail.com> Date: Sat, 15 Jul 2023 21:22:40 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA=E3=83=BC=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E3=81=AE=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA=E3=83=BC?= =?UTF-8?q?=E4=BD=9C=E6=88=90=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AE=E7=A7=BB?= =?UTF-8?q?=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/mentor/categories/index.html.slim | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/app/views/mentor/categories/index.html.slim b/app/views/mentor/categories/index.html.slim index 6afa4aceba9..dd8bd4cbf4e 100644 --- a/app/views/mentor/categories/index.html.slim +++ b/app/views/mentor/categories/index.html.slim @@ -4,17 +4,9 @@ header.page-header .container .page-header__inner h1.page-header__title = title - .page-header-actions - - if current_user.mentor? - .page-header-actions__items - .page-header-actions__item - = link_to new_mentor_category_path, class: 'a-button is-md is-secondary is-block' do - i.fa-regular.fa-plus - | カテゴリー作成 - = render 'mentor/mentor_page_tabs' -.page-main +main.page-main header.page-main-header .container .page-main-header__inner @@ -25,10 +17,10 @@ header.page-header .page-header-actions .page-header-actions__items .page-header-actions__item + - if current_user.mentor? = link_to new_mentor_category_path, class: 'a-button is-md is-secondary is-block' do i.fa-regular.fa-plus - | カテゴリー作成 - + | カテゴリー作成 .page-body .container.is-lg = react_component 'Categories' From 19c9e297b7d8020a1d3c9fca13b93333bf023516 Mon Sep 17 00:00:00 2001 From: machida Date: Wed, 26 Jul 2023 14:11:58 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E6=96=B0=E8=A6=8F=E4=BD=9C=E6=88=90=E3=83=9C?= =?UTF-8?q?=E3=82=BF=E3=83=B3=E5=91=A8=E3=82=8A=E3=81=AE=E3=83=AC=E3=82=A4?= =?UTF-8?q?=E3=82=A2=E3=82=A6=E3=83=88=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stylesheets/application/blocks/page/_page-header.sass | 5 ++++- .../application/blocks/page/_page-main-header.sass | 6 +++--- app/views/mentor/categories/index.html.slim | 3 +-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/javascript/stylesheets/application/blocks/page/_page-header.sass b/app/javascript/stylesheets/application/blocks/page/_page-header.sass index dee7d5286c9..f62f5d7a3ee 100644 --- a/app/javascript/stylesheets/application/blocks/page/_page-header.sass +++ b/app/javascript/stylesheets/application/blocks/page/_page-header.sass @@ -18,10 +18,13 @@ align-items: center .page-header__title - +text-block(1.25rem 1, 700) color: var(--main) + line-height: 1 + font-weight: 700 font-feature-settings: "palt" letter-spacing: .02em + +media-breakpoint-up(md) + font-size: 1.25rem +media-breakpoint-down(sm) font-size: 1.125rem word-wrap: break-word diff --git a/app/javascript/stylesheets/application/blocks/page/_page-main-header.sass b/app/javascript/stylesheets/application/blocks/page/_page-main-header.sass index f72535c5ac1..2c63a0feaac 100644 --- a/app/javascript/stylesheets/application/blocks/page/_page-main-header.sass +++ b/app/javascript/stylesheets/application/blocks/page/_page-main-header.sass @@ -2,9 +2,9 @@ border-bottom: solid 1px var(--border) .page-main-header__inner - padding-block: .75rem + padding-block: .5rem +media-breakpoint-up(md) - min-height: calc(3.75rem - 1px) + min-height: calc(3.5rem - 1px) display: flex align-items: center +media-breakpoint-down(sm) @@ -24,6 +24,6 @@ color: var(--main) font-weight: 700 +media-breakpoint-up(md) - +text-block(1.25rem 1.4) + +text-block(1.125rem 1.4) +media-breakpoint-down(sm) +text-block(1rem 1.4) diff --git a/app/views/mentor/categories/index.html.slim b/app/views/mentor/categories/index.html.slim index dd8bd4cbf4e..6463d92982a 100644 --- a/app/views/mentor/categories/index.html.slim +++ b/app/views/mentor/categories/index.html.slim @@ -17,10 +17,9 @@ main.page-main .page-header-actions .page-header-actions__items .page-header-actions__item - - if current_user.mentor? = link_to new_mentor_category_path, class: 'a-button is-md is-secondary is-block' do i.fa-regular.fa-plus - | カテゴリー作成 + | カテゴリー作成 .page-body .container.is-lg = react_component 'Categories'