Skip to content

Commit 81dc68c

Browse files
author
=
committed
Tweak footer and info component
1 parent a2cb5f5 commit 81dc68c

File tree

9 files changed

+446
-173
lines changed

9 files changed

+446
-173
lines changed

.idea/dictionaries/chenwen.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/workspace.xml

Lines changed: 190 additions & 121 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/css/app.css

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4465,6 +4465,10 @@ table {
44654465
padding: 90px;
44664466
}
44674467

4468+
.p-100 {
4469+
padding: 100px;
4470+
}
4471+
44684472
.p-240 {
44694473
padding: 240px;
44704474
}
@@ -4653,6 +4657,16 @@ table {
46534657
padding-right: 90px;
46544658
}
46554659

4660+
.py-100 {
4661+
padding-top: 100px;
4662+
padding-bottom: 100px;
4663+
}
4664+
4665+
.px-100 {
4666+
padding-left: 100px;
4667+
padding-right: 100px;
4668+
}
4669+
46564670
.py-240 {
46574671
padding-top: 240px;
46584672
padding-bottom: 240px;
@@ -4961,6 +4975,22 @@ table {
49614975
padding-left: 90px;
49624976
}
49634977

4978+
.pt-100 {
4979+
padding-top: 100px;
4980+
}
4981+
4982+
.pr-100 {
4983+
padding-right: 100px;
4984+
}
4985+
4986+
.pb-100 {
4987+
padding-bottom: 100px;
4988+
}
4989+
4990+
.pl-100 {
4991+
padding-left: 100px;
4992+
}
4993+
49644994
.pt-240 {
49654995
padding-top: 240px;
49664996
}
@@ -10606,6 +10636,10 @@ main {
1060610636
padding: 90px;
1060710637
}
1060810638

10639+
.sm\:p-100 {
10640+
padding: 100px;
10641+
}
10642+
1060910643
.sm\:p-240 {
1061010644
padding: 240px;
1061110645
}
@@ -10794,6 +10828,16 @@ main {
1079410828
padding-right: 90px;
1079510829
}
1079610830

10831+
.sm\:py-100 {
10832+
padding-top: 100px;
10833+
padding-bottom: 100px;
10834+
}
10835+
10836+
.sm\:px-100 {
10837+
padding-left: 100px;
10838+
padding-right: 100px;
10839+
}
10840+
1079710841
.sm\:py-240 {
1079810842
padding-top: 240px;
1079910843
padding-bottom: 240px;
@@ -11102,6 +11146,22 @@ main {
1110211146
padding-left: 90px;
1110311147
}
1110411148

11149+
.sm\:pt-100 {
11150+
padding-top: 100px;
11151+
}
11152+
11153+
.sm\:pr-100 {
11154+
padding-right: 100px;
11155+
}
11156+
11157+
.sm\:pb-100 {
11158+
padding-bottom: 100px;
11159+
}
11160+
11161+
.sm\:pl-100 {
11162+
padding-left: 100px;
11163+
}
11164+
1110511165
.sm\:pt-240 {
1110611166
padding-top: 240px;
1110711167
}
@@ -16582,6 +16642,10 @@ main {
1658216642
padding: 90px;
1658316643
}
1658416644

16645+
.md\:p-100 {
16646+
padding: 100px;
16647+
}
16648+
1658516649
.md\:p-240 {
1658616650
padding: 240px;
1658716651
}
@@ -16770,6 +16834,16 @@ main {
1677016834
padding-right: 90px;
1677116835
}
1677216836

16837+
.md\:py-100 {
16838+
padding-top: 100px;
16839+
padding-bottom: 100px;
16840+
}
16841+
16842+
.md\:px-100 {
16843+
padding-left: 100px;
16844+
padding-right: 100px;
16845+
}
16846+
1677316847
.md\:py-240 {
1677416848
padding-top: 240px;
1677516849
padding-bottom: 240px;
@@ -17078,6 +17152,22 @@ main {
1707817152
padding-left: 90px;
1707917153
}
1708017154

17155+
.md\:pt-100 {
17156+
padding-top: 100px;
17157+
}
17158+
17159+
.md\:pr-100 {
17160+
padding-right: 100px;
17161+
}
17162+
17163+
.md\:pb-100 {
17164+
padding-bottom: 100px;
17165+
}
17166+
17167+
.md\:pl-100 {
17168+
padding-left: 100px;
17169+
}
17170+
1708117171
.md\:pt-240 {
1708217172
padding-top: 240px;
1708317173
}
@@ -22558,6 +22648,10 @@ main {
2255822648
padding: 90px;
2255922649
}
2256022650

22651+
.lg\:p-100 {
22652+
padding: 100px;
22653+
}
22654+
2256122655
.lg\:p-240 {
2256222656
padding: 240px;
2256322657
}
@@ -22746,6 +22840,16 @@ main {
2274622840
padding-right: 90px;
2274722841
}
2274822842

22843+
.lg\:py-100 {
22844+
padding-top: 100px;
22845+
padding-bottom: 100px;
22846+
}
22847+
22848+
.lg\:px-100 {
22849+
padding-left: 100px;
22850+
padding-right: 100px;
22851+
}
22852+
2274922853
.lg\:py-240 {
2275022854
padding-top: 240px;
2275122855
padding-bottom: 240px;
@@ -23054,6 +23158,22 @@ main {
2305423158
padding-left: 90px;
2305523159
}
2305623160

23161+
.lg\:pt-100 {
23162+
padding-top: 100px;
23163+
}
23164+
23165+
.lg\:pr-100 {
23166+
padding-right: 100px;
23167+
}
23168+
23169+
.lg\:pb-100 {
23170+
padding-bottom: 100px;
23171+
}
23172+
23173+
.lg\:pl-100 {
23174+
padding-left: 100px;
23175+
}
23176+
2305723177
.lg\:pt-240 {
2305823178
padding-top: 240px;
2305923179
}
@@ -28534,6 +28654,10 @@ main {
2853428654
padding: 90px;
2853528655
}
2853628656

28657+
.xl\:p-100 {
28658+
padding: 100px;
28659+
}
28660+
2853728661
.xl\:p-240 {
2853828662
padding: 240px;
2853928663
}
@@ -28722,6 +28846,16 @@ main {
2872228846
padding-right: 90px;
2872328847
}
2872428848

28849+
.xl\:py-100 {
28850+
padding-top: 100px;
28851+
padding-bottom: 100px;
28852+
}
28853+
28854+
.xl\:px-100 {
28855+
padding-left: 100px;
28856+
padding-right: 100px;
28857+
}
28858+
2872528859
.xl\:py-240 {
2872628860
padding-top: 240px;
2872728861
padding-bottom: 240px;
@@ -29030,6 +29164,22 @@ main {
2903029164
padding-left: 90px;
2903129165
}
2903229166

29167+
.xl\:pt-100 {
29168+
padding-top: 100px;
29169+
}
29170+
29171+
.xl\:pr-100 {
29172+
padding-right: 100px;
29173+
}
29174+
29175+
.xl\:pb-100 {
29176+
padding-bottom: 100px;
29177+
}
29178+
29179+
.xl\:pl-100 {
29180+
padding-left: 100px;
29181+
}
29182+
2903329183
.xl\:pt-240 {
2903429184
padding-top: 240px;
2903529185
}
@@ -34510,6 +34660,10 @@ main {
3451034660
padding: 90px;
3451134661
}
3451234662

34663+
.xxl\:p-100 {
34664+
padding: 100px;
34665+
}
34666+
3451334667
.xxl\:p-240 {
3451434668
padding: 240px;
3451534669
}
@@ -34698,6 +34852,16 @@ main {
3469834852
padding-right: 90px;
3469934853
}
3470034854

34855+
.xxl\:py-100 {
34856+
padding-top: 100px;
34857+
padding-bottom: 100px;
34858+
}
34859+
34860+
.xxl\:px-100 {
34861+
padding-left: 100px;
34862+
padding-right: 100px;
34863+
}
34864+
3470134865
.xxl\:py-240 {
3470234866
padding-top: 240px;
3470334867
padding-bottom: 240px;
@@ -35006,6 +35170,22 @@ main {
3500635170
padding-left: 90px;
3500735171
}
3500835172

35173+
.xxl\:pt-100 {
35174+
padding-top: 100px;
35175+
}
35176+
35177+
.xxl\:pr-100 {
35178+
padding-right: 100px;
35179+
}
35180+
35181+
.xxl\:pb-100 {
35182+
padding-bottom: 100px;
35183+
}
35184+
35185+
.xxl\:pl-100 {
35186+
padding-left: 100px;
35187+
}
35188+
3500935189
.xxl\:pt-240 {
3501035190
padding-top: 240px;
3501135191
}

public/js/app.js

Lines changed: 46 additions & 33 deletions
Large diffs are not rendered by default.

resources/js/components/_Info.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
<transition name="slide-fade">
33
<div class="fixed pin-b pin-l w-full z-10" v-show="isVisible">
44
<ul class="flex bg-teal-link flex-wrap">
5-
<li class="flex-1 text-center border-white border-r">
6-
<p class="info sm:pl-12">RESERVATION:ご予約はこちらから</p>
5+
<li class="w-full lg:w-1/3 text-center border-white border-r">
6+
<p class="info text-center">RESERVATION:ご予約はこちらから</p>
77
</li>
88

9-
<li class="flex-1 border-white border-r list">
9+
<li class="w-1/2 lg:w-1/3 border-white border-r list">
1010
<a
1111
href="https://beauty.hotpepper.jp/CSP/kr/reserve/?storeId=H000248220"
12-
class="info arrow sm:pl-12"
12+
class="info arrow pl-12"
1313
>
1414
Milano & Le Rochelle
1515
</a>
1616
</li>
1717

18-
<li class="flex-1 border-white border-r list">
18+
<li class="w-1/2 lg:w-1/3 border-white border-r list">
1919
<a
2020
href="https://beauty.hotpepper.jp/CSP/kr/reserve/?storeId=H000364510"
21-
class="info arrow sm:pl-12"
21+
class="info arrow pl-12"
2222
>
2323
Lisbon
2424
</a>

resources/js/routes.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ let routes = [
7070
path: '/recruit/hire',
7171
component: require('./views/RecruitHire').default,
7272
name: '募集要項',
73+
},
74+
{
75+
path: '*',
76+
redirect: '/',
7377
}
7478
];
7579

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<footer class="pb-100 lg:pb-50 bg-grey-lighter">
2+
<div class="container mx-auto flex lg:justify-between text-xs text-grey-darker justify-center">
3+
<span class="leading-50">Copyright © For Practice.</span>
4+
5+
<div class="hidden lg:inline-block font-adobe tracking-loose">
6+
<router-link tag="a" to="/recruit" class="leading-50 text-grey-darker">
7+
Recruit /
8+
</router-link>
9+
10+
<router-link tag="a" to="/" class="leading-50 text-grey-darker">
11+
Site Map
12+
</router-link>
13+
</div>
14+
</div>
15+
</footer>

resources/views/layouts/master.blade.php

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,9 @@
2929
</div>
3030
</main>
3131

32-
{{-- <footer class="pb-50 bg-grey-lighter">--}}
33-
{{-- <div class="container mx-auto flex justify-between text-xs text-grey-darker">--}}
34-
{{-- <span class="leading-50">Copyright © CASABLANCA All Rights Reserved.</span>--}}
35-
36-
{{-- <div>--}}
37-
{{-- <a href="/" class="leading-50 text-grey-darker">Recruit</a> / <a href="/"--}}
38-
{{-- class="leading-50 text-grey-darker">Site--}}
39-
{{-- Map</a>--}}
40-
{{-- </div>--}}
41-
{{-- </div>--}}
42-
{{-- </footer>--}}
43-
44-
{{-- <info></info>--}}
32+
@include('layouts.footer')
33+
34+
<info></info>
4535
</div>
4636

4737
</body>

0 commit comments

Comments
 (0)