From bf66d9f5f5ac9b71db2fe591bee81493589e2c42 Mon Sep 17 00:00:00 2001 From: jessop Date: Tue, 27 Nov 2018 18:11:41 -0500 Subject: [PATCH 1/2] standardizes channelClaimsArray order --- server/chainquery/bundle.js | 2 +- server/chainquery/queries/claimQueries.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/chainquery/bundle.js b/server/chainquery/bundle.js index 60aca215..bcbc3012 100644 --- a/server/chainquery/bundle.js +++ b/server/chainquery/bundle.js @@ -904,7 +904,7 @@ var claimQueries = (db, table, sequelize) => ({ }; return await table.findAll({ where: selectWhere, - order: [['height', 'DESC']], + order: [['height', 'DESC'],['claim_id', 'ASC']], }) .then(channelClaimsArray => { if (channelClaimsArray.length === 0) { diff --git a/server/chainquery/queries/claimQueries.js b/server/chainquery/queries/claimQueries.js index 8cba61c2..174c897d 100644 --- a/server/chainquery/queries/claimQueries.js +++ b/server/chainquery/queries/claimQueries.js @@ -103,7 +103,7 @@ export default (db, table, sequelize) => ({ }; return await table.findAll({ where: selectWhere, - order: [['height', 'DESC']], + order: [['height', 'DESC'],['claim_id', 'ASC']], }) .then(channelClaimsArray => { if (channelClaimsArray.length === 0) { -- 2.45.2 From 1531476659fdc9d752ad77389351634f5786c6fb Mon Sep 17 00:00:00 2001 From: jessop Date: Thu, 29 Nov 2018 18:00:00 -0500 Subject: [PATCH 2/2] makes play overlay more like (firefox) browser --- client/scss/_asset-preview.scss | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/scss/_asset-preview.scss b/client/scss/_asset-preview.scss index b9290fe6..f420531d 100644 --- a/client/scss/_asset-preview.scss +++ b/client/scss/_asset-preview.scss @@ -31,19 +31,19 @@ h3.asset-preview__title { padding: 0; border: 0; position: absolute; - opacity: .50; - height: 50%; - top: 25%; + opacity: 0.80; + height: 25%; + top: 37.5%; left: 0; right: 0; bottom: 0; z-index: 1000; margin: 0 auto; - background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E %3Cg stroke='lightgray' stroke-width='2' fill='white' fill-rule='evenodd' stroke-linejoin='round'%3E %3Cpolygon points='5 21 5 3 21 12'/%3E %3C/g%3E %3C/svg%3E"); + background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 60 60' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E %3Cg stroke='black' stroke-width='2' fill='black' fill-rule='evenodd' stroke-linejoin='round'%3E %3Ccircle cx='30' cy='30' r='28'/%3E%3C/g%3E %3Cg stroke='white' stroke-width='1' fill='white' fill-rule='evenodd' stroke-linejoin='round'%3E %3Cpolygon points='25 19 42 30 25 41'/%3E %3C/g%3E %3C/svg%3E"); background-repeat: no-repeat; background-position: center; } .asset-preview__play-wrapper:hover .asset-preview__play-overlay { - opacity: 1.0; + opacity: 0.2; } -- 2.45.2