From 0f124f8b0eb8e8125bb0b32efdf685127b13f70a Mon Sep 17 00:00:00 2001 From: Vincent Fiduccia Date: Wed, 10 Jun 2015 15:40:35 -0700 Subject: [PATCH] Fix registrty edit, about image --- app/about/template.hbs | 7 ++----- app/registry/edit/route.js | 2 +- app/styles/about.scss | 26 +++++++++++++++++++------- app/utils/platform.js | 4 ++-- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/app/about/template.hbs b/app/about/template.hbs index 66617a50e..2a698ebcf 100644 --- a/app/about/template.hbs +++ b/app/about/template.hbs @@ -1,8 +1,5 @@ -
-
- -
-
+
+
diff --git a/app/registry/edit/route.js b/app/registry/edit/route.js index 83a63ea25..42045c6ee 100644 --- a/app/registry/edit/route.js +++ b/app/registry/edit/route.js @@ -5,7 +5,7 @@ export default Ember.Route.extend({ var registry = this.modelFor('registry'); return Ember.Object.create({ registry: registry, - credential: registry.get('credentials.firstObject') + credential: registry.get('credentials.lastObject') }); }, diff --git a/app/styles/about.scss b/app/styles/about.scss index 9025cda99..1f585eef0 100644 --- a/app/styles/about.scss +++ b/app/styles/about.scss @@ -13,26 +13,38 @@ font-weight: 600; } + .logo-text { + background-image: url(images/logo_text.svg); + background-size: 300px; + background-position: center 30px; + background-repeat: no-repeat; + height: 110px; + } + .parachute { opacity: 0.75; - animation: parachute-animation 20s linear infinite forwards; + animation: parachute-animation 20s linear forwards; background-image: url(images/logo_parachute.svg); background-repeat: no-repeat; - position: absolute; + position: relative; width: 74px; height: 100px; - top: -100px; - left: -200px; + top: -10px; + left: calc(50% - 227px); } } @keyframes parachute-animation { - from { + 0% { transform: translate(0,0) scale(1); } - to { - transform: translate(1000px,400px) scale(0); + 25% { + transform: translate(0,0) scale(1); + } + + 100% { + transform: translate(-100px,500px) scale(0); } } diff --git a/app/utils/platform.js b/app/utils/platform.js index 4f6fe3320..37053bf84 100644 --- a/app/utils/platform.js +++ b/app/utils/platform.js @@ -1,7 +1,7 @@ export var platform = (navigator.platform||'').toLowerCase(); -//export var isLinuxy = platform.indexOf('linux') >= 0; +export var isLinuxy = platform.indexOf('linux') >= 0 || platform.indexOf('unix') >= 0; export var isMac = platform.indexOf('mac') >= 0; -//var isWin = platform.indexOf('win') >= 0; +export var isWin = platform.indexOf('win') >= 0; export var alternateKey = 'ctrlKey'; export var alternateLabel = 'Control';