From 633349ddff2fd96298ce26ac2d3c404edb1ebbf3 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 29 Oct 2020 21:13:31 +0200 Subject: Refactor desktop navbar into a component, change layout to grid for better compatibility with search field and simpler CSS --- src/modules/instance.js | 1 + 1 file changed, 1 insertion(+) (limited to 'src/modules/instance.js') diff --git a/src/modules/instance.js b/src/modules/instance.js index b3cbffc6..0c35f5d6 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -30,6 +30,7 @@ const defaultState = { logo: '/static/logo.png', logoMargin: '.2em', logoMask: true, + logoLeft: false, minimalScopesMode: false, nsfwCensorImage: undefined, postContentType: 'text/plain', -- cgit v1.2.3-70-g09d2 From 3db218dec1f0abc14b00569f605dc9cf8225d26f Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 2 Nov 2020 19:37:01 +0200 Subject: change logo to svg --- CHANGELOG.md | 1 + src/modules/instance.js | 2 +- static/config.json | 2 +- static/logo.png | Bin 1304 -> 0 bytes static/logo.svg | 71 +++++++++++++++++++++++++++++++++++++++++++ static/terms-of-service.html | 2 +- 6 files changed, 75 insertions(+), 3 deletions(-) delete mode 100644 static/logo.png create mode 100644 static/logo.svg (limited to 'src/modules/instance.js') diff --git a/CHANGELOG.md b/CHANGELOG.md index 68cab40c..3c338de8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Icons changed from fontello (FontAwesome 4 + others) to FontAwesome 5 due to problems with fontello. - Some icons changed for better accessibility (lock, globe) - Logo is now clickable +- Changed default logo to SVG version ## [2.1.1] - 2020-09-08 ### Changed diff --git a/src/modules/instance.js b/src/modules/instance.js index 0c35f5d6..5f7bf0ec 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -27,7 +27,7 @@ const defaultState = { hideSitename: false, hideUserStats: false, loginMethod: 'password', - logo: '/static/logo.png', + logo: '/static/logo.svg', logoMargin: '.2em', logoMask: true, logoLeft: false, diff --git a/static/config.json b/static/config.json index 4b70aea5..f59e645a 100644 --- a/static/config.json +++ b/static/config.json @@ -10,7 +10,7 @@ "hideSitename": false, "hideUserStats": false, "loginMethod": "password", - "logo": "/static/logo.png", + "logo": "/static/logo.svg", "logoMargin": ".1em", "logoMask": true, "logoLeft": false, diff --git a/static/logo.png b/static/logo.png deleted file mode 100644 index 7744b1ac..00000000 Binary files a/static/logo.png and /dev/null differ diff --git a/static/logo.svg b/static/logo.svg new file mode 100644 index 00000000..68e647e6 --- /dev/null +++ b/static/logo.svg @@ -0,0 +1,71 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/static/terms-of-service.html b/static/terms-of-service.html index 3b6bbb36..2b7bf769 100644 --- a/static/terms-of-service.html +++ b/static/terms-of-service.html @@ -6,4 +6,4 @@ Pleroma install containing the real ToS for your instance.

See the Pleroma documentation for more information.


- + -- cgit v1.2.3-70-g09d2 From 4b0308ad1fe148f7349ff82a89094c0abf979564 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 4 Jan 2021 21:09:12 +0200 Subject: fix #1037 chrome sorting didn't like 0, other sorter was just outright broken --- src/modules/instance.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/modules/instance.js') diff --git a/src/modules/instance.js b/src/modules/instance.js index 5f7bf0ec..411b1caa 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -127,7 +127,7 @@ const instance = { imageUrl: false, replacement: values[key] } - }).sort((a, b) => a.displayText - b.displayText) + }).sort((a, b) => a.name > b.name ? 1 : -1) commit('setInstanceOption', { name: 'emoji', value: emoji }) } else { throw (res) @@ -154,7 +154,7 @@ const instance = { } // Technically could use tags but those are kinda useless right now, // should have been "pack" field, that would be more useful - }).sort((a, b) => a.displayText.toLowerCase() > b.displayText.toLowerCase() ? 1 : 0) + }).sort((a, b) => a.displayText.toLowerCase() > b.displayText.toLowerCase() ? 1 : -1) commit('setInstanceOption', { name: 'customEmoji', value: emoji }) } else { throw (res) -- cgit v1.2.3-70-g09d2