From df2a873ac62a628a083a511887af89fd7d76f730 Mon Sep 17 00:00:00 2001 From: David Ralph Date: Sat, 17 Oct 2020 10:30:54 +0100 Subject: [PATCH] 4.2 --- manifest/chrome.json | 2 +- manifest/firefox.json | 2 +- manifest/opera.json | 2 +- package.json | 2 +- src/components/modals/marketplace/Items.jsx | 2 +- src/components/widgets/Favourite.jsx | 2 +- src/scss/modules/_credit.scss | 8 ++++++++ 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/manifest/chrome.json b/manifest/chrome.json index 1d57794e..41d1d88d 100644 --- a/manifest/chrome.json +++ b/manifest/chrome.json @@ -3,7 +3,7 @@ "offline_enabled": true, "name": "Mue", "description": "Fast, open and free-to-use new tab page for most modern browsers.", - "version": "4.1.1", + "version": "4.2.0", "browser_action": { "default_icon": "icons/128x128.png" }, diff --git a/manifest/firefox.json b/manifest/firefox.json index 81304a8f..3967cb2f 100644 --- a/manifest/firefox.json +++ b/manifest/firefox.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "Mue", "description": "Fast, open and free-to-use new tab page for most modern browsers.", - "version": "4.1.1", + "version": "4.2.0", "browser_action": { "default_icon": "icons/128x128.png" }, diff --git a/manifest/opera.json b/manifest/opera.json index 66c30856..d8c21ad8 100644 --- a/manifest/opera.json +++ b/manifest/opera.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "Mue", "description": "Fast, open and free-to-use new tab page for most modern browsers.", - "version": "4.1.1", + "version": "4.2.0", "browser_action": { "default_icon": "icons/128x128.png" }, diff --git a/package.json b/package.json index ff122044..a40209ff 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "homepage": "https://muetab.xyz", "bugs": "https://github.com/mue/mue/issues/new?assignees=&labels=bug&template=bug-report.md&title=%5BBUG%5D", "license": "BSD-3-Clause", - "version": "4.1.1", + "version": "4.2.0", "dependencies": { "@material-ui/core": "4.11.0", "@material-ui/icons": "4.9.1", diff --git a/src/components/modals/marketplace/Items.jsx b/src/components/modals/marketplace/Items.jsx index 6f217674..c861df3d 100644 --- a/src/components/modals/marketplace/Items.jsx +++ b/src/components/modals/marketplace/Items.jsx @@ -5,7 +5,7 @@ export default class Items extends React.PureComponent { if (this.props.items.length === 0) return null; let seeMoreHTML; - if (this.props.seeMoreFunction) seeMoreHTML = ; + if (this.props.seeMoreFunction && this.props.items.length === 3) seeMoreHTML = ; return (
diff --git a/src/components/widgets/Favourite.jsx b/src/components/widgets/Favourite.jsx index 64bff126..c0473305 100644 --- a/src/components/widgets/Favourite.jsx +++ b/src/components/widgets/Favourite.jsx @@ -28,7 +28,7 @@ export default class Favourite extends React.PureComponent { } render() { - if (localStorage.getItem('favouriteEnabled') === 'false' || localStorage.getItem('background') === 'false') return null; + if (localStorage.getItem('favouriteEnabled') === 'false' || localStorage.getItem('background') === 'false' || localStorage.getItem('customBackgroundColour') || localStorage.getItem('customBackground')) return null; return
{this.state.favourited}
diff --git a/src/scss/modules/_credit.scss b/src/scss/modules/_credit.scss index c88082e3..0ec4076a 100644 --- a/src/scss/modules/_credit.scss +++ b/src/scss/modules/_credit.scss @@ -19,6 +19,14 @@ position: absolute; bottom: 10px; right: 50px; + padding-right: 5px; +} + +.view, .favourite { + transition: all 0.5s ease 0s; + &:hover { + transform: scale(1.1); + } } #photographer {