Update css for kam smartmenu

civicrm · Feb 22, 2019 · f54e5fe · f54e5fe
1 parent 42c9297
commit f54e5fe
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 349 deletions.
diff --git a/info.xml b/info.xml
@@ -17,8 +17,11 @@
   <releaseDate>2018-12-17</releaseDate>
   <version>0.1-alpha30</version>
   <compatibility>
-    <ver>4.7</ver>
+    <ver>5.0</ver>
   </compatibility>
+  <requires>
+    <ext>uk.squiffle.kam</ext>
+  </requires>
   <comments></comments>
   <civix>
     <namespace>CRM/Shoreditch</namespace>

diff --git a/js/main-menu.js b/js/main-menu.js
diff --git a/scss/civicrm/_variables.scss b/scss/civicrm/_variables.scss
@@ -3,10 +3,6 @@
 $contact-avatar: 90px;
 $crm-control-height: 30px;
 
-$crm-main-menu-height: 60px;
-$crm-main-menu-sub-menu-padding: 10px 0 16px;
-$crm-main-menu-item-icon-caption-gap: 6px;
-
 $crm-checkbox-shadow: inset 0 0 3px 0 rgba(0, 0, 0, 0.2);
 $crm-contribute-form-shadow: 0 0 16px 1px rgba(0, 0, 0, 0.1);
 $crm-form-item-shadow: 0 3px 6px 0 rgba(48, 40, 40, 0.25);

diff --git a/scss/civicrm/common/_base.scss b/scss/civicrm/common/_base.scss
@@ -2,20 +2,8 @@
 
 #{$outside-namespace-marker} {
   html {
-    // Ensures that there is the same amount of vertical room for the main menu
-    // regardless of whether there is a drupal menu module enabled or not
     body {
       @include open-sans-font-family();
-
-      &:not(.toolbar) {
-        margin-top: $crm-main-menu-height !important;
-      }
-
-      .toolbar-menu {
-        height: $crm-main-menu-height !important;
-        padding-bottom: 0 !important;
-        padding-top: 0 !important;
-      }
     }
   }
 }

diff --git a/scss/civicrm/custom-civicrm.scss b/scss/civicrm/custom-civicrm.scss
@@ -13,7 +13,6 @@
 @import 'jquery/overrides/**/*';
 @import 'civicrm/cms/cms';
 @import 'civicrm/common/common';
-@import 'civicrm/main-menu/main-menu';
 @import 'civicrm/api/api';
 @import 'civicrm/contact/contact';
 @import 'civicrm/search/search';

diff --git a/scss/civicrm/main-menu/_main-menu.scss b/scss/civicrm/main-menu/_main-menu.scss
diff --git a/shoreditch.php b/shoreditch.php
@@ -129,7 +129,6 @@ function shoreditch_civicrm_coreResourceList(&$items, $region) {
     CRM_Core_Resources::singleton()->addScriptFile('org.civicrm.shoreditch', 'base/js/button.js', 1000, 'html-header');
     CRM_Core_Resources::singleton()->addScriptFile('org.civicrm.shoreditch', 'js/noConflict.js', 1001, 'html-header');
     CRM_Core_Resources::singleton()->addScriptFile('org.civicrm.shoreditch', 'js/add-missing-date-addons.js');
-    CRM_Core_Resources::singleton()->addScriptFile('org.civicrm.shoreditch', 'js/main-menu.js');
   }
 }