From 2af938c2417888a766062141492fc9bbacbd83b7 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Fri, 12 Aug 2016 15:41:01 -0400 Subject: [PATCH] Fix use of bootstrap glyph icons in QE Fixes #1717 --- external_libraries.py | 7 +++++++ static/js/directives/ui/datetime-picker.js | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/external_libraries.py b/external_libraries.py index 383f03cd6..3d8b56ec1 100644 --- a/external_libraries.py +++ b/external_libraries.py @@ -30,9 +30,16 @@ EXTERNAL_CSS = [ ] EXTERNAL_FONTS = [ + 'netdna.bootstrapcdn.com/font-awesome/4.2.0/fonts/fontawesome-webfont.eot?v=4.2.0', 'netdna.bootstrapcdn.com/font-awesome/4.2.0/fonts/fontawesome-webfont.woff?v=4.2.0', 'netdna.bootstrapcdn.com/font-awesome/4.2.0/fonts/fontawesome-webfont.ttf?v=4.2.0', 'netdna.bootstrapcdn.com/font-awesome/4.2.0/fonts/fontawesome-webfont.svg?v=4.2.0', + + 'netdna.bootstrapcdn.com/bootstrap/3.3.2/fonts/glyphicons-halflings-regular.eot', + 'netdna.bootstrapcdn.com/bootstrap/3.3.2/fonts/glyphicons-halflings-regular.woff2', + 'netdna.bootstrapcdn.com/bootstrap/3.3.2/fonts/glyphicons-halflings-regular.woff', + 'netdna.bootstrapcdn.com/bootstrap/3.3.2/fonts/glyphicons-halflings-regular.ttf', + 'netdna.bootstrapcdn.com/bootstrap/3.3.2/fonts/glyphicons-halflings-regular.svg', ] EXTERNAL_CSS_FONTS = [ diff --git a/static/js/directives/ui/datetime-picker.js b/static/js/directives/ui/datetime-picker.js index 7f5e2c8d9..e498850af 100644 --- a/static/js/directives/ui/datetime-picker.js +++ b/static/js/directives/ui/datetime-picker.js @@ -19,7 +19,8 @@ angular.module('quay').directive('datetimePicker', function () { 'format': 'LLL', 'sideBySide': true, 'showClear': true, - 'minDate': new Date() + 'minDate': new Date(), + 'debug': false }); $element.find('input').on("dp.change", function (e) {