Parcourir la source

3.3: add evidence library, improve page template to layout regions.

Frederic G. MARAND il y a 8 ans
Parent
commit
3f79d541e6
4 fichiers modifiés avec 58 ajouts et 27 suppressions
  1. 0 0
      css/theme/evidence.css
  2. 1 0
      dr821.info.yml
  3. 5 0
      dr821.libraries.yml
  4. 52 27
      templates/layout/page.html.twig

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
css/theme/evidence.css


+ 1 - 0
dr821.info.yml

@@ -12,6 +12,7 @@ libraries:
 
   # Version développement/déboguage, non minifiée
   - dr821/bootstrap-dev
+  - dr821/evidence
 
 regions:
   header: Header

+ 5 - 0
dr821.libraries.yml

@@ -19,3 +19,8 @@ bootstrap-dev:
     node_modules/bootstrap/dist/js/bootstrap.js: {}
     dependencies:
       - core/jquery
+
+evidence:
+  css:
+    theme:
+      css/theme/evidence.css: {}

+ 52 - 27
templates/layout/page.html.twig

@@ -45,64 +45,89 @@
  */
 #}
 <div class="layout-container container">
-  <header role="banner">
+  <header role="banner" class="row">
+    <div class="col-md-12">
     {{ page.header }}
+    </div>
   </header>
 
-  {{ page.primary_menu }}
-  {{ page.secondary_menu }}
+  <div class="row">
+    <div class="col-md-8 col-md-offset-4">
+      {{ page.secondary_menu }}
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-8 col-md-offset-4">
+      {{ page.primary_menu }}
+    </div>
+  </div>
 
-  {{ page.breadcrumb }}
+  <div class="row">
+    <div class="col-md-12">
+      {{ page.breadcrumb }}
+    </div>
+  </div>
 
-  {{ page.highlighted }}
+  <div class="row">
+    <div class="col-md-12">
+      {{ page.highlighted }}
+    </div>
+  </div>
 
-  {{ page.help }}
+  <div class="row">
+    <div class="col-md-12">
+      {{ page.help }}
+    </div>
+  </div>
 
   {% if page.featured_top %}
-    <div class="featured-top">
-      <aside class="featured-top__inner section layout-container clearfix" role="complementary">
+    <div class="featured-top row">
+      <aside class="featured-top__inner section layout-container clearfix col-md-12" role="complementary">
         {{ page.featured_top }}
       </aside>
     </div>
   {% endif %}
 
-  <main role="main">
+  <main role="main" class="row">
     <a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
 
-    <div class="layout-content">
-      {{ page.content }}
-    </div>{# /.layout-content #}
-
     {% if page.sidebar_first %}
-      <aside class="layout-sidebar-first" role="complementary">
+      <div class="zlayout-content col-md-8">
+      {{ page.content }}
+      </div>{# /.layout-content #}
+      <aside class="zlayout-sidebar-first col-md-4" role="complementary">
         {{ page.sidebar_first }}
       </aside>
+    {% else %}
+      <div class="zlayout-content col-md-12">
+      {{ page.content }}
+      </div>{# /.layout-content #}
     {% endif %}
   </main>
 
   {% if page.featured_bottom_first or page.featured_bottom_second or page.featured_bottom_third %}
     <div class="featured-bottom">
-      <aside class="layout-container clearfix" role="complementary">
-        {{ page.featured_bottom_first }}
-        {{ page.featured_bottom_second }}
-        {{ page.featured_bottom_third }}
+      <aside class="layout-container clearfix row" role="complementary">
+        <div class="col-md-4">{{ page.featured_bottom_first }}</div>
+        <div class="col-md-4">{{ page.featured_bottom_second }}</div>
+        <div class="col-md-4">{{ page.featured_bottom_third }}</div>
       </aside>
     </div>
   {% endif %}
 
   {% if page.footer_first or page.footer_second or page.footer_third or page.footer_fourth %}
-    <footer role="contentinfo">
-      {{ page.footer_first }}
-      {{ page.footer_second }}
-      {{ page.footer_third }}
-      {{ page.footer_fourth }}
+    <footer role="contentinfo" class="row">
+      <div class="col-md-3">{{ page.footer_first }}</div>
+      <div class="col-md-3">{{ page.footer_second }}</div>
+      <div class="col-md-3">{{ page.footer_third }}</div>
+      <div class="col-md-3">{{ page.footer_fourth }}</div>
     </footer>
   {% endif %}
 
-  {%  if page.legalese_first or page_legalese_second %}
-    <footer role="contentinfo">
-      {{ page.legalese_first }}
-      {{ page.legalese_second }}
+  {%  if page.legalese_first or page.legalese_second %}
+    <footer role="contentinfo" class="row">
+      <div class="col-md-6">{{ page.legalese_first }}</div>
+      <div class="col-md-6">{{ page.legalese_second }}</div>
     </footer>
   {% endif %}
 

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff