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.

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

TEST #2

Open
wants to merge 351 commits into
base: master
Choose a base branch
from
Open
Changes from 6 commits
Commits
Show all changes
351 commits
Select commit Hold shift + click to select a range
b505a38
小窓
hitomi-neko Jun 25, 2020
f344991
Merge pull request #25 from hitomi-neko/hiromi-working
hitomi-neko Jun 25, 2020
ad4ee13
Merge branch 'miyazaki-working' into master
hitomi-neko Jun 25, 2020
aa64069
Merge pull request #27 from hitomi-neko/master
hitomi-neko Jun 25, 2020
67ea1ce
Merge pull request #28 from hitomi-neko/master
hitomi-neko Jun 25, 2020
e95e6cc
IA図書館リンク
hitomi-neko Jun 25, 2020
1dcd9e9
Merge pull request #31 from hitomi-neko/miyazaki-working
hitomi-neko Jun 25, 2020
df7267e
Merge pull request #32 from hitomi-neko/master
hitomi-neko Jun 25, 2020
c71daf5
求める学生像とか英訳
hitomi-neko Jun 25, 2020
b4be9d5
アドミッションポリシーの翻訳
hitomi-neko Jun 25, 2020
1163f56
アドミッションポリシーの翻訳
hitomi-neko Jun 25, 2020
572ab6d
コミット0626
Jun 26, 2020
cc2aaee
入試:やさしいにほんご
hitomi-neko Jun 26, 2020
e9ed23c
コミット0626_2
Jun 26, 2020
0ec7c2a
画像を載せた、英語のところはもうちょい練った方がいいかも
hitomi-neko Jun 26, 2020
8c1c583
Merge pull request #35 from hitomi-neko/hiromi-working
hitomi-neko Jun 26, 2020
7c47f98
Q&A準備
hitomi-neko Jun 26, 2020
67ca0af
Merge branch 'miyazaki-working' into master
hitomi-neko Jun 26, 2020
7fc7736
Merge pull request #36 from hitomi-neko/master
hitomi-neko Jun 26, 2020
e9831e8
Q&Aちょっと訳した
hitomi-neko Jun 26, 2020
508122b
q1
hitomi-neko Jun 26, 2020
5103dec
翻訳中
hitomi-neko Jun 26, 2020
c00cf05
コミット
Jun 26, 2020
489eeb1
画像の追加等
hitomi-neko Jun 26, 2020
e46e612
Merge pull request #39 from hitomi-neko/miyazaki-working
hitomi-neko Jun 26, 2020
9c1d243
Merge pull request #40 from hitomi-neko/master
hitomi-neko Jun 26, 2020
6d7fa25
Merge branch 'hiromi-working' of https://github.com/hitomi-neko/redes…
Jun 26, 2020
a2bb0dd
データをぶち込んでリンク切れ対策を少しする
hitomi-neko Jun 26, 2020
3b46cee
Merge pull request #43 from hitomi-neko/miyazaki-working
hitomi-neko Jun 26, 2020
3656837
icon
hitomi-neko Jun 26, 2020
952a24e
B1並べる
hitomi-neko Jun 26, 2020
c40107c
B2おいた
hitomi-neko Jun 26, 2020
68d42d7
B3並べた
hitomi-neko Jun 26, 2020
8a6c71f
B1ポップアップ情報
hitomi-neko Jun 26, 2020
4edf00c
B2ポップアップデータ
hitomi-neko Jun 26, 2020
324e1d0
ポップアップ情報ベタ打ち(エディまだ)
hitomi-neko Jun 26, 2020
8c66173
Merge pull request #44 from hitomi-neko/miyazaki-working
hitomi-neko Jun 26, 2020
ad231a1
Merge pull request #47 from hitomi-neko/master
hitomi-neko Jun 26, 2020
8b4e0a0
Q追加
hitomi-neko Jun 26, 2020
8ba1f95
追記
hitomi-neko Jun 26, 2020
c678e39
映像更新
hitomi-neko Jun 27, 2020
73c4a85
headerのコピペ
hitomi-neko Jun 27, 2020
af7199f
Merge branch 'hiromi-working' of https://github.com/hitomi-neko/redes…
Jun 27, 2020
4c32243
コミット0627_01
Jun 27, 2020
c7fede2
コミット0627_02
Jun 27, 2020
e84e500
コミット0627_03
Jun 27, 2020
12d755e
一旦push
hitomi-neko Jun 27, 2020
ac80494
urlに言語情報を付与
hitomi-neko Jun 27, 2020
0f0453a
Merge pull request #48 from hitomi-neko/hiromi-working
hitomi-neko Jun 27, 2020
e93cb97
作業用をなおす
hitomi-neko Jun 27, 2020
cab541b
Merge branch 'miyazaki-working' into master
hitomi-neko Jun 27, 2020
702ee5f
Merge pull request #49 from hitomi-neko/master
hitomi-neko Jun 27, 2020
95aa62a
んーーーー
hitomi-neko Jun 27, 2020
1e77a9f
酷い動きだ
hitomi-neko Jun 27, 2020
474d57a
作品集ページ終了
Jun 27, 2020
5392b01
菊竹さん研究室一旦終了
Jun 27, 2020
dc7212d
jsonでリンクで渡す
hitomi-neko Jun 27, 2020
8a2387e
受け取り
hitomi-neko Jun 27, 2020
19ff682
Merge branch 'master' into hiromi-working
hitomi-neko Jun 27, 2020
85d83e3
Merge pull request #52 from hitomi-neko/hiromi-working
hitomi-neko Jun 27, 2020
7f9784a
一旦
hitomi-neko Jun 27, 2020
1167e5e
Merge branch 'miyazaki-working' into master
hitomi-neko Jun 27, 2020
6397784
Merge pull request #53 from hitomi-neko/master
hitomi-neko Jun 27, 2020
c1c57af
わたして移動完了
hitomi-neko Jun 27, 2020
934a501
どうかな
hitomi-neko Jun 27, 2020
2bc428d
ページ遷移時の情報渡し
hitomi-neko Jun 27, 2020
4d34327
怖いことしてた
hitomi-neko Jun 27, 2020
00ed177
Merge pull request #56 from hitomi-neko/miyazaki-working
hitomi-neko Jun 27, 2020
e219a47
Merge pull request #57 from hitomi-neko/master
hitomi-neko Jun 27, 2020
9d91b6b
教授の外部リンクと一部やさしい日本語訳
hitomi-neko Jun 28, 2020
8859ec3
リンクをつける
hitomi-neko Jun 28, 2020
24808d1
みんなの図書を少し
Jun 28, 2020
4c1860a
細かい調整
Jun 28, 2020
8b881c7
Merge pull request #60 from hitomi-neko/hiromi-working
hitomi-neko Jun 28, 2020
b8900a3
インスタ追加
hitomi-neko Jun 28, 2020
bbc7e68
Merge branch 'miyazaki-working' into master
hitomi-neko Jun 28, 2020
4a5ead9
Merge pull request #61 from hitomi-neko/master
hitomi-neko Jun 28, 2020
000212e
Merge pull request #62 from hitomi-neko/miyazaki-working
hitomi-neko Jun 28, 2020
0b098cb
Merge pull request #63 from hitomi-neko/master
hitomi-neko Jun 28, 2020
a5a1f43
ミス
hitomi-neko Jun 28, 2020
6de64de
Merge pull request #64 from hitomi-neko/miyazaki-working
hitomi-neko Jun 28, 2020
65b2243
Merge pull request #65 from hitomi-neko/master
hitomi-neko Jun 28, 2020
ec002d8
一旦コミット
Jun 28, 2020
a7dcaca
Merge branch 'hiromi-working' of https://github.com/hitomi-neko/redes…
Jun 28, 2020
1191738
コミット
Jun 28, 2020
891b0cb
form
hitomi-neko Jun 28, 2020
254507c
みんなの図書レイアウト終了
Jun 28, 2020
163c4e6
レスポンシブ時のurl強制改行
Jun 28, 2020
7b6b0c3
また一旦コミット
Jun 28, 2020
bf2ef81
修正追記等々
hitomi-neko Jun 28, 2020
7837b72
不足を補う
hitomi-neko Jun 28, 2020
a997c1e
学費の項目を脳死でDeepL
hitomi-neko Jun 28, 2020
b4184b8
強引にヘッダー作成
Jun 28, 2020
eb54868
英語ページ(トップ)
hitomi-neko Jun 28, 2020
8757a1e
topページの言語等は一通り完了
hitomi-neko Jun 28, 2020
0d3d65d
全部にヘッダーのスタイル適応成功
Jun 28, 2020
6f62eb8
footer適応
Jun 28, 2020
2c52fd4
Merge pull request #68 from hitomi-neko/hiromi-working
hitomi-neko Jun 28, 2020
8e3e4f0
研究室ページのリンク
hitomi-neko Jun 28, 2020
15fcfc6
Merge branch 'miyazaki-working' into master
hitomi-neko Jun 28, 2020
9e6fd3a
Merge pull request #69 from hitomi-neko/master
hitomi-neko Jun 28, 2020
9b2c8b3
マージ後の微修正
hitomi-neko Jun 28, 2020
53708e4
Merge pull request #70 from hitomi-neko/miyazaki-working
hitomi-neko Jun 28, 2020
8bcce5b
Merge pull request #71 from hitomi-neko/master
hitomi-neko Jun 28, 2020
e41b028
すぐ修正出来るとこ修正
Jun 29, 2020
5ec33d2
スライドショー
Jun 29, 2020
2da3284
Merge pull request #74 from hitomi-neko/hiromi-working
hitomi-neko Jun 29, 2020
6b8866f
Merge pull request #76 from hitomi-neko/master
hitomi-neko Jun 29, 2020
8fabf28
細かいところのリンク切れ対策と言語
hitomi-neko Jun 29, 2020
b9dbc60
翻訳中
hitomi-neko Jun 29, 2020
49105a9
エディ突っ込んでみてる研究室のとこを四角で囲う
hitomi-neko Jun 29, 2020
3705fe2
翻訳少しやった
hitomi-neko Jun 29, 2020
c287bd3
追記
hitomi-neko Jun 29, 2020
8065455
Merge pull request #78 from hitomi-neko/miyazaki-working
hitomi-neko Jun 29, 2020
4808408
Merge pull request #79 from hitomi-neko/master
hitomi-neko Jun 29, 2020
7bee4f3
ミス発見
hitomi-neko Jun 29, 2020
25348d1
Merge pull request #82 from hitomi-neko/miyazaki-working
hitomi-neko Jun 29, 2020
3583866
Merge pull request #83 from hitomi-neko/master
hitomi-neko Jun 29, 2020
f939e07
一旦
hitomi-neko Jun 29, 2020
0a5de0f
work翻訳
hitomi-neko Jun 29, 2020
15581b9
0629
hitomi-neko Jun 29, 2020
d726ca2
Merge pull request #84 from hitomi-neko/miyazaki-working
hitomi-neko Jun 29, 2020
4aa6d9e
Merge pull request #85 from hitomi-neko/master
hitomi-neko Jun 29, 2020
afc6a9d
トップへボタンの装飾
Jun 30, 2020
dfaa488
一旦コミット
Jun 30, 2020
1a45e49
トラポに反映
Jun 30, 2020
ae64541
Merge pull request #88 from hitomi-neko/hiromi-working
hitomi-neko Jun 30, 2020
b864232
Merge pull request #89 from hitomi-neko/master
hitomi-neko Jun 30, 2020
ee22fa0
迷子防止とキャプション
hitomi-neko Jun 30, 2020
9e20000
Merge pull request #90 from hitomi-neko/miyazaki-working
hitomi-neko Jun 30, 2020
442bcd6
Merge pull request #91 from hitomi-neko/master
hitomi-neko Jun 30, 2020
d04d8ce
微修正
hitomi-neko Jun 30, 2020
85468bd
トップページずれ修正
Jun 30, 2020
6924502
作品集のずれ修正
Jun 30, 2020
03480e8
ミス
hitomi-neko Jun 30, 2020
e5fdee3
一旦コミット
Jun 30, 2020
8dac09a
全部に対応する研究室css作成
Jun 30, 2020
9e3646f
いじったけどむずい
hitomi-neko Jun 30, 2020
37e5a00
リンクが…
hitomi-neko Jun 30, 2020
1ad2d12
Merge pull request #92 from hitomi-neko/miyazaki-working
hitomi-neko Jun 30, 2020
c912e57
現段階で綺麗に整列
Jun 30, 2020
9c6c0a6
footerの高さ足りなかった
Jun 30, 2020
8f863d1
Merge branch 'master' into hiromi-working
hitomi-neko Jul 1, 2020
6a8bf58
Merge pull request #93 from hitomi-neko/hiromi-working
hitomi-neko Jul 1, 2020
8a85e50
Merge pull request #94 from hitomi-neko/master
hitomi-neko Jul 1, 2020
121fab5
吹き出し復活
hitomi-neko Jul 1, 2020
e6415a5
リンク直し
hitomi-neko Jul 1, 2020
89b7178
Merge pull request #95 from hitomi-neko/miyazaki-working
hitomi-neko Jul 1, 2020
7f47187
Merge pull request #96 from hitomi-neko/master
hitomi-neko Jul 1, 2020
de02b2b
iconResize
hitomi-neko Jul 1, 2020
0766f10
アニ基礎
hitomi-neko Jul 1, 2020
e7efe05
Merge pull request #99 from hitomi-neko/miyazaki-working
hitomi-neko Jul 1, 2020
d776b4f
Merge pull request #101 from hitomi-neko/master
hitomi-neko Jul 1, 2020
58b4e01
人間工学リンク
hitomi-neko Jul 1, 2020
bc4dd78
Merge pull request #103 from hitomi-neko/miyazaki-working
hitomi-neko Jul 1, 2020
aed261c
Merge pull request #105 from hitomi-neko/master
hitomi-neko Jul 1, 2020
2ce9a1e
main-visualまでレスポンジブ
Jul 1, 2020
8aeb911
スタジオ紹介まで終了
Jul 1, 2020
2eb76d0
メインページ終了
Jul 1, 2020
d24c510
Merge pull request #107 from hitomi-neko/hiromi-working
hitomi-neko Jul 1, 2020
0994f2a
Merge pull request #108 from hitomi-neko/master
hitomi-neko Jul 1, 2020
7f78e88
loading
hitomi-neko Jul 1, 2020
ff72efd
ちょっと反映
hitomi-neko Jul 1, 2020
e735c16
ヘッダー文字サイズ調節
Jul 1, 2020
51850cd
ボタン調整
Jul 1, 2020
8e244fd
topPageへの言語情報渡しとロード(研究室)
hitomi-neko Jul 1, 2020
67d0bc0
Merge pull request #109 from hitomi-neko/miyazaki-working
hitomi-neko Jul 1, 2020
ab4d4b6
Merge pull request #110 from hitomi-neko/master
hitomi-neko Jul 1, 2020
3d32ee2
totop
hitomi-neko Jul 1, 2020
de050f1
Merge pull request #111 from hitomi-neko/miyazaki-working
hitomi-neko Jul 1, 2020
0a2fb3f
Merge pull request #112 from hitomi-neko/master
hitomi-neko Jul 1, 2020
b5cee82
作品集ページレスポンシブ終了
Jul 1, 2020
9ad7106
Merge branch 'hiromi-working-0701' of https://github.com/hitomi-neko/…
Jul 1, 2020
7ba7cf0
みんなの図書レスポンシブ終了
Jul 1, 2020
ad8353b
Merge pull request #114 from hitomi-neko/hiromi-working-0701
hitomi-neko Jul 1, 2020
0906d5e
Merge pull request #115 from hitomi-neko/master
hitomi-neko Jul 1, 2020
cfa259b
Merge pull request #116 from hitomi-neko/miyazaki-working
hitomi-neko Jul 1, 2020
00134c4
Merge pull request #117 from hitomi-neko/master
hitomi-neko Jul 1, 2020
1c1f09c
みんなの図書のリンク切れ防止
hitomi-neko Jul 1, 2020
b77a60b
Merge pull request #118 from hitomi-neko/master
hitomi-neko Jul 1, 2020
262edf8
Merge pull request #119 from hitomi-neko/master
hitomi-neko Jul 1, 2020
8457a70
やさしい日本語版のQ&A
hitomi-neko Jul 1, 2020
6230d96
ホバー修正
Jul 1, 2020
00931e8
Merge branch 'hiromi-working-0701' of https://github.com/hitomi-neko/…
Jul 1, 2020
f4b88d0
資料・言語幅修正
Jul 1, 2020
1aabdf2
Merge pull request #120 from hitomi-neko/hiromi-working-0701
hitomi-neko Jul 1, 2020
741a264
Merge pull request #121 from hitomi-neko/master
hitomi-neko Jul 1, 2020
641292b
トラポ反映
Jul 1, 2020
171cfc7
naoshi
hitomi-neko Jul 1, 2020
a976a2d
Merge pull request #122 from hitomi-neko/miyazaki-working
hitomi-neko Jul 1, 2020
79839e0
Merge pull request #123 from hitomi-neko/master
hitomi-neko Jul 1, 2020
c60ff47
全スタジオに適応
Jul 1, 2020
073773a
Merge branch 'hiromi-working-0701' of https://github.com/hitomi-neko/…
Jul 1, 2020
bfefef9
caption_work
hitomi-neko Jul 1, 2020
90e4a8d
Merge pull request #124 from hitomi-neko/hiromi-working-0701
hitomi-neko Jul 1, 2020
47f850b
Merge pull request #125 from hitomi-neko/master
hitomi-neko Jul 1, 2020
bf07055
Merge pull request #126 from hitomi-neko/miyazaki-working
hitomi-neko Jul 1, 2020
f606bb9
Merge pull request #127 from hitomi-neko/master
hitomi-neko Jul 1, 2020
853a0f5
微修正
hitomi-neko Jul 1, 2020
1227b99
Merge pull request #128 from hitomi-neko/miyazaki-working
hitomi-neko Jul 1, 2020
56df89c
Merge pull request #129 from hitomi-neko/master
hitomi-neko Jul 1, 2020
612bede
微修正
hitomi-neko Jul 2, 2020
b434ef5
ロードの背景を黒に
hitomi-neko Jul 2, 2020
eaf095f
Merge pull request #133 from hitomi-neko/master
hitomi-neko Jul 2, 2020
8412027
Merge pull request #134 from hitomi-neko/master
hitomi-neko Jul 2, 2020
a6cad6e
言語切り替え(スタジオのキャプション)
hitomi-neko Jul 2, 2020
2ae5ee3
Merge pull request #135 from hitomi-neko/master
hitomi-neko Jul 2, 2020
a64673e
学生作品文章調整
Jul 2, 2020
9858127
言語メニュー文字サイズ修正
Jul 2, 2020
d74e413
hitomi-neko Jul 2, 2020
bbe9318
Merge pull request #136 from hitomi-neko/master
hitomi-neko Jul 2, 2020
40d5dca
PMページ
hitomi-neko Jul 2, 2020
1bd8a4e
Merge pull request #137 from hitomi-neko/miyazaki-working
hitomi-neko Jul 2, 2020
2bbf635
Merge pull request #138 from hitomi-neko/master
hitomi-neko Jul 2, 2020
7dadcf6
インスタアイコン
hitomi-neko Jul 2, 2020
910bde1
Merge pull request #139 from hitomi-neko/miyazaki-working
hitomi-neko Jul 2, 2020
8f59c20
ロードふわって
hitomi-neko Jul 2, 2020
5284b4d
ふわっと消えるロード
hitomi-neko Jul 2, 2020
052e865
Merge pull request #140 from hitomi-neko/miyazaki-working
hitomi-neko Jul 2, 2020
04be8ed
コミット
Jul 2, 2020
6593313
Merge branch 'hiromi-working-0701' of https://github.com/hitomi-neko/…
Jul 2, 2020
b0bfae0
Merge branch 'hiromi-working-0701' into master
hitomi-neko Jul 2, 2020
434b9fa
Merge pull request #141 from hitomi-neko/master
hitomi-neko Jul 2, 2020
4eea1b1
画面キャプチャのため、変更点を一旦コミット
Jul 2, 2020
ace7af9
修正
hitomi-neko Jul 2, 2020
338232b
Merge branch 'hiromi-working-0701' of https://github.com/hitomi-neko/…
Jul 2, 2020
e6d9a36
Merge pull request #142 from hitomi-neko/master
hitomi-neko Jul 2, 2020
64e6fba
Merge pull request #143 from hitomi-neko/master
hitomi-neko Jul 2, 2020
173c570
閉じるボタン追加
Jul 2, 2020
39e2b22
Merge branch 'hiromi-working-0701' of https://github.com/hitomi-neko/…
Jul 2, 2020
9afccf4
Merge pull request #147 from hitomi-neko/hiromi-working-0701
hitomi-neko Jul 2, 2020
773979a
Merge pull request #148 from hitomi-neko/master
hitomi-neko Jul 2, 2020
d4486c5
トラポ修正
hitomi-neko Jul 2, 2020
65f6482
Merge pull request #149 from hitomi-neko/miyazaki-working
hitomi-neko Jul 2, 2020
53c75ad
リンク
hitomi-neko Jul 2, 2020
cbed5fd
CLOSEに
hitomi-neko Jul 2, 2020
f6e0c2e
CLOSEBTN
hitomi-neko Jul 2, 2020
53d11db
Merge pull request #150 from hitomi-neko/master
hitomi-neko Jul 2, 2020
f0e67a8
Merge pull request #153 from hitomi-neko/master
hitomi-neko Jul 2, 2020
95037bb
linker
hitomi-neko Jul 2, 2020
404aacd
Merge pull request #155 from hitomi-neko/master
hitomi-neko Jul 2, 2020
e52a430
br修正
Jul 2, 2020
f68dae3
余白すこし修正
Jul 2, 2020
af28cbe
Merge pull request #158 from hitomi-neko/hiromi-working-0701
hitomi-neko Jul 2, 2020
68c4381
load
hitomi-neko Jul 2, 2020
9194b46
Merge pull request #162 from hitomi-neko/master
hitomi-neko Jul 2, 2020
6b324f9
修正
hitomi-neko Jul 2, 2020
7f23881
Merge pull request #166 from hitomi-neko/master
hitomi-neko Jul 2, 2020
ca9fc5c
微修正
hitomi-neko Jul 2, 2020
ae28021
Merge pull request #168 from hitomi-neko/master
hitomi-neko Jul 2, 2020
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
4 changes: 2 additions & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
@@ -224,14 +224,14 @@ <h1 id="nomalTitle" style="display: block">東京都立大学<br class="br">シ
<h1 id="easyTitle" style="display: none"><ruby>
<rb>東京都立大学</rb>
<rt>とうきょうとりつだいがく</rt>
</ruby>システムデザイン<ruby>
</ruby><br class="br">システムデザイン<ruby>
<rb>学部</rb>
<rt>がくぶ</rt>
</ruby><br>インダストリアルアート<ruby>
<rb>学科</rb>
<rt>がっか</rt>
</ruby></h1>
<h1 id="englishTitle" style="display: none">Department of Industrial Art</h1>
<h1 id="englishTitle" style="display: none">Department of <br class="br">Industrial Art</h1>
<h2 id="englishTitle2" style="display: none">Faculty of Systems Design, Tokyo Metropolitan University</h2>
<div>
<h3 id="nomalCopy" style="display: block"><span style="font-size: 1.5rem;">「アート」</span><br> <span
10 changes: 5 additions & 5 deletions docs/sass/view-style.css
Original file line number Diff line number Diff line change
@@ -15,13 +15,14 @@ body {
overflow: hidden;
}


#showloading {
width: 100%;
height: 100vh;

background-color: #000000;
position: fixed;
z-index: 20;

}

#showloading img {
@@ -38,16 +39,15 @@ body {

.fadeout-bg {
transition-property: opacity;
transition-delay: .3s;
transition-duration: .2s;
transition-delay: .2s;
transition-duration: .1s;
opacity: 0;
pointer-events: none;
}

.hidden {
display: none;
}

header {
width: 100%;
height: 80px;
@@ -320,7 +320,7 @@ header .right_h #type1:checked ~ #links1 li {
.main-visual h1 {
color: #fff;
padding-top: 7rem;
padding-left: 2rem;
padding-left: 1.5rem;
font-size: 1.4rem;
z-index: 1;
line-height: 4rem;
Loading