Update du skin et des scopes

magix-cms · Mar 25, 2019 · dacee62 · dacee62
1 parent 624d0ab
commit dacee62
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 37 deletions.
diff --git a/skin/default/css/desktop.min.css b/skin/default/css/desktop.min.css
diff --git a/skin/default/css/mobile.min.css b/skin/default/css/mobile.min.css
diff --git a/skin/default/css/src/less/mobile/header.less b/skin/default/css/src/less/mobile/header.less
@@ -48,6 +48,7 @@
 		padding: 15px;
 		border: none;
 		color: @text-color;
+		background-color: transparent;
 	}
 
 	.dropdown a {

diff --git a/skin/default/css/src/less/tablet/footer.less b/skin/default/css/src/less/tablet/footer.less
@@ -1,9 +1,3 @@
-.footer-colophon {
-	.col:last-child {
-		text-align: right;
-	}
-}
-
 #block-contact {
 	h4 + div {
 		padding: 20px 0;
@@ -29,4 +23,12 @@
 	#mailform {
 		padding: 15px;
 	}
+}
+
+@media (min-width: @screen-md-min) {
+	#footer {
+		.block {
+			margin-bottom: 20px;
+		}
+	}
 }
diff --git a/skin/default/css/tablet.min.css b/skin/default/css/tablet.min.css
diff --git a/skin/default/i18n/theme_en.conf b/skin/default/i18n/theme_en.conf
@@ -44,10 +44,12 @@ between     = between
 and_between = and between
 closed      = closed
 ### Footer
+about_footer    = About
 site_navigation = The site
 block_cms       = Informations
 block_cms_pages = 0
 ### Labels
+navigation = Navigation
 openNavigation  = Open the menu
 closeNavigation = Close the menu
 back_to_top         = back to the top of the page

diff --git a/skin/default/i18n/theme_nl.conf b/skin/default/i18n/theme_nl.conf
@@ -44,10 +44,12 @@ between     = tussen
 and_between = en tussen
 closed      = gesloten
 ### Footer
+about_footer    = Over
 site_navigation = de website
 block_cms       = Informatie
 block_cms_pages = 0
 ### Labels
+navigation = Navigatie
 openNavigation  = Open het menu
 closeNavigation = Sluit het menu
 back_to_top         = terug naar de bovenkant van de pagina

diff --git a/skin/default/news/brick/last-news.tpl b/skin/default/news/brick/last-news.tpl
@@ -6,8 +6,8 @@ conf = [
 assign="news"
 }
 {if $news}
