From da79b6182f484d7903cf225430675faae362f07a Mon Sep 17 00:00:00 2001
From: Dionysis Arvanitis <dionysios.arvanitis@opekepe.gr>
Date: Mon, 14 Nov 2016 20:53:51 +0200
Subject: [PATCH 1/2] v4: Can't import bootstrap-material-design #1105

---
 scss/_core-bootstrap.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scss/_core-bootstrap.scss b/scss/_core-bootstrap.scss
index 95f6238f..c81ca63d 100644
--- a/scss/_core-bootstrap.scss
+++ b/scss/_core-bootstrap.scss
@@ -49,7 +49,7 @@
 @import "bootstrap/scss/card";
 @import "bootstrap/scss/breadcrumb";
 @import "bootstrap/scss/pagination";
-@import "bootstrap/scss/tags";
+@import "bootstrap/scss/badge";
 @import "bootstrap/scss/jumbotron";
 @import "bootstrap/scss/alert";
 @import "bootstrap/scss/progress";

From 4e8ef83db40dd102b76eb4852e00476945af4a0c Mon Sep 17 00:00:00 2001
From: Dionysis Arvanitis <dionysios.arvanitis@opekepe.gr>
Date: Mon, 14 Nov 2016 21:02:41 +0200
Subject: [PATCH 2/2] Comply with BS renaming of pull-left to float-left

---
 scss/_core-bootstrap.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scss/_core-bootstrap.scss b/scss/_core-bootstrap.scss
index c81ca63d..9faf382b 100644
--- a/scss/_core-bootstrap.scss
+++ b/scss/_core-bootstrap.scss
@@ -9,13 +9,13 @@
 
 // #853 start - https://github.com/twbs/bootstrap/pull/18976/files
 // hack
-@mixin pull-left {
+@mixin float-left {
   float: left !important;
   @if $enable-flex {
     margin-right: auto;
   }
 }
-@mixin pull-right {
+@mixin float-right {
   float: right !important;
   @if $enable-flex {
     margin-left: auto;