From 97fd051423805d5ebcdcc8fef89c796da3aaa819 Mon Sep 17 00:00:00 2001 From: Ro Date: Fri, 4 Sep 2020 14:30:44 -0700 Subject: [PATCH] notification position tweaks, bumped version number --- brain/views/frame.pug | 4 ++-- package.json | 2 +- public/assets/css/dash.css | 8 ++++---- public/assets/scripts/dash.min.js | 16 ++++++++++------ 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/brain/views/frame.pug b/brain/views/frame.pug index 5d299ff..21282d7 100644 --- a/brain/views/frame.pug +++ b/brain/views/frame.pug @@ -12,8 +12,8 @@ html(xmlns='http://www.w3.org/1999/xhtml', lang='en', xml:lang="en") //meta(name="twitter:image" content="https://thetwelfth.house/base-assets/images/current.png") link(rel='stylesheet', href="/assets/css/dash.css", type='text/css') body - #notifications.notifications.notify-close - #notifyMessage.notifyMessage + #notifications.notifications + #notifyMessage.notifyMessage.notify-close .notify-icon#notify-good svg(viewBox="0 0 20 20" class="icons") use#submit-update(xlink:href='/assets/images/global/sprite.svg#entypo-emoji-flirt') diff --git a/package.json b/package.json index 85700d5..d8ed3ad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fipamo-beta", - "version": "1.2.2", + "version": "1.2.3", "private": true, "description": "The most chill blog framework ever.", "repository": "https://code.playvicio.us/Are0h/Fipamo", diff --git a/public/assets/css/dash.css b/public/assets/css/dash.css index 572f65c..e9b9514 100644 --- a/public/assets/css/dash.css +++ b/public/assets/css/dash.css @@ -1559,7 +1559,6 @@ body { background-color: #161d23; font: 400 1em Helvetica, Arial, sans-serif; height: 100%; - perspective: 1000px; } a { font: 300 1em Helvetica, Arial, sans-serif; @@ -1578,26 +1577,27 @@ svg.icons { fill: #b2cce5; } #notifications { + perspective: 1000px; position: fixed; z-index: 2000; height: 10%; width: 100%; - display: block; + display: none; align-items: center; justify-content: center; padding: 0; margin: 0; - transform-origin: 50% 0; - transition: all 0.5s cubic-bezier(0.83, 0.05, 0.28, 1); } #notifications #notifyMessage { margin: 0 auto; + transition: all 0.5s cubic-bezier(0.83, 0.05, 0.28, 1); height: 50px; width: 500px; display: flex; align-items: center; justify-content: center; opacity: 1; + transform-origin: 50% 0; } #notifications #notifyMessage #notify-good, #notifications #notifyMessage #notify-lame, diff --git a/public/assets/scripts/dash.min.js b/public/assets/scripts/dash.min.js index e61ef8c..58fdf1f 100644 --- a/public/assets/scripts/dash.min.js +++ b/public/assets/scripts/dash.min.js @@ -3617,6 +3617,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } var notifcation = document.getElementById('notifications'); +var notify = document.getElementById('notifyMessage'); var messageText = document.getElementById('message-text'); var iconGood = document.getElementById('notify-good'); var iconLame = document.getElementById('notify-lame'); @@ -3636,7 +3637,7 @@ var Notfications = /*#__PURE__*/function () { _createClass(Notfications, [{ key: "alert", value: function alert(text, status) { - //notifcation.style.display = 'flex'; + notifcation.style.display = 'block'; iconWorking.style.display = 'none'; iconGood.style.display = 'none'; iconLame.style.display = 'none'; @@ -3657,8 +3658,8 @@ var Notfications = /*#__PURE__*/function () { iconWorking.style.display = 'block'; } - notifcation.classList.remove('notify-close'); - notifcation.classList.add('notify-open'); + notify.classList.remove('notify-close'); + notify.classList.add('notify-open'); messageText.innerHTML = text; (0, _animeEs.default)({ targets: messageText, @@ -3668,8 +3669,11 @@ var Notfications = /*#__PURE__*/function () { complete: function complete() { if (status !== null) { setTimeout(function () { - notifcation.classList.add('notify-close'); - notifcation.classList.remove('notify-open'); + notify.addEventListener('transitionend', function () { + notifcation.style.display = 'none'; + }); + notify.classList.add('notify-close'); + notify.classList.remove('notify-open'); }, 1000); } } @@ -8572,7 +8576,7 @@ var parent = module.bundle.parent; if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') { var hostname = "" || location.hostname; var protocol = location.protocol === 'https:' ? 'wss' : 'ws'; - var ws = new WebSocket(protocol + '://' + hostname + ':' + "53859" + '/'); + var ws = new WebSocket(protocol + '://' + hostname + ':' + "57255" + '/'); ws.onmessage = function (event) { checkedAssets = {};