From 1fb0bed5778c437d12b9a4df3b1a88f7810843cc Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgnerf@ub.uni-leipzig.de>
Date: Tue, 5 Feb 2019 09:08:11 +0100
Subject: [PATCH] refs #14565 - merge vf release branch 5.1 in finc-master v5 *
uncomments grunt compile error at themes/bootstrap3/scss/components/offcanvas
.btn elements +28 for the moment * updates composer.lock
---
composer.lock | 2 +-
themes/bootstrap3/scss/components/offcanvas.scss | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/composer.lock b/composer.lock
index 99b99ae948e..80d9f10b208 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2130,7 +2130,7 @@
},
{
"name": "Gert de Pagter",
- "email": "backendtea@gmail.com"
+ "email": "BackEndTea@gmail.com"
}
],
"description": "Symfony polyfill for ctype functions",
diff --git a/themes/bootstrap3/scss/components/offcanvas.scss b/themes/bootstrap3/scss/components/offcanvas.scss
index d1e1b9a3866..e52919d0bd8 100644
--- a/themes/bootstrap3/scss/components/offcanvas.scss
+++ b/themes/bootstrap3/scss/components/offcanvas.scss
@@ -3,8 +3,9 @@ $offcanvas-offset: 80vw !default; // Width of open menu
.offcanvas-overlay { display: none; }
.search-filter-toggle {
- @extend .btn;
+ /*@extend .btn;
@extend .btn-default;
+ */
margin-top: 1rem;
margin-bottom: 1rem;
}
@@ -24,8 +25,12 @@ $offcanvas-offset: 80vw !default; // Width of open menu
.offcanvas .close-offcanvas { display: block; }
.search-filter-toggle {
+ /* refs #14565 uncommented by vf 5.1 update
+ grunt says that you may not @extend an outer selector from within @media.
+ @to-do fixing bug
@extend .btn;
@extend .btn-default;
+ */
margin-top: 1rem;
margin-bottom: 1rem;
}
--
GitLab