Merge pull request #4417 from waldenraines/6591

Fixes #6591/BZ1076364: include fonts that datepicker depends on.
Katello · Jul 16, 2014 · 9b7127d · 9b7127d
2 parents cd6f9c4 + 31386b7
commit 9b7127d
Show file tree

Hide file tree

Showing 6 changed files with 234 additions and 2 deletions.
diff --git a/engines/bastion/app/assets/stylesheets/bastion/overrides.less b/engines/bastion/app/assets/stylesheets/bastion/overrides.less
@@ -8,6 +8,8 @@
 @FontAwesomePath: "../../../../bastion/font-awesome";
 @font-path: "../../bastion/rcue";
 
+@icon-font-path: "/assets/bastion/bootstrap/";
+
 .alert {
   margin: 10px;
 
@@ -49,4 +51,4 @@ ul {
   &:not(:first-child) span {
     padding-left: 15px;
   }
-}
+}
diff --git a/engines/bastion/bower.json b/engines/bastion/bower.json
@@ -82,7 +82,8 @@
       "javascripts/bastion": "ng-upload.js"
     },
     "bootstrap": {
-      "stylesheets/bastion": "less/*.less"
+      "stylesheets/bastion": "less/*.less",
+      "fonts/bastion": "dist/fonts/*"
     },
     "font-awesome": {
       "stylesheets/bastion/font-awesome/less": "less/*.less",

diff --git a/engines/bastion/vendor/assets/fonts/bastion/bootstrap/glyphicons-halflings-regular.eot b/engines/bastion/vendor/assets/fonts/bastion/bootstrap/glyphicons-halflings-regular.eot
diff --git a/.../bastion/vendor/assets/fonts/bastion/bootstrap/glyphicons-halflings-regular.svg b/.../bastion/vendor/assets/fonts/bastion/bootstrap/glyphicons-halflings-regular.svg
diff --git a/engines/bastion/vendor/assets/fonts/bastion/bootstrap/glyphicons-halflings-regular.ttf b/engines/bastion/vendor/assets/fonts/bastion/bootstrap/glyphicons-halflings-regular.ttf
diff --git a/engines/bastion/vendor/assets/fonts/bastion/bootstrap/glyphicons-halflings-regular.woff b/engines/bastion/vendor/assets/fonts/bastion/bootstrap/glyphicons-halflings-regular.woff