Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
naoki-00-ito committed Sep 8, 2024
2 parents 7eeb976 + 4e89f90 commit 74911b9
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 14 deletions.
Binary file modified public/detail/textile-manufacturer/6.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/detail/textile-manufacturer/7.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/detail/textile-manufacturer/8.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/detail/textile-manufacturer/9.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/top/hero/fv-moving-sp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/top/hero/fv-moving.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 12 additions & 12 deletions src/data/works.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,6 @@ const works: Work[] = [
isTop: true,
imageTop: '/detail/textile-manufacturer/mv-pc.jpg',
},
{
slug: 'misia-forest',
title: 'MISIAの森',
year: '2023',
categories: ['PRIVATE WORKS'],
tags: ['ART DIRECTION', 'WEB DESIGN', 'GRAPHIC DESIGN'],
image: '/detail/misia-forest/mv-vertical.jpg',
mv: '/detail/misia-forest/mv-pc.jpg',
mvSp: '/detail/misia-forest/mv-sp.jpg',
isTop: true,
imageTop: '/detail/misia-forest/mv-pc.jpg',
},
{
slug: 'sauna1f',
title: 'SAUNA1/f',
Expand All @@ -37,6 +25,18 @@ const works: Work[] = [
isTop: true,
imageTop: '/detail/sauna1f/mv-pc.jpg',
},
{
slug: 'misia-forest',
title: 'MISIAの森',
year: '2023',
categories: ['PRIVATE WORKS'],
tags: ['ART DIRECTION', 'WEB DESIGN', 'GRAPHIC DESIGN'],
image: '/detail/misia-forest/mv-vertical.jpg',
mv: '/detail/misia-forest/mv-pc.jpg',
mvSp: '/detail/misia-forest/mv-sp.jpg',
isTop: true,
imageTop: '/detail/misia-forest/mv-pc.jpg',
},
{
slug: 'sato-noodle',
title: '佐藤製麺所',
Expand Down
3 changes: 1 addition & 2 deletions src/pages/works/sauna1f.astro
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ const { work, nextWork } = getWork(pathname);
<DetailSection title="(Overview)">
<div class="md:text-lg flex flex-col gap-4">
<p>
「ゆらぎを見つめる」<br />
「誰かと一緒につくるデザイン」として歴史上の人物も含む、著名な人と自分のコラボレーションしてクリエイティブを作るという課題に対して、村上春樹の小説を引用したサウナ施設のアートディレクション・デザインを行いました。<br
/>
村上春樹の小説の特徴として自己のアイデンティティや存在についての不安や混乱を抱えることで起こる”自我のゆれ”を描く側面に着目し、この自我のゆれは「時間や仕事といった規則的なものに縛られる現代から離れ、自分や周りのゆらぎと向き合う」という点でサウナと共通点があると考えました。<br
Expand All @@ -54,7 +53,7 @@ const { work, nextWork } = getWork(pathname);
<DescriptionList>
<span slot="title">コンセプト</span>
<span slot="description"
>都会にいながら喧騒から離れた隔離した空間で、<br />
> 「ゆらぎを見つめる」<br />都会にいながら喧騒から離れた隔離した空間で、<br />
サウナによる深いリラックス状態を通して自分を見つめる時間に重きを置いた場所。<br
/>
水面のゆらぎ、蒸気のゆらぎ、そして自我のゆらぎ。<br />
Expand Down
20 changes: 20 additions & 0 deletions src/pages/works/textile-manufacturer.astro
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,26 @@ const { work, nextWork } = getWork(pathname);
/>
</picture>
</li>
<li>
<li>
<picture>
<img
src={updatePath(`/detail/${work?.slug}/8.jpg`)}
alt=""
class="ts-image-white-in"
/>
</picture>
</li>
<li>
<li>
<picture>
<img
src={updatePath(`/detail/${work?.slug}/9.jpg`)}
alt=""
class="ts-image-white-in"
/>
</picture>
</li>
<li>
<picture>
<source
Expand Down

0 comments on commit 74911b9

Please sign in to comment.