update master layout

mckenziearts · mckenziearts · commit 585812dad41c · 2019-03-29T21:43:16.000+01:00
diff --git a/config/translatable.php b/config/translatable.php
@@ -5,5 +5,5 @@
     /*
      * If a translation has not been set for a given locale, use this locale instead.
      */
-    'fallback_locale' => 'en',
+    'fallback_locale' => 'fr',
 ];
diff --git a/config/typicms.php b/config/typicms.php
@@ -36,4 +36,11 @@
     */
     'template_dir' => 'public',
 
+    'lang_chooser' => false,
+
+    'languages' => [
+        'en' => 'English (En)',
+        'fr' => 'Français (Fr)',
+    ],
+
 ];
diff --git a/public/css/public.css b/public/css/public.css
diff --git a/public/js/admin.js b/public/js/admin.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,7 +1,7 @@
 {
-    "/js/admin.js": "/js/admin.js?id=aacced15caa7e30d5424",
+    "/js/admin.js": "/js/admin.js?id=c1519ded8a77f50c518c",
     "/css/admin.css": "/css/admin.css?id=1f4590f4a3f74a5cee19",
-    "/css/public.css": "/css/public.css?id=3acf878a3829ea912e0f",
+    "/css/public.css": "/css/public.css?id=5bfae0218ce9f5784aae",
     "/js/public.js": "/js/public.js?id=0aae02c88b7c8512fff0",
     "/components/simplemde/simplemde.js": "/components/simplemde/simplemde.js?id=fd052f831c01ff10535c",
     "/components/simplemde/simplemde.css": "/components/simplemde/simplemde.css?id=b8697c785bbf0627fb05",
diff --git a/resources/lang/fr.json b/resources/lang/fr.json
diff --git a/resources/scss/public/_base.scss b/resources/scss/public/_base.scss
@@ -486,6 +486,10 @@ footer.footer {
     height: 2px;
     background-color: $white;
   }
+
+  .lang-switcher {
+    margin-bottom: 30px;
+  }
 }
 
 /* Return on top */
diff --git a/resources/scss/public/pages/_home.scss b/resources/scss/public/pages/_home.scss
@@ -120,6 +120,7 @@ section.posts-events {
   }
 
   @include media-breakpoint-up(lg) {
+    margin-top: 50px;
     .lastest-post {
       //@include make-col(8);
       display: block;
diff --git a/resources/views/vendor/core/public/_lang-switcher.blade.php b/resources/views/vendor/core/public/_lang-switcher.blade.php
@@ -1,7 +1,7 @@
 @if ($enabledLocales = TypiCMS::enabledLocales() and count($enabledLocales) > 1)
 <nav class="lang-switcher dropdown">
-    <button class="lang-switcher-btn btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="dropdownLangSwitcher">
-        {{ $lang }}
+    <button class="lang-switcher-btn btn btn-white dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="dropdownLangSwitcher">
+        {{ config('typicms.languages.'. $lang) }}
     </button>
     <div class="lang-switcher-list dropdown-menu" aria-labelledby="dropdownLangSwitcher">
         @foreach ($enabledLocales as $locale)
diff --git a/resources/views/vendor/core/public/master.blade.php b/resources/views/vendor/core/public/master.blade.php
@@ -195,6 +195,7 @@ function gtag(){dataLayer.push(arguments);}
                     <li class="link__github"><a href="https://github.com/laravelcm" target="_blank">Github</a></li>--}}
                     @menu('footer-links')
                 </ul>
+                @include('core::public._lang-switcher')
                 <p> &copy; Copyright {{ date('Y') }}</p>
             </div>
         </footer>

Original file line number	Diff line number	Diff line change
`@@ -486,6 +486,10 @@ footer.footer {`
`486`	`486`	`height: 2px;`
`487`	`487`	`background-color: $white;`
`488`	`488`	`}`
	`489`	`+`
	`490`	`+ .lang-switcher {`
	`491`	`+ margin-bottom: 30px;`
	`492`	`+ }`
`489`	`493`	`}`
`490`	`494`
`491`	`495`	`/* Return on top */`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,7 @@ section.posts-events {`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`@include media-breakpoint-up(lg) {`
	`123`	`+ margin-top: 50px;`
`123`	`124`	`.lastest-post {`
`124`	`125`	`//@include make-col(8);`
`125`	`126`	`display: block;`