From 1e168553abb98daa4aef4339de41b45e9470efbd Mon Sep 17 00:00:00 2001
From: Sam Georges <sam@daftspunk.com>
Date: Sat, 28 Jun 2014 22:18:54 +1000
Subject: [PATCH] Update content tabs so they work with buttons

---
 modules/backend/assets/css/october.css              | 6 ++++++
 modules/backend/assets/less/controls/forms.less     | 7 +++++++
 modules/backend/assets/less/controls/tab.less       | 4 +++-
 modules/backend/assets/less/layout/layout.less      | 2 +-
 modules/system/controllers/emailtemplates/index.htm | 2 +-
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index 4d69f155f..c4cd832ce 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -7485,6 +7485,10 @@ label {
   margin-right: 0;
   margin-left: 10px;
 }
+body.compact-container .form-buttons,
+body.slim-container .form-buttons {
+  padding-left: 20px;
+}
 @media (max-width: 769px) {
   .form-group.span-left,
   .form-group.span-right {
@@ -10197,6 +10201,7 @@ body.dropdown-open .dropdown-overlay {
   border-right: none;
 }
 .control-tabs.content-tabs > ul.nav-tabs li.active {
+  border-top: 1px solid #e3e5e7;
   background: #ffffff;
 }
 .control-tabs.content-tabs > ul.nav-tabs li.active a {
@@ -10205,6 +10210,7 @@ body.dropdown-open .dropdown-overlay {
 .control-tabs.content-tabs > ul.nav-tabs li.active:last-child {
   border-right: 1px solid #e3e5e7;
 }
+.control-tabs.content-tabs > .tab-content > .tab-pane div.padded-container,
 .control-tabs.content-tabs > .tab-content > .tab-pane div.toolbar-widget {
   background: #ffffff;
   margin-top: -20px;
diff --git a/modules/backend/assets/less/controls/forms.less b/modules/backend/assets/less/controls/forms.less
index b903efa8f..b25813d3a 100644
--- a/modules/backend/assets/less/controls/forms.less
+++ b/modules/backend/assets/less/controls/forms.less
@@ -206,6 +206,13 @@ label {
     }
 }
 
+body.compact-container,
+body.slim-container {
+    .form-buttons {
+        padding-left: 20px;
+    }
+}
+
 @media (max-width: @menu-breakpoint-max) {
     .form-group {
         &.span-left, &.span-right {
diff --git a/modules/backend/assets/less/controls/tab.less b/modules/backend/assets/less/controls/tab.less
index 01ee686a9..464d59b3a 100644
--- a/modules/backend/assets/less/controls/tab.less
+++ b/modules/backend/assets/less/controls/tab.less
@@ -245,7 +245,7 @@
     }
 
     &.content-tabs {
-        > ul.nav-tabs { 
+        > ul.nav-tabs {
             position: relative;
 
             &:before {
@@ -276,6 +276,7 @@
                 }
 
                 &.active {
+                    border-top: 1px solid @color-tab-content-border;
                     background: @color-tab-content-active-bg;
                     a {
                         font-weight: 600;
@@ -289,6 +290,7 @@
         }
 
         > .tab-content > .tab-pane {
+            div.padded-container,
             div.toolbar-widget {
                 background: @color-tab-content-active-bg;
                 margin-top: -20px;
diff --git a/modules/backend/assets/less/layout/layout.less b/modules/backend/assets/less/layout/layout.less
index 0461d91a9..fb23adf52 100644
--- a/modules/backend/assets/less/layout/layout.less
+++ b/modules/backend/assets/less/layout/layout.less
@@ -50,7 +50,7 @@ body {
         &.width-120 {width: 120px;}
         &.width-200 {width: 200px;}
         &.width-300 {width: 300px;}
-        
+
         &.layout-container, .layout-container, &.padded-container, .padded-container {padding: 20px 20px 0 20px;}
 
         .layout-relative {
diff --git a/modules/system/controllers/emailtemplates/index.htm b/modules/system/controllers/emailtemplates/index.htm
index 3c655c6b0..50fc1f9ec 100644
--- a/modules/system/controllers/emailtemplates/index.htm
+++ b/modules/system/controllers/emailtemplates/index.htm
@@ -9,7 +9,7 @@
 <div class="control-tabs content-tabs" data-control="tab">
     <ul class="nav nav-tabs">
         <li class="active"><a href="#templates"><?= e(trans('system::lang.email_templates.templates')) ?></a></li>
-        <li><a href="#templates"><?= e(trans('system::lang.email_templates.layouts')) ?></a></li>
+        <li><a href="#layouts"><?= e(trans('system::lang.email_templates.layouts')) ?></a></li>
     </ul>
     <div class="tab-content">
         <div class="tab-pane active">