diff --git a/dashboard.php b/dashboard.php index 1ad58fb..9ceb9d8 100644 --- a/dashboard.php +++ b/dashboard.php @@ -5,7 +5,7 @@ - + diff --git a/favicon.ico b/favicon.ico index 8ab0276..a3d5e14 100644 Binary files a/favicon.ico and b/favicon.ico differ diff --git a/favicon.png b/favicon.png index 51d6d99..dfa1351 100644 Binary files a/favicon.png and b/favicon.png differ diff --git a/favicon_apple.png b/favicon_apple.png index 6b1175a..692af3d 100644 Binary files a/favicon_apple.png and b/favicon_apple.png differ diff --git a/img/demo.png b/img/demo.png deleted file mode 100644 index fa8758a..0000000 Binary files a/img/demo.png and /dev/null differ diff --git a/img/demo2.png b/img/demo2.png deleted file mode 100644 index e1611cc..0000000 Binary files a/img/demo2.png and /dev/null differ diff --git a/img/ecobee/connect.png b/img/ecobee/connect.png deleted file mode 100644 index 0984c8e..0000000 Binary files a/img/ecobee/connect.png and /dev/null differ diff --git a/img/ecobee/ecobee_logo_colour2.jpg b/img/ecobee/ecobee_logo_colour2.jpg deleted file mode 100644 index 9fed1a7..0000000 Binary files a/img/ecobee/ecobee_logo_colour2.jpg and /dev/null differ diff --git a/img/ecobee/logo.png b/img/ecobee/logo.png deleted file mode 100644 index 5859f4b..0000000 Binary files a/img/ecobee/logo.png and /dev/null differ diff --git a/img/logo.png b/img/logo.png new file mode 100644 index 0000000..8572c8b Binary files /dev/null and b/img/logo.png differ diff --git a/js/component/header.js b/js/component/header.js index eb8c87d..0aaefbf 100644 --- a/js/component/header.js +++ b/js/component/header.js @@ -58,8 +58,11 @@ beestat.component.header.prototype.decorate_ = function(parent) { var column_logo = $.createElement('div').style({'padding': gutter + 'px 0 0 ' + gutter + 'px'}); row.appendChild(column_logo); if (beestat.width > 600) { - column_logo.style({'flex': '0 0 160px'}); - (new beestat.component.logo()).render(column_logo); + column_logo.style({ + 'flex': '0 0 160px', + 'margin': '8px 0 4px 0' + }); + (new beestat.component.logo(32)).render(column_logo); } else { column_logo.style({'flex': '0 0 32px'}); var img = $.createElement('img') diff --git a/js/component/logo.js b/js/component/logo.js index e5b6432..97876b0 100644 --- a/js/component/logo.js +++ b/js/component/logo.js @@ -1,7 +1,10 @@ /** - * Beestat two-color text logo. + * Logo + * + * @param {number} height The height of the logo */ -beestat.component.logo = function() { +beestat.component.logo = function(height) { + this.height_ = height || 48; beestat.component.apply(this, arguments); }; beestat.extend(beestat.component.logo, beestat.component); @@ -12,23 +15,10 @@ beestat.extend(beestat.component.logo, beestat.component); * @param {rocket.Elements} parent */ beestat.component.logo.prototype.decorate_ = function(parent) { - var logo = $.createElement('div'); - logo.style({ - 'font-weight': beestat.style.font_weight.light, - 'font-size': '40px', - 'font-family': 'Montserrat' - }); - - var bee = $.createElement('span'); - bee.innerHTML('bee'); - bee.style('color', beestat.style.color.yellow.light); - - var stat = $.createElement('span'); - stat.innerHTML('stat'); - stat.style('color', beestat.style.color.green.light); - - logo.appendChild(bee); - logo.appendChild(stat); - + const logo = $.createElement('img') + .setAttribute('src', 'img/logo.png') + .style({ + 'height': this.height_ + 'px' + }); parent.appendChild(logo); }; diff --git a/manifest.json b/manifest.json index 724afda..d8aca92 100644 --- a/manifest.json +++ b/manifest.json @@ -9,6 +9,6 @@ ], "start_url": "/", "display": "standalone", - "background_color": "#37474f", - "theme_color": "#37474f" + "background_color": "#263238", + "theme_color": "#263238" }