diff --git a/composer.json b/composer.json
index 50dbc677ac7dd45bc24a72c824acdf227fd95c69..3f5d688105a34913bcae58ce1732f8e16ef3740d 100644
--- a/composer.json
+++ b/composer.json
@@ -219,6 +219,9 @@
"patches": {
"drupal/core": {
"2799049": "https://www.drupal.org/files/issues/role_based_email_access-2799049-2.patch"
+ },
+ "mehrpadin/superfish": {
+ "Fontawesome Tags": "patches/superfish-fontawesome-tags.patch"
}
}
},
diff --git a/patches/superfish-fontawesome-tags.patch b/patches/superfish-fontawesome-tags.patch
new file mode 100644
index 0000000000000000000000000000000000000000..76d7be3a359a515960326c68f4b44a4a8fc504e2
--- /dev/null
+++ b/patches/superfish-fontawesome-tags.patch
@@ -0,0 +1,59 @@
+diff --git a/sfsmallscreen.js b/sfsmallscreen.js
+index 9765fed..891088e 100644
+--- a/sfsmallscreen.js
++++ b/sfsmallscreen.js
+@@ -138,14 +138,16 @@
+ // Doing the same and making sure all the sub-menus are off-screen (hidden).
+ accordion.children('ul').removeAttr('style').not('.sf-hidden').addClass('sf-hidden');
+ // Creating the accordion toggle switch.
+- var toggle = '<div class="sf-accordion-toggle ' + styleClass + '"><a href="#" id="' + toggleID + '"><span>' + options.title + '</span></a></div>';
++ var toggle = '<div class="sf-accordion-toggle ' + styleClass + '"><a href="#" id="' + toggleID + '"><i class="fa fa-bars" aria-hidden="true"></i> <span>' + options.title + '</span></a></div>';
+
+ // Adding Expand\Collapse buttons if requested.
+ if (options.accordionButton == 2){
+ accordion.addClass('sf-accordion-with-buttons');
+ var parent = accordion.find('li.menuparent');
+ for (var i = 0; i < parent.length; i++){
+- parent.eq(i).prepend('<a href="#" class="sf-accordion-button">' + options.expandText + '</a>');
++ //adding font awesome code - bc
++ //parent.eq(i).prepend('<a href="#" class="sf-accordion-button">' + options.expandText + '</a>');
++ parent.eq(i).prepend('<a href="#" class="sf-accordion-button"><i class="fa fa-angle-right" aria-hidden="true"></i><span class="hidetxt">' + options.expandText + '</span></a>');
+ }
+ }
+ // Inserting the according and hiding the original menu.
+@@ -176,7 +178,7 @@
+ .end().hide().addClass('sf-hidden').show();
+ // Changing the caption of any existing accordion buttons to 'Expand'.
+ if (options.accordionButton == 2){
+- accordionElement.find('a.sf-accordion-button').text(options.expandText);
++ accordionElement.find('a.sf-accordion-button').add('<i class="fa fa-angle-right" aria-hidden="true"></i><span class="hidetxt">' + options.expandText + '</span>');
+ }
+ }
+ else {
+@@ -213,7 +215,7 @@
+ });
+ // Changing the caption of the inserted Collapse link to 'Expand', if any is inserted.
+ if (options.accordionButton == 2 && parent.children('.sf-accordion-button').length > 0){
+- parent.children('.sf-accordion-button').text(options.expandText);
++ parent.children('.sf-accordion-button').add('<i class="fa fa-angle-right" aria-hidden="true"></i><span class="hidetxt">' + options.expandText + '</span>');
+ }
+ }
+ // Otherwise, expand the sub-menu.
+@@ -221,7 +223,7 @@
+ // Doing the accessibility trick and then showing the sub-menu.
+ parent.children('ul').hide().removeClass('sf-hidden').slideDown('fast')
+ // Changing the caption of the inserted Expand link to 'Collape', if any is inserted.
+- .end().addClass('sf-expanded').children('a.sf-accordion-button').text(options.collapseText)
++ .end().addClass('sf-expanded').children('a.sf-accordion-button').add('<i class="fa fa-angle-right" aria-hidden="true"></i><span class="hidetxt">' + options.collapseText + '</span>')
+ // Hiding any expanded sub-menu of the same level.
+ .end().siblings('li.sf-expanded').children('ul')
+ .slideUp('fast', function(){
+@@ -229,7 +231,7 @@
+ $(this).closest('li').removeClass('sf-expanded').end().addClass('sf-hidden').show();
+ })
+ // Assuming Expand\Collapse buttons do exist, resetting captions, in those hidden sub-menus.
+- .parent().children('a.sf-accordion-button').text(options.expandText);
++ .parent().children('a.sf-accordion-button').add('<i class="fa fa-angle-right" aria-hidden="true"></i><span class="hidetxt">' + options.expandText + '</span>');
+ }
+ }
+ });
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 9b1cd40d36b5c6f1666b83a80eff607690d6a401..bb504b7bfee0784a0cc22ca41f30dbb4385761d5 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -1920,8 +1920,6 @@
'Drupal\\Core\\Language\\LanguageManager' => $baseDir . '/web/core/lib/Drupal/Core/Language/LanguageManager.php',
'Drupal\\Core\\Language\\LanguageManagerInterface' => $baseDir . '/web/core/lib/Drupal/Core/Language/LanguageManagerInterface.php',
'Drupal\\Core\\Layout\\Annotation\\Layout' => $baseDir . '/web/core/lib/Drupal/Core/Layout/Annotation/Layout.php',
- 'Drupal\\Core\\Layout\\Icon\\IconBuilderInterface' => $baseDir . '/web/core/lib/Drupal/Core/Layout/Icon/IconBuilderInterface.php',
- 'Drupal\\Core\\Layout\\Icon\\SvgIconBuilder' => $baseDir . '/web/core/lib/Drupal/Core/Layout/Icon/SvgIconBuilder.php',
'Drupal\\Core\\Layout\\LayoutDefault' => $baseDir . '/web/core/lib/Drupal/Core/Layout/LayoutDefault.php',
'Drupal\\Core\\Layout\\LayoutDefinition' => $baseDir . '/web/core/lib/Drupal/Core/Layout/LayoutDefinition.php',
'Drupal\\Core\\Layout\\LayoutInterface' => $baseDir . '/web/core/lib/Drupal/Core/Layout/LayoutInterface.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index dc9d97e8d7b788a9c703954a0743be1395225489..25693d61d4500d68a8143a47aa5c27c2966e8e89 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -2440,8 +2440,6 @@ class ComposerStaticInit5c689ffcd54b9e495ed983fdce09b530
'Drupal\\Core\\Language\\LanguageManager' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Language/LanguageManager.php',
'Drupal\\Core\\Language\\LanguageManagerInterface' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Language/LanguageManagerInterface.php',
'Drupal\\Core\\Layout\\Annotation\\Layout' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Layout/Annotation/Layout.php',
- 'Drupal\\Core\\Layout\\Icon\\IconBuilderInterface' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Layout/Icon/IconBuilderInterface.php',
- 'Drupal\\Core\\Layout\\Icon\\SvgIconBuilder' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Layout/Icon/SvgIconBuilder.php',
'Drupal\\Core\\Layout\\LayoutDefault' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Layout/LayoutDefault.php',
'Drupal\\Core\\Layout\\LayoutDefinition' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Layout/LayoutDefinition.php',
'Drupal\\Core\\Layout\\LayoutInterface' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Layout/LayoutInterface.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 396ac50fc80308a8d2e79273a22279dfb5e42356..9b12a1f699d0b83bc50d396af4f5bc71ad4fd114 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -7883,6 +7883,11 @@
},
"time": "2017-05-30T13:00:18+00:00",
"type": "drupal-library",
+ "extra": {
+ "patches_applied": {
+ "Fontawesome Tags": "patches/superfish-fontawesome-tags.patch"
+ }
+ },
"installation-source": "dist",
"notification-url": "https://packagist.org/downloads/",
"license": [
diff --git a/vendor/gettext/languages/bin/export-plural-rules.php b/vendor/gettext/languages/bin/export-plural-rules.php
old mode 100644
new mode 100755
diff --git a/web/libraries/superfish/PATCHES.txt b/web/libraries/superfish/PATCHES.txt
new file mode 100644
index 0000000000000000000000000000000000000000..94cc0689dce9ca4e669ca2e46896a3c91d7fd65c
--- /dev/null
+++ b/web/libraries/superfish/PATCHES.txt
@@ -0,0 +1,7 @@
+This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches)
+Patches applied to this directory:
+
+Fontawesome Tags
+Source: patches/superfish-fontawesome-tags.patch
+
+
diff --git a/web/libraries/superfish/sfsmallscreen.js b/web/libraries/superfish/sfsmallscreen.js
index 9765fedc9b7844595a5c5c5f7981610c00146475..891088e752956f916b9c131e33e68c52d5e2648e 100644
--- a/web/libraries/superfish/sfsmallscreen.js
+++ b/web/libraries/superfish/sfsmallscreen.js
@@ -138,14 +138,16 @@
// Doing the same and making sure all the sub-menus are off-screen (hidden).
accordion.children('ul').removeAttr('style').not('.sf-hidden').addClass('sf-hidden');
// Creating the accordion toggle switch.
- var toggle = '<div class="sf-accordion-toggle ' + styleClass + '"><a href="#" id="' + toggleID + '"><span>' + options.title + '</span></a></div>';
+ var toggle = '<div class="sf-accordion-toggle ' + styleClass + '"><a href="#" id="' + toggleID + '"><i class="fa fa-bars" aria-hidden="true"></i> <span>' + options.title + '</span></a></div>';
// Adding Expand\Collapse buttons if requested.
if (options.accordionButton == 2){
accordion.addClass('sf-accordion-with-buttons');
var parent = accordion.find('li.menuparent');
for (var i = 0; i < parent.length; i++){
- parent.eq(i).prepend('<a href="#" class="sf-accordion-button">' + options.expandText + '</a>');
+ //adding font awesome code - bc
+ //parent.eq(i).prepend('<a href="#" class="sf-accordion-button">' + options.expandText + '</a>');
+ parent.eq(i).prepend('<a href="#" class="sf-accordion-button"><i class="fa fa-angle-right" aria-hidden="true"></i><span class="hidetxt">' + options.expandText + '</span></a>');
}
}
// Inserting the according and hiding the original menu.
@@ -176,7 +178,7 @@
.end().hide().addClass('sf-hidden').show();
// Changing the caption of any existing accordion buttons to 'Expand'.
if (options.accordionButton == 2){
- accordionElement.find('a.sf-accordion-button').text(options.expandText);
+ accordionElement.find('a.sf-accordion-button').add('<i class="fa fa-angle-right" aria-hidden="true"></i><span class="hidetxt">' + options.expandText + '</span>');
}
}
else {
@@ -213,7 +215,7 @@
});
// Changing the caption of the inserted Collapse link to 'Expand', if any is inserted.
if (options.accordionButton == 2 && parent.children('.sf-accordion-button').length > 0){
- parent.children('.sf-accordion-button').text(options.expandText);
+ parent.children('.sf-accordion-button').add('<i class="fa fa-angle-right" aria-hidden="true"></i><span class="hidetxt">' + options.expandText + '</span>');
}
}
// Otherwise, expand the sub-menu.
@@ -221,7 +223,7 @@
// Doing the accessibility trick and then showing the sub-menu.
parent.children('ul').hide().removeClass('sf-hidden').slideDown('fast')
// Changing the caption of the inserted Expand link to 'Collape', if any is inserted.
- .end().addClass('sf-expanded').children('a.sf-accordion-button').text(options.collapseText)
+ .end().addClass('sf-expanded').children('a.sf-accordion-button').add('<i class="fa fa-angle-right" aria-hidden="true"></i><span class="hidetxt">' + options.collapseText + '</span>')
// Hiding any expanded sub-menu of the same level.
.end().siblings('li.sf-expanded').children('ul')
.slideUp('fast', function(){
@@ -229,7 +231,7 @@
$(this).closest('li').removeClass('sf-expanded').end().addClass('sf-hidden').show();
})
// Assuming Expand\Collapse buttons do exist, resetting captions, in those hidden sub-menus.
- .parent().children('a.sf-accordion-button').text(options.expandText);
+ .parent().children('a.sf-accordion-button').add('<i class="fa fa-angle-right" aria-hidden="true"></i><span class="hidetxt">' + options.expandText + '</span>');
}
}
});