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

…ere:THIN-12927 to master * commit '1336b76bfb1ca570351f6a61dd20f067d554fd3b': chore(style): upgrade bootstrap/bootswatch
esarder · Mar 6, 2019 · 479a62d · 479a62d
2 parents aa25930 + 1336b76
commit 479a62d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -262,8 +262,8 @@
     "angular-route": "~1.5.x",
     "angular-sanitize": "~1.5.x",
     "blob-polyfill": "^2.0.20171115",
-    "bootstrap": "4.1.3",
-    "bootswatch": "4.1.3",
+    "bootstrap": "4.3.1",
+    "bootswatch": "4.3.1",
     "cesium": "1.49.0",
     "compass-mixins": "^0.12.10",
     "crossfilter2": "^1.4.5",

diff --git a/scss/os/_utils.scss b/scss/os/_utils.scss
@@ -19,10 +19,6 @@
   word-break: break-all;
 }
 
-.u-word-break-break-word {
-  word-break: break-word;
-}
-
 .u-word-wrap-break-word {
   word-wrap: break-word;
 }
@@ -163,15 +159,12 @@
   }
 }
 
+
 // --------------------------------- Font Utilities --------------------------------- //
 .u-font-family-sans-serif {
   font-family: sans-serif;
 }
 
-.u-text-decoration-none {
-  text-decoration: none;
-}
-
 
 // --------------------------------- Visibility Utilities --------------------------------- //
 .u-opacity__95 {

diff --git a/scss/standard/_bootswatch.scss b/scss/standard/_bootswatch.scss
@@ -26,3 +26,9 @@
 .pagination {
   margin: .5rem;
 }
+
+.modal-header {
+  .close {
+    margin: inherit;
+  }
+}