felixfoertsch/gnome-night-theme-switcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix Cabinet day variant

Browse Source
This commit is contained in:
Romain Vigier
2020-04-15 23:52:42 +02:00
parent 457c91b4db
commit 66b4e82d4c
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/Variants.js
+6 -2
View File
@@ -52,10 +52,14 @@ var Variants = class {
variants.set('day', name.replace('-Nokto', '')); variants.set('day', name.replace('-Nokto', ''));
variants.set('night', variants.get('day').replace('Adapta', 'Adapta-Nokto')); variants.set('night', variants.get('day').replace('Adapta', 'Adapta-Nokto'));
} }
else if ( name.match(/^(Arc|Cabinet)/) ) { else if ( name.match('Arc') ) {
const basename = name.split('-')[0]; const basename = name.split('-')[0];
variants.set('day', name.replace(/-Dark(?!er)/, '')); variants.set('day', name.replace(/-Dark(?!er)/, ''));
variants.set('night', variants.get('day').replace(new RegExp(`${basename}(-Darker)?`), `${basename}-Dark`)); variants.set('night', variants.get('day').replace(/Arc(-Darker)?/, 'Arc-Dark'));
}
else if ( name.match('Cabinet') ) {
variants.set('day', name.replace(/-Dark(?!er)/, '-Light'));
variants.set('night', variants.get('day').replace(/(-Light|-Darker)/, '-Dark'))
} }
else if ( name.match(/^(Canta|ChromeOS|Materia|Orchis).*-compact/) ) { else if ( name.match(/^(Canta|ChromeOS|Materia|Orchis).*-compact/) ) {
variants.set('day', name.replace('-dark', '')); variants.set('day', name.replace('-dark', ''));
tests/Cabinet.js
+3 -3
View File
@@ -22,14 +22,14 @@ const { Variants } = require('./_variants');
['Blue', 'Green', 'Orange'].forEach(color => { ['Blue', 'Green', 'Orange'].forEach(color => {
test(`Cabinet-${color}`, t => { test(`Cabinet-${color}`, t => {
const variants = Variants.guess_from(`Cabinet-${color}`); const variants = Variants.guess_from(`Cabinet-Light-${color}`);
t.is(variants.get('day'), `Cabinet-${color}`); t.is(variants.get('day'), `Cabinet-Light-${color}`);
t.is(variants.get('night'), `Cabinet-Dark-${color}`); t.is(variants.get('night'), `Cabinet-Dark-${color}`);
}); });
test(`Cabinet-Dark-${color}`, t => { test(`Cabinet-Dark-${color}`, t => {
const variants = Variants.guess_from(`Cabinet-Dark-${color}`); const variants = Variants.guess_from(`Cabinet-Dark-${color}`);
t.is(variants.get('day'), `Cabinet-${color}`); t.is(variants.get('day'), `Cabinet-Light-${color}`);
t.is(variants.get('night'), `Cabinet-Dark-${color}`); t.is(variants.get('night'), `Cabinet-Dark-${color}`);
}); });