Merge pull request #11 from droptica/feature/issue/30436

Issue #30436: Node tabs not showng
droptica · Jan 15, 2018 · 7ba3d45 · 7ba3d45
2 parents 7d52f5e + 8f99da8
commit 7ba3d45
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/themes/custom/droopler_theme/droopler_theme.info.yml b/themes/custom/droopler_theme/droopler_theme.info.yml
@@ -29,6 +29,7 @@ regions:
   highlighted: Highlighted
   featured_top: 'Featured top'
   breadcrumb: Breadcrumb
+  admin_tabs: 'Admin tabs'
   content: Content
   featured_bottom_first: 'Featured bottom first'
   featured_bottom_second: 'Featured bottom second'

diff --git a/themes/custom/droopler_theme/scss/components/_d_p_text_paged.scss b/themes/custom/droopler_theme/scss/components/_d_p_text_paged.scss
@@ -10,19 +10,18 @@ $d-p-text-paged-line-color: $color-agamemnon !default;
 $d-p-text-paged-color: $color-hecuba !default;
 
 // Margins, paddings and sizing.
-$d-p-text-paged-title-margin-top: 5% !default;
 $d-p-text-paged-subtitle-margin-y: 1.125rem !default;
 $d-p-text-paged-line-margin-top: 1rem !default;
 $d-p-text-paged-line-margin-bottom: 1rem !default;
 $d-p-text-paged-margin-y: 5% !default;
+$d-p-text-paged-first-margin-top: 2% !default;
 
 .text-page {
   margin-top: $d-p-text-paged-margin-y;
   margin-bottom: $d-p-text-paged-margin-y;
 
   > h2 {
     @include font-main-header;
-    margin-top: $d-p-text-paged-title-margin-top;
     text-align: center;
   }
 
@@ -46,3 +45,8 @@ $d-p-text-paged-margin-y: 5% !default;
     }
   }
 }
+
+// If this is the first paragraph - decrease top margin.
+.paragraph-sections > section:first-child > .text-page {
+  margin-top: $d-p-text-paged-first-margin-top;
+}
diff --git a/themes/custom/droopler_theme/templates/layout/page.html.twig b/themes/custom/droopler_theme/templates/layout/page.html.twig
@@ -41,6 +41,7 @@
  * - page.primary_menu: Items for the primary menu region.
  * - page.secondary_menu: Items for the secondary menu region.
  * - page.featured_top: Items for the featured top region.
+ * - page.admin_tabs: Items for node management.
  * - page.content: The main content of the current page.
  * - page.featured_bottom_first: Items for the first featured bottom region.
  * - page.featured_bottom_second: Items for the second featured bottom region.
@@ -110,11 +111,16 @@
       </div>
     {% endblock %}
   {% endif %}
+  {% if page.admin_tabs %}
+    <div class="admin_tabs container">
+      {{ page.admin_tabs }}
+    </div>
+  {% endif %}
   <div id="main-wrapper" class="layout-main-wrapper clearfix">
     {% block content %}
       <div{{ main_attributes }}>
         <div class="row clearfix">
-          {{ page.breadcrumb }}
+        {{ page.breadcrumb }}
           <main class="main-content">
             <section class="section">
               <a id="main-content" tabindex="-1"></a>