Merge pull request #1721 from coreos-inc/glyphicon-fix

Fix use of bootstrap glyph icons in QE
This commit is contained in:
josephschorr 2016-08-12 17:08:49 -04:00 committed by GitHub
commit 920b944e8c
2 changed files with 9 additions and 1 deletions

View file

@ -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 = [

View file

@ -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) {