diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss index 5a844aa..13a1307 100644 --- a/resources/sass/_variables.scss +++ b/resources/sass/_variables.scss @@ -1,49 +1,24 @@ -$spec: false; - // 色 //// メイン -$suwa00: #9ed6ff; -$suwa01: #8bb6d6; -$suwa02: #6ec0fb; -$suwa03: #3daee9; -$suwa04: #1d99f3; -$suwa05: #0094ff; -$suwa06: #3498db; -$suwa07: #2980b9; -$suwa08: #205e7d; -$suwa09: #2c3e50; -$suwa10: #34495e; +$suwa00: #f1d0ff; +$suwa01: #e4b4f8; +$suwa02: #d898f3; +$suwa03: #cb81ea; +$suwa04: #b16cce; +$suwa05: #a05ebd; +$suwa06: #9b59b6; +$suwa07: #61237c; +$suwa08: #46195a; +$suwa09: #341242; +$suwa10: #220a2c; -$evil0: #6e93ad; -$evil1: #436a86; -$evil2: #2b6b8b; -$evil3: #2980b9; -$evil4: #22699c; -$evil5: #04547d; -$evil6: #1a3746; - -@if $spec { - $suwa00: #ffe6f9; - $suwa01: #e599e5; - $suwa02: #ea81e8; - $suwa03: #e93de9; - $suwa04: #f31de8; - $suwa05: #ea00ff; - $suwa06: #db34d3; - $suwa07: #b929b2; - $suwa07: #b459b6; - $suwa08: #7d2069; - $suwa09: #502c50; - $suwa10: #5e345c; - - $evil0: #ad6ea8; - $evil1: #864386; - $evil2: #832b8b; - $evil3: #b929ad; - $evil4: #9c2296; - $evil5: #7d0469; - $evil6: #421a46; -} +$evil0: #916ead; +$evil1: #6b4386; +$evil2: #5d2b8b; +$evil3: #6c29b9; +$evil4: #57229c; +$evil5: #51047d; +$evil6: #2d1a46; //// 青 $dan1: #9ed6ff; diff --git a/resources/sass/_variables_f.scss b/resources/sass/_variables_f.scss new file mode 100644 index 0000000..aea2fc9 --- /dev/null +++ b/resources/sass/_variables_f.scss @@ -0,0 +1,21 @@ +// 色 +//// メイン +$suwa00: #ffe6f9; +$suwa01: #e599e5; +$suwa02: #ea81e8; +$suwa03: #e93de9; +$suwa04: #f31de8; +$suwa05: #ea00ff; +$suwa06: #db34d3; +$suwa07: #b459b6; +$suwa08: #7d2069; +$suwa09: #502c50; +$suwa10: #5e345c; + +$evil0: #ad6ea8; +$evil1: #864386; +$evil2: #832b8b; +$evil3: #b929ad; +$evil4: #9c2296; +$evil5: #7d0469; +$evil6: #421a46; diff --git a/resources/sass/_variables_m.scss b/resources/sass/_variables_m.scss new file mode 100644 index 0000000..29e73e1 --- /dev/null +++ b/resources/sass/_variables_m.scss @@ -0,0 +1,21 @@ +// 色 +//// メイン +$suwa00: #9ed6ff; +$suwa01: #8bb6d6; +$suwa02: #6ec0fb; +$suwa03: #3daee9; +$suwa04: #1d99f3; +$suwa05: #0094ff; +$suwa06: #3498db; +$suwa07: #2980b9; +$suwa08: #205e7d; +$suwa09: #2c3e50; +$suwa10: #34495e; + +$evil0: #6e93ad; +$evil1: #436a86; +$evil2: #2b6b8b; +$evil3: #2980b9; +$evil4: #22699c; +$evil5: #04547d; +$evil6: #1a3746; diff --git a/resources/sass/app_f.scss b/resources/sass/app_f.scss new file mode 100644 index 0000000..842ff68 --- /dev/null +++ b/resources/sass/app_f.scss @@ -0,0 +1,61 @@ +// Variables +@import "variables"; +@import "variables_f"; + +// Bootstrap +@import '~bootstrap/scss/bootstrap'; + +// フォント +@import "jpserriffont"; + +// ロゴ +@import "logo"; + +// ナビバー +@import "navbar"; + +// サイドメニュー +@import "sidemenu"; + +// コンテンツ +@import "contents"; + +// スクロール +@import "scroll"; + +// コンポーネント +@import "conponent/badge"; +@import "conponent/button"; +@import "conponent/check"; +@import "conponent/form"; +@import "conponent/modal"; +@import "conponent/select"; + +// テーブル +@import "conponent/table"; + +// その他 +#app { + font-family: monospace; + font-size: large; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + text-align: left; + margin-top: 48px; + margin-left: 0px; +} + +body { + font-family: 'jpserriffont'; + text-align: center; + color: $white1; + background-color: $black1; +} + +a { color: $suwa04; } +a:hover { color: $suwa03; } +// .new { background-color: $suwa09; margin: 10px auto; padding: 0; } +// .head > div { margin: 5px 0; } +// .new-head, .new-body { padding: 10px; } +// .new-head { border: 2px solid $suwa03; background-color: $suwa10; } +// .new-body { border-bottom: 2px solid $suwa03; border-left: 2px solid $suwa03; border-right: 2px solid $suwa03; } diff --git a/resources/sass/app_m.scss b/resources/sass/app_m.scss new file mode 100644 index 0000000..9bf90ee --- /dev/null +++ b/resources/sass/app_m.scss @@ -0,0 +1,61 @@ +// Variables +@import "variables"; +@import "variables_m"; + +// Bootstrap +@import '~bootstrap/scss/bootstrap'; + +// フォント +@import "jpserriffont"; + +// ロゴ +@import "logo"; + +// ナビバー +@import "navbar"; + +// サイドメニュー +@import "sidemenu"; + +// コンテンツ +@import "contents"; + +// スクロール +@import "scroll"; + +// コンポーネント +@import "conponent/badge"; +@import "conponent/button"; +@import "conponent/check"; +@import "conponent/form"; +@import "conponent/modal"; +@import "conponent/select"; + +// テーブル +@import "conponent/table"; + +// その他 +#app { + font-family: monospace; + font-size: large; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + text-align: left; + margin-top: 48px; + margin-left: 0px; +} + +body { + font-family: 'jpserriffont'; + text-align: center; + color: $white1; + background-color: $black1; +} + +a { color: $suwa04; } +a:hover { color: $suwa03; } +// .new { background-color: $suwa09; margin: 10px auto; padding: 0; } +// .head > div { margin: 5px 0; } +// .new-head, .new-body { padding: 10px; } +// .new-head { border: 2px solid $suwa03; background-color: $suwa10; } +// .new-body { border-bottom: 2px solid $suwa03; border-left: 2px solid $suwa03; border-right: 2px solid $suwa03; } diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php deleted file mode 100644 index b12d2d9..0000000 --- a/resources/views/layouts/admin.blade.php +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - {{ config('app.name', 'Laravel') }} - - - -
-
-
-
- -
-
-
-
-
    -
  • トップ
  • -
  • ブログ
  • -
  • ページ
  • -
  • ユーザ
  • -
-
-
- @yield('content') -
-
-
-
- - diff --git a/resources/views/layouts/site.blade.php b/resources/views/layouts/site.blade.php index d8c5398..0f65012 100644 --- a/resources/views/layouts/site.blade.php +++ b/resources/views/layouts/site.blade.php @@ -37,7 +37,13 @@ + @if (isset($user) && $user->profile->gender == 1) + + @elseif (isset($user) && $user->profile->gender == 2) + + @else + @endif