Skip to content

Commit 0149264

Browse files
authored
Merge pull request #36 from gaogao-asia/issue_#33/vuetifyでリッチに
Issue #33/vuetifyでリッチに
2 parents 477efe4 + 36c50c6 commit 0149264

File tree

21 files changed

+112131
-44382
lines changed

21 files changed

+112131
-44382
lines changed

package-lock.json

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

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,13 @@
2525
},
2626
"dependencies": {
2727
"@tinymce/tinymce-vue": "^3.0.1",
28+
"bootstrap-vue": "^2.0.3",
29+
"css-loader": "^3.2.0",
2830
"eslint-config-vue": "^2.0.2",
2931
"eslint-plugin-vue": "^5.0.0-beta.6",
32+
"material-design-icons-iconfont": "^5.0.1",
3033
"vue-router": "^3.0.6",
34+
"vuetify": "^2.1.2",
3135
"vuex": "^3.1.0"
3236
}
3337
}

public/css/app.css

Lines changed: 49 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ mark,
511511
}
512512

513513
.blockquote-footer::before {
514-
content: "\2014\A0";
514+
content: "— ";
515515
}
516516

517517
.img-fluid {
@@ -10948,7 +10948,7 @@ a.m-btn {
1094810948

1094910949
.fa-location::before {
1095010950
font-family: "Font Awesome 5 Free";
10951-
content: "\F3C5";
10951+
content: "";
1095210952
font-weight: 600;
1095310953
color: #666666;
1095410954
}
@@ -10959,155 +10959,155 @@ a.m-btn {
1095910959

1096010960
.fa-clock::before {
1096110961
font-family: "Font Awesome 5 Free";
10962-
content: "\F017";
10962+
content: "";
1096310963
font-weight: 600;
1096410964
}
1096510965

1096610966
.fa-credit-card::before {
1096710967
font-family: "Font Awesome 5 Free";
10968-
content: "\F09D";
10968+
content: "";
1096910969
font-weight: 600;
1097010970
}
1097110971

1097210972
.fa-sleep::before {
1097310973
font-family: "Font Awesome 5 Free";
10974-
content: "\F236";
10974+
content: "";
1097510975
font-weight: 600;
1097610976
}
1097710977

1097810978
.fa-train::before {
1097910979
font-family: "Font Awesome 5 Free";
10980-
content: "\F238";
10980+
content: "";
1098110981
font-weight: 600;
1098210982
}
1098310983

1098410984
.fa-eat::before {
1098510985
font-family: "Font Awesome 5 Free";
10986-
content: "\F2E7";
10986+
content: "";
1098710987
font-weight: 600;
1098810988
}
1098910989

1099010990
.fa-restaurant::before {
1099110991
font-family: "Font Awesome 5 Free";
10992-
content: "\F54E";
10992+
content: "";
1099310993
font-weight: 600;
1099410994
}
1099510995

1099610996
.fa-lunch::before {
1099710997
font-family: "Font Awesome 5 Free";
10998-
content: "\F185";
10998+
content: "";
1099910999
font-weight: 600;
1100011000
}
1100111001

1100211002
.fa-dinner::before {
1100311003
font-family: "Font Awesome 5 Free";
11004-
content: "\F186";
11004+
content: "";
1100511005
font-weight: 600;
1100611006
}
1100711007

1100811008
.fa-star-yellow::before {
1100911009
font-family: "Font Awesome 5 Free";
11010-
content: "\F005";
11010+
content: "";
1101111011
font-weight: 600;
1101211012
color: #FFD20B;
1101311013
}
1101411014

1101511015
.fa-star-gray::before {
1101611016
font-family: "Font Awesome 5 Free";
11017-
content: "\F005";
11017+
content: "";
1101811018
font-weight: 600;
1101911019
color: #DEDEDE;
1102011020
}
1102111021

1102211022
.fa-heart-red::before {
1102311023
font-family: "Font Awesome 5 Free";
11024-
content: "\F004";
11024+
content: "";
1102511025
font-weight: 600;
1102611026
color: #ff9393;
1102711027
}
1102811028

1102911029
.fa-heart-gray::before {
1103011030
font-family: "Font Awesome 5 Free";
11031-
content: "\F004";
11031+
content: "";
1103211032
font-weight: 600;
1103311033
color: #DEDEDE;
1103411034
}
1103511035

1103611036
.fa-yen::before {
1103711037
font-family: "Font Awesome 5 Free";
11038-
content: "\F157";
11038+
content: "";
1103911039
font-weight: 600;
1104011040
}
1104111041

1104211042
.fa-key::before {
1104311043
font-family: "Font Awesome 5 Free";
11044-
content: "\F084";
11044+
content: "";
1104511045
font-weight: 600;
1104611046
}
1104711047

1104811048
.fa-signout::before {
1104911049
font-family: "Font Awesome 5 Free";
11050-
content: "\F2F5";
11050+
content: "";
1105111051
font-weight: 600;
1105211052
}
1105311053

1105411054
.fa-search::before {
1105511055
font-family: "Font Awesome 5 Free";
11056-
content: "\F002";
11056+
content: "";
1105711057
font-weight: 600;
1105811058
}
1105911059

1106011060
.fa-question::before {
1106111061
font-family: "Font Awesome 5 Free";
11062-
content: "\F059";
11062+
content: "";
1106311063
font-weight: 600;
1106411064
}
1106511065

1106611066
.fa-map::before {
1106711067
font-family: "Font Awesome 5 Free";
11068-
content: "\F3C5";
11068+
content: "";
1106911069
font-weight: 600;
1107011070
}
1107111071

1107211072
.fa-friends::before {
1107311073
font-family: "Font Awesome 5 Free";
11074-
content: "\F500";
11074+
content: "";
1107511075
font-weight: 600;
1107611076
}
1107711077

1107811078
.fa-wink::before {
1107911079
font-family: "Font Awesome 5 Free";
11080-
content: "\F4DA";
11080+
content: "";
1108111081
font-weight: 600;
1108211082
}
1108311083

1108411084
.fa-twitter::before {
1108511085
font-family: "Font Awesome 5 Brands";
11086-
content: "\F099";
11086+
content: "";
1108711087
font-weight: 600;
1108811088
}
1108911089

1109011090
.fa-facebook::before {
1109111091
font-family: "Font Awesome 5 Brands";
11092-
content: "\F39E";
11092+
content: "";
1109311093
font-weight: 600;
1109411094
}
1109511095

1109611096
.fa-lightbulb::before {
1109711097
font-family: "Font Awesome 5 Free";
11098-
content: "\F0EB";
11098+
content: "";
1109911099
font-weight: 600;
1110011100
}
1110111101

1110211102
.fa-thumbs-up::before {
1110311103
font-family: "Font Awesome 5 Free";
11104-
content: "\F164";
11104+
content: "";
1110511105
font-weight: 600;
1110611106
}
1110711107

1110811108
.fa-crown::before {
1110911109
font-family: "Font Awesome 5 Free";
11110-
content: "\F521";
11110+
content: "";
1111111111
font-weight: 600;
1111211112
}
1111311113

@@ -11123,6 +11123,28 @@ a.m-btn {
1112311123
color: #E4B18D;
1112411124
}
1112511125

11126+
/* ----------------------------------------------------------------------------
11127+
* select
11128+
* ------------------------------------------------------------------------- */
11129+
11130+
.m-select {
11131+
background: url(/images/icon_arrow_down.svg) no-repeat right 16px center/12px auto;
11132+
border: 1px solid #ddd;
11133+
border-radius: 4px;
11134+
color: #666;
11135+
-webkit-appearance: none;
11136+
-moz-appearance: none;
11137+
-ms-appearance: none;
11138+
appearance: none;
11139+
text-indent: 0.01px;
11140+
text-overflow: "";
11141+
cursor: pointer;
11142+
text-align: center;
11143+
min-width: 152px;
11144+
padding: 4px 8px;
11145+
background-color: #fff;
11146+
}
11147+
1112611148
.navbar-laravel {
1112711149
background-color: #fff;
1112811150
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.04);
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)