From 20cd64b78512961a33050d78024adafe44d22627 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 13 Oct 2015 23:24:19 -0400 Subject: [PATCH] added IE fixes --- dashboard-ui/bower_components/eventie/.bower.json | 2 +- .../bower_components/iron-flex-layout/.bower.json | 6 +++--- dashboard-ui/bower_components/paper-input/.bower.json | 6 +++--- dashboard-ui/css/ie.css | 7 +++++++ dashboard-ui/scripts/site.js | 11 +++++++---- 5 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 dashboard-ui/css/ie.css diff --git a/dashboard-ui/bower_components/eventie/.bower.json b/dashboard-ui/bower_components/eventie/.bower.json index 917d217ea8..6b5b662fdc 100644 --- a/dashboard-ui/bower_components/eventie/.bower.json +++ b/dashboard-ui/bower_components/eventie/.bower.json @@ -30,6 +30,6 @@ "commit": "14d2ca3df97da64c820829a8310f9198fbafbcfa" }, "_source": "git://github.com/desandro/eventie.git", - "_target": "^1", + "_target": "~1.0.3", "_originalSource": "eventie" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-flex-layout/.bower.json b/dashboard-ui/bower_components/iron-flex-layout/.bower.json index 1f8ab2ef8f..842b1473f6 100644 --- a/dashboard-ui/bower_components/iron-flex-layout/.bower.json +++ b/dashboard-ui/bower_components/iron-flex-layout/.bower.json @@ -25,14 +25,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0", "iron-component-page": "polymerelements/iron-component-page#^1.0.0" }, - "homepage": "https://github.com/PolymerElements/iron-flex-layout", + "homepage": "https://github.com/polymerelements/iron-flex-layout", "_release": "1.0.4", "_resolution": { "type": "version", "tag": "v1.0.4", "commit": "dcfc54b0d358269bf0c72180b4ab090fc4931ecd" }, - "_source": "git://github.com/PolymerElements/iron-flex-layout.git", + "_source": "git://github.com/polymerelements/iron-flex-layout.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-flex-layout" + "_originalSource": "polymerelements/iron-flex-layout" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-input/.bower.json b/dashboard-ui/bower_components/paper-input/.bower.json index 887309273b..b3666aed52 100644 --- a/dashboard-ui/bower_components/paper-input/.bower.json +++ b/dashboard-ui/bower_components/paper-input/.bower.json @@ -50,7 +50,7 @@ "tag": "v1.0.15", "commit": "34d19454e0ea13b1a809add8c87fba128fbc9940" }, - "_source": "git://github.com/polymerelements/paper-input.git", - "_target": "^1.0.9", - "_originalSource": "polymerelements/paper-input" + "_source": "git://github.com/PolymerElements/paper-input.git", + "_target": "^1.0.0", + "_originalSource": "PolymerElements/paper-input" } \ No newline at end of file diff --git a/dashboard-ui/css/ie.css b/dashboard-ui/css/ie.css new file mode 100644 index 0000000000..7fb2dd0e90 --- /dev/null +++ b/dashboard-ui/css/ie.css @@ -0,0 +1,7 @@ +paper-icon-button { + height: 24px; +} + +paper-fab.keyboard-focus.paper-fab-0 { + background: #444; +} diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index be5917a8bc..47d24115d1 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1955,18 +1955,21 @@ var AppInfo = {}; function onDocumentReady() { + if ($.browser.msie) { + Dashboard.importCss('css/ie.css'); + } + // Do these now to prevent a flash of content if (AppInfo.isNativeApp) { if ($.browser.android) { Dashboard.importCss('themes/android.css'); - } - else if ($.browser.safari) { + } else if ($.browser.safari) { Dashboard.importCss('themes/ios.css'); } + } else { + loadTheme(); } - loadTheme(); - if ($.browser.safari && $.browser.mobile) { initFastClick(); }