Merge pull request ngageoint#675 in WV/opensphere from ~ROTHM/opensph…

…ere:THIN-12927b to master * commit 'b6f80d086f725b79b2292d40dd8498e87ba00b30': fix(style): add nowrap back to .btn fix(style): custom-control-label bootswatch override fix(popover): since bootstrap 4.3.1, popovers sanitize their options which contains html fix(style): fix bootstrap overrides for modal-header-padding THIN-12927
esarder · Mar 7, 2019 · fe20c75 · fe20c75
2 parents f6c24eb + b6f80d0
commit fe20c75
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/scss/compact/_variables.scss b/scss/compact/_variables.scss
@@ -23,5 +23,6 @@ $form-group-margin-bottom: .25rem;
 $table-cell-padding: .25rem;
 
 // Tighter modals
-$modal-header-padding: .35rem;
+$modal-header-padding-x: .35rem;
+$modal-header-padding-y: .35rem;
 $modal-inner-padding: .35rem;
diff --git a/scss/os/_overrides_bootstrap.scss b/scss/os/_overrides_bootstrap.scss
@@ -69,6 +69,11 @@ $form-control-disabled-border: $gray-600 !default;
   cursor: pointer;
 }
 
+// This was removed in v4.2.1
+.btn {
+  white-space: nowrap;
+}
+
 html {
   // (Part 1) How bootstrap does box-sizing breaks 3rd party libraries box sizing.
   // This technique allows slickgrid to work

diff --git a/scss/overrides_default/_variables.scss b/scss/overrides_default/_variables.scss
@@ -36,6 +36,7 @@ $dropdown-link-hover-bg: $primary !default;
 
 $dark: lighten(#272b30, 5%);
 
+$custom-control-indicator-bg: $gray-300;
 $custom-control-indicator-checked-color: $black;
 $custom-control-indicator-checked-bg: $gray-300;
 $custom-control-indicator-checked-disabled-bg: $gray-500;

diff --git a/scss/overrides_slate/_variables.scss b/scss/overrides_slate/_variables.scss
@@ -32,6 +32,7 @@ $font-family-sans-serif: 'Open Sans', -apple-system, BlinkMacSystemFont, 'Segoe
 
 $dropdown-link-hover-bg: $primary;
 
+$custom-control-indicator-bg: $white;
 $custom-control-indicator-checked-color: $black;
 $custom-control-indicator-checked-bg: $gray-200;
 $custom-control-indicator-checked-disabled-bg: rgba($gray-200, .5);

diff --git a/scss/standard/_bootswatch.scss b/scss/standard/_bootswatch.scss
@@ -7,7 +7,7 @@
     width: $font-size-base;
   }
 
-  .custom-control-label::after {
+  .custom-control-label::before {
     border: 1px solid $input-border-color;
     border-radius: .125rem;
   }
@@ -26,9 +26,3 @@
 .pagination {
   margin: .5rem;
 }
-
-.modal-header {
-  .close {
-    margin: inherit;
-  }
-}
diff --git a/scss/standard/_variables.scss b/scss/standard/_variables.scss
@@ -37,7 +37,8 @@ $popover-max-width: (($popover-header-padding-x * 2) + 20);
 $nav-link-padding-y: .25rem;
 $nav-link-padding-x: .5rem;
 
-$modal-header-padding: .35rem;
+$modal-header-padding-x: .35rem;
+$modal-header-padding-y: .35rem;
 $modal-inner-padding: .5rem;
 
 $dropdown-padding-y: .15rem;

diff --git a/src/os/ui/popover/popover.js b/src/os/ui/popover/popover.js
@@ -121,6 +121,7 @@ os.ui.popover.PopoverCtrl.prototype.update_ = function() {
     // Create the popover
     this.popover_ = this.element_.popover({
       'html': true,
+      'sanitize': false,
       'placement': this.scope_['pos'] ? this.scope_['pos'] : 'bottom',
       'trigger': 'manual',
       'title': this.scope_['title'],