Incorporate popover and tooltip partials into compiled output (#59)

techfromsage · Oct 24, 2018 · 36167e0 · 36167e0
1 parent c6b963c
commit 36167e0
Show file tree

Hide file tree

Showing 10 changed files with 1,403 additions and 5,338 deletions.
diff --git a/assets/stylesheets/_bootstrap.scss b/assets/stylesheets/_bootstrap.scss
@@ -39,6 +39,8 @@
 
 // Components w/ JavaScript
 @import "bootstrap/modals";
+@import "bootstrap/popovers";
+@import "bootstrap/tooltip";
 
 // Utility classes
 @import "bootstrap/utilities";

diff --git a/assets/stylesheets/bootstrap/_alerts.scss b/assets/stylesheets/bootstrap/_alerts.scss
@@ -40,17 +40,17 @@
 // Generate contextual modifier classes for colorizing the alert.
 
 .alert-success {
-  @include alert-variant($alert-success-bg, $alert-success-border, $alert-success-text);
+  @include alert-variant($alert-success-bg, $alert-success-border);
 }
 
 .alert-info {
-  @include alert-variant($alert-info-bg, $alert-info-border, $alert-default-text);
+  @include alert-variant($alert-info-bg, $alert-info-border);
 }
 
 .alert-warning {
-  @include alert-variant($alert-warning-bg, $alert-warning-border, $alert-warning-text);
+  @include alert-variant($alert-warning-bg, $alert-warning-border);
 }
 
 .alert-danger {
-  @include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-text);
+  @include alert-variant($alert-danger-bg, $alert-danger-border);
 }
diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss
@@ -530,19 +530,19 @@ $pager-disabled-color:                 $pagination-disabled-color !default;
 //
 //## Define colors for form feedback states and, by default, alerts.
 
-$state-success-text:             $black !default;
+$state-success-text:             $brand-success !default;
 $state-success-bg:               #e3f1eb;
 $state-success-border:           #3f9e76 !default;
 
 $state-info-text:                $black !default;
 $state-info-bg:                  $gray200 !default;
 $state-info-border:              $gray700 !default;
 
-$state-warning-text:             $black !default;
+$state-warning-text:             $brand-warning !default;
 $state-warning-bg:               #fff2d4;
 $state-warning-border:           $yellow !default;
 
-$state-danger-text:              $black !default;
+$state-danger-text:              $brand-danger !default;
 $state-danger-bg:                #fee0e0 !default;
 $state-danger-border:            $red !default;
 

diff --git a/assets/stylesheets/bootstrap/mixins/_alerts.scss b/assets/stylesheets/bootstrap/mixins/_alerts.scss
@@ -1,6 +1,6 @@
 // Alerts
 
-@mixin alert-variant($background, $border, $text-color) {
+@mixin alert-variant($background, $border, $text-color: $black) {
   color: $text-color;
   background-color: $background;
   border-color: $border;

diff --git a/bower.json b/bower.json
@@ -33,5 +33,5 @@
   "dependencies": {
     "jquery": "~1.9.1"
   },
-  "version": "3.3.6-talis.22"
+  "version": "3.3.6-talis.23"
 }