-    <section id="last-news" class="container-fluid">
-        <div class="news-list row">
+    <section id="last-news" class="container-fluid" itemprop="hasPart" itemscope itemtype="http://schema.org/Periodical">
+        <div class="news-list row" itemprop="mainEntity" itemscope itemtype="http://schema.org/ItemList">
             <div class="container">
                 <h3>{#last_news#|ucfirst}</h3>
                 <div class="tile-list row row-center">

diff --git a/skin/default/phpstorm/scopes/Plugins_Style.xml b/skin/default/phpstorm/scopes/Plugins_Style.xml
@@ -1,3 +1,3 @@
 <component name="DependencyValidationManager">
-  <scope name="Plugins Style" pattern="file:plugins/*/css/src/*.less" />
+  <scope name="Plugins Style" pattern="file:plugins/*/css/src/*.less&amp;&amp;!file:plugins/*/skin//*" />
 </component>
diff --git a/skin/default/section/brick/lang.tpl b/skin/default/section/brick/lang.tpl
@@ -1,13 +1,13 @@
 <div class="dropdown">
-    {strip}<a class="dropdown-toggle btn" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+    {strip}<button id="menu-language" class="dropdown-toggle btn" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
         <span class="show-more"><i class="material-icons">arrow_drop_down</i></span>
         <span class="show-less"><i class="material-icons">arrow_drop_up</i></span>
         {if $smarty.get.strLangue}
             {$smarty.get.strLangue|upper}
         {else}
             {$defaultLang|upper}
         {/if}
-    </a>{/strip}
+    </button>{/strip}
     <ul class="dropdown-menu" aria-labelledby="menu-language">
         {foreach $dataLang as $k => $lang}
             {strip}{if isset($hreflang) && is_array($hreflang) && isset($hreflang[$lang.id_lang])}

diff --git a/skin/default/section/header.tpl b/skin/default/section/header.tpl
@@ -1,4 +1,4 @@
-<header id="header" class="header" role="navigation"{if !$touch}class="at-top"{/if}>
+<header id="header" class="header{if !$touch} at-top{/if}">
     <div class="container">
     {* Show Nav Button (xs ad sm only) *}
     <button type="button" class="toggle-menu navbar-toggle" data-toggle="collapse" data-target="#menu">
@@ -11,28 +11,13 @@
     {* Brand && Headline *}
     <div class="site-name">
         <a href="{$url}/{$lang}/" title="{#logo_link_title#|ucfirst}">
-            {strip}{capture name="sizes"}
-                (min-width: 1200px) 10vw,
-                (min-width: 992px) 15vw,
-                (orientation: landscape) and (min-width: 768px) 20vw,
-                (orientation: portrait) and (min-width: 480px) 25vw,
-                200px
-            {/capture}
+            {strip}{capture name="sizes"}(min-width: 1200px) 10vw, (min-width: 992px) 15vw, (orientation: landscape) and (min-width: 768px) 20vw, (orientation: portrait) and (min-width: 480px) 25vw, 200px{/capture}
             <picture>
             <!--[if IE 9]><video style="display: none;"><![endif]-->
-            <source type="image/webp"
-                    sizes="{$smarty.capture.sizes}"
-                    srcset="{$url}/skin/{$theme}/img/logo/webp/{#logo_img#}@229.webp 229w,
-                            {$url}/skin/{$theme}/img/logo/webp/{#logo_img#}@480.webp 480w">
-            <source sizes="{$smarty.capture.sizes}"
-                    srcset="{$url}/skin/{$theme}/img/logo/png/{#logo_img#}@229.png 229w,
-                            {$url}/skin/{$theme}/img/logo/png/{#logo_img#}@480.png 480w">
+            <source type="image/webp" sizes="{$smarty.capture.sizes}" srcset="{$url}/skin/{$theme}/img/logo/webp/{#logo_img#}@229.webp 229w, {$url}/skin/{$theme}/img/logo/webp/{#logo_img#}@480.webp 480w">
+            <source type="image/png" sizes="{$smarty.capture.sizes}" srcset="{$url}/skin/{$theme}/img/logo/png/{#logo_img#}@229.png 229w, {$url}/skin/{$theme}/img/logo/png/{#logo_img#}@480.png 480w">
             <!--[if IE 9]></video><![endif]-->
-            <img src="{$url}/skin/{$theme}/img/logo/png/{#logo_img#}@229.png"
-                 sizes="{$smarty.capture.sizes}"
-                 srcset="{$url}/skin/{$theme}/img/logo/png/{#logo_img#}@229.png 229w,
-                        {$url}/skin/{$theme}/img/logo/png/{#logo_img#}@480.png 480w"
-                 alt="{#logo_img_alt#|ucfirst} {$companyData.name}" />
+            <img src="{$url}/skin/{$theme}/img/logo/png/{#logo_img#}@229.png" sizes="{$smarty.capture.sizes}" srcset="{$url}/skin/{$theme}/img/logo/png/{#logo_img#}@229.png 229w,{$url}/skin/{$theme}/img/logo/png/{#logo_img#}@480.png 480w" alt="{#logo_img_alt#|ucfirst} {$companyData.name}" />
             </picture>{/strip}
         </a>
     </div>

diff --git a/skin/default/section/menu/loop/dropdown.tpl b/skin/default/section/menu/loop/dropdown.tpl
@@ -2,8 +2,6 @@
     {assign var="sn" value=0 scope="global"}
     {foreach $menuData as $k => $item}
         {assign var="dp" value=0}
-        {*{$current_controller = ($item.controller === $smarty.get.controller)}*}
-        {*{$current_page = ($item.type_link === 'plugin' || $item.id_page === null || $item.id_page == $smarty.get.id || $item.id_page == $smarty.get.id_parent || $item.id_page == $current.id_parent)}*}
         {if $item.controller === $active_link.controller && (!isset($item.id_page) || in_array($item.id_page,$active_link.ids))}{$item.active = true}{/if}
         <li class="panel{if $item.active} active{/if}">
             {if $item.mode_link === 'mega'}{$mega = true}{else}{$mega = false}{/if}

diff --git a/skin/default/section/menu/primary.tpl b/skin/default/section/menu/primary.tpl
@@ -11,7 +11,7 @@
         </header>{/strip}{/if}
         <nav id="{if $main}main{else}side{/if}-menu" class="menu menu-tabs-arrow menubar" itemprop="hasPart" itemscope itemtype="http://schema.org/SiteNavigationElement">
             <a href="#content" class="sr-only skip-menu">{#skipMenu#}</a>
-            <ul id="menul" class="list-unstyled">
+            <ul{if $mobile} id="menul"{/if} class="list-unstyled">
                 {include file="section/menu/loop/dropdown.tpl" menuData=$links mobile=$mobile}
             </ul>
         </nav>