diff --git a/src/features/time/components/VerticalClock.jsx b/src/features/time/components/VerticalClock.jsx
index 8ad6d7e6..b0616bb3 100644
--- a/src/features/time/components/VerticalClock.jsx
+++ b/src/features/time/components/VerticalClock.jsx
@@ -1,6 +1,7 @@
function VerticalClock({ finalHour, finalMinute, finalSeconds }) {
const hourColour = localStorage.getItem('hourColour') || '#fff';
- const minuteColour = localStorage.getItem('minuteColour') || '#ƒff';
+ const minuteColour = localStorage.getItem('minuteColour') || '#fff';
+ const secondColour = localStorage.getItem('secondColour') || '#fff';
return (
@@ -10,7 +11,9 @@ function VerticalClock({ finalHour, finalMinute, finalSeconds }) {
{finalMinute}
- {finalSeconds}
+
+ {finalSeconds}
+
);
}
diff --git a/src/features/time/options/TimeOptions.jsx b/src/features/time/options/TimeOptions.jsx
index c4633501..827519b4 100644
--- a/src/features/time/options/TimeOptions.jsx
+++ b/src/features/time/options/TimeOptions.jsx
@@ -12,6 +12,9 @@ const TimeOptions = () => {
const [minuteColour, setMinuteColour] = useState(
localStorage.getItem('minuteColour') || '#ffffff',
);
+ const [secondColour, setSecondColour] = useState(
+ localStorage.getItem('secondColour') || '#ffffff',
+ );
const TIME_SECTION = 'modals.main.settings.sections.time';
const updateColour = (type, event) => {
@@ -20,6 +23,8 @@ const TimeOptions = () => {
setHourColour(colour);
} else if (type === 'minuteColour') {
setMinuteColour(colour);
+ } else if (type === 'secondColour') {
+ setSecondColour(colour);
}
localStorage.setItem(type, colour);
};
@@ -183,6 +188,32 @@ const TimeOptions = () => {
+
+
+
+
+ updateColour('secondColour', event)}
+ value={secondColour}
+ >
+
+
+ localStorage.setItem('secondColour', '#ffffff')}>
+
+ {variables.getMessage('modals.main.settings.buttons.reset')}
+
+
+
+
{digitalSettings}
);
diff --git a/src/features/weather/weather.scss b/src/features/weather/weather.scss
index 6816c662..50c30203 100644
--- a/src/features/weather/weather.scss
+++ b/src/features/weather/weather.scss
@@ -12,7 +12,6 @@
transition: 0.8s cubic-bezier(0.075, 0.82, 0.165, 1);
display: flex;
flex-flow: column;
-
animation: fadeIn 1s;
&:hover {
@@ -152,6 +151,7 @@
.minmax {
max-width: fit-content;
background: transparent !important;
+
.subtitle {
margin-bottom: 5px;
}
diff --git a/src/i18n/locales/en_GB.json b/src/i18n/locales/en_GB.json
index dcfae1c0..c51c7dc3 100644
--- a/src/i18n/locales/en_GB.json
+++ b/src/i18n/locales/en_GB.json
@@ -133,7 +133,8 @@
"vertical_clock": {
"title": "Vertical Clock",
"change_hour_colour": "Change hour text colour",
- "change_minute_colour": "Change minute text colour"
+ "change_minute_colour": "Change minute text colour",
+ "change_second_colour": "Change second text colour"
}
},
"date": {
@@ -441,8 +442,8 @@
},
"experimental_warning": "Please note that the Mue team cannot provide support if you have experimental mode on. Please disable it first and see if the issue continues to occur before contacting support.",
"preview_data_disabled": {
- "title": "Data Settings Disabled",
- "description": "Data settings are disabled in preview mode. Please exit preview mode to use this feature."
+ "title":"Data Settings Disabled",
+ "description":"Data settings are disabled in preview mode. Please exit preview mode to use this feature."
}
},
"stats": {
diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
index d57f4075..42ec6817 100644
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -97,7 +97,7 @@ $themes: (
box-shadow: t($boxShadow);
}
- -webkit-backdrop-filter: blur(map.get($ui-elements, 'backgroundBlur'));
+ backdrop-filter: blur(map.get($ui-elements, 'backgroundBlur'));
backdrop-filter: blur(map.get($ui-elements, 'backgroundBlur'));
.title {
diff --git a/src/scss/index.scss b/src/scss/index.scss
index 343f834d..c835d3c8 100644
--- a/src/scss/index.scss
+++ b/src/scss/index.scss
@@ -5,8 +5,8 @@ body {
background: #000;
margin: 0;
overflow: hidden;
- text-rendering: optimizeLegibility !important;
- -moz-text-rendering: optimizeLegibility !important;
+ text-rendering: optimizelegibility !important;
+ -moz-text-rendering: optimizelegibility !important;
}
* {
@@ -33,7 +33,6 @@ body {
justify-content: center;
align-items: center;
gap: 20px;
-
animation: fadeIn 1s;
}
@@ -208,13 +207,15 @@ body {
.pulse {
height: 100%;
width: 100%;
- background: linear-gradient(-90deg, #efefef 0%, #cccccc 50%, #efefef 100%);
+ background: linear-gradient(-90deg, #efefef 0%, #ccc 50%, #efefef 100%);
background-size: 400% 400%;
animation: pulse 1.2s ease-in-out infinite;
+
@keyframes pulse {
0% {
background-position: 0% 0%;
}
+
100% {
background-position: -135% 0%;
}
@@ -226,13 +227,15 @@ body {
.pulse {
height: 100%;
width: 100%;
- background: linear-gradient(-90deg, #000000 0%, rgb(83, 83, 83) 50%, #000000 100%);
+ background: linear-gradient(-90deg, #000 0%, rgb(83 83 83) 50%, #000 100%);
background-size: 400% 400%;
animation: pulse 1.2s ease-in-out infinite;
+
@keyframes pulse {
0% {
background-position: 0% 0%;
}
+
100% {
background-position: -135% 0%;
}
diff --git a/vite.config.mjs.timestamp-1716327320812-afa5a5ba1661a.mjs b/vite.config.mjs.timestamp-1716327320812-afa5a5ba1661a.mjs
new file mode 100644
index 00000000..3568378e
--- /dev/null
+++ b/vite.config.mjs.timestamp-1716327320812-afa5a5ba1661a.mjs
@@ -0,0 +1,140 @@
+// vite.config.mjs
+import { defineConfig, loadEnv } from "file:///F:/Programming/mue/node_modules/.pnpm/vite@5.2.11_@types+node@20.12.12_sass@1.77.2/node_modules/vite/dist/node/index.js";
+import react from "file:///F:/Programming/mue/node_modules/.pnpm/@vitejs+plugin-react-swc@3.6.0_vite@5.2.11/node_modules/@vitejs/plugin-react-swc/index.mjs";
+import path from "path";
+import fs from "fs";
+import ADMZip from "file:///F:/Programming/mue/node_modules/.pnpm/adm-zip@0.5.12/node_modules/adm-zip/adm-zip.js";
+
+// package.json
+var version = "7.1.0";
+
+// vite.config.mjs
+import progress from "file:///F:/Programming/mue/node_modules/.pnpm/vite-plugin-progress@0.0.7_vite@5.2.11/node_modules/vite-plugin-progress/dist/index.mjs";
+var __vite_injected_original_dirname = "F:\\Programming\\mue";
+var isProd = process.env.NODE_ENV === "production";
+var prepareBuilds = () => ({
+ name: "prepareBuilds",
+ buildEnd() {
+ if (isProd) {
+ fs.mkdirSync(path.resolve(__vite_injected_original_dirname, "./build"), { recursive: true });
+ fs.mkdirSync(path.resolve(__vite_injected_original_dirname, "./dist"), { recursive: true });
+ fs.mkdirSync(path.resolve(__vite_injected_original_dirname, "./build/chrome"), { recursive: true });
+ fs.copyFileSync(
+ path.resolve(__vite_injected_original_dirname, "./manifest/chrome.json"),
+ path.resolve(__vite_injected_original_dirname, "./build/chrome/manifest.json")
+ );
+ fs.copyFileSync(
+ path.resolve(__vite_injected_original_dirname, "./manifest/background.js"),
+ path.resolve(__vite_injected_original_dirname, "./build/chrome/background.js")
+ );
+ fs.cpSync(
+ path.resolve(__vite_injected_original_dirname, "./manifest/_locales"),
+ path.resolve(__vite_injected_original_dirname, "./build/chrome/_locales"),
+ {
+ recursive: true
+ }
+ );
+ fs.cpSync(path.resolve(__vite_injected_original_dirname, "./dist"), path.resolve(__vite_injected_original_dirname, "./build/chrome/"), {
+ recursive: true
+ });
+ fs.cpSync(
+ path.resolve(__vite_injected_original_dirname, "./src/assets/icons"),
+ path.resolve(__vite_injected_original_dirname, "./build/chrome/icons"),
+ {
+ recursive: true
+ }
+ );
+ fs.mkdirSync(path.resolve(__vite_injected_original_dirname, "./build/chrome/src/assets"), { recursive: true });
+ fs.cpSync(
+ path.resolve(__vite_injected_original_dirname, "./src/assets"),
+ path.resolve(__vite_injected_original_dirname, "./build/chrome/src/assets"),
+ {
+ recursive: true
+ }
+ );
+ fs.mkdirSync(path.resolve(__vite_injected_original_dirname, "./build/firefox"), { recursive: true });
+ fs.copyFileSync(
+ path.resolve(__vite_injected_original_dirname, "./manifest/firefox.json"),
+ path.resolve(__vite_injected_original_dirname, "./build/firefox/manifest.json")
+ );
+ fs.copyFileSync(
+ path.resolve(__vite_injected_original_dirname, "./manifest/background.js"),
+ path.resolve(__vite_injected_original_dirname, "./build/firefox/background.js")
+ );
+ fs.cpSync(path.resolve(__vite_injected_original_dirname, "./dist"), path.resolve(__vite_injected_original_dirname, "./build/firefox/"), {
+ recursive: true
+ });
+ fs.cpSync(
+ path.resolve(__vite_injected_original_dirname, "./src/assets/icons"),
+ path.resolve(__vite_injected_original_dirname, "./build/firefox/icons"),
+ {
+ recursive: true
+ }
+ );
+ fs.cpSync(
+ path.resolve(__vite_injected_original_dirname, "./src/assets"),
+ path.resolve(__vite_injected_original_dirname, "./build/firefox/src/assets"),
+ {
+ recursive: true
+ }
+ );
+ const zip = new ADMZip();
+ zip.addLocalFolder(path.resolve(__vite_injected_original_dirname, "./build/chrome"));
+ zip.writeZip(path.resolve(__vite_injected_original_dirname, `./build/chrome-${version}.zip`));
+ const zip2 = new ADMZip();
+ zip2.addLocalFolder(path.resolve(__vite_injected_original_dirname, "./build/firefox"));
+ zip2.writeZip(path.resolve(__vite_injected_original_dirname, `./build/firefox-${version}.zip`));
+ }
+ }
+});
+var vite_config_default = defineConfig(({ command, mode }) => {
+ const env = loadEnv(mode, process.cwd(), "");
+ return {
+ define: {
+ __APP_ENV__: JSON.stringify(env.APP_ENV)
+ },
+ plugins: [react(), prepareBuilds(), progress()],
+ server: {
+ open: true,
+ hmr: {
+ protocol: "ws",
+ host: "localhost"
+ }
+ },
+ build: {
+ minify: isProd ? "esbuild" : false,
+ sourcemap: !isProd,
+ rollupOptions: {
+ output: {
+ manualChunks(id) {
+ if (id.includes("node_modules")) {
+ if (id.includes("@mui")) {
+ return "vendor_mui";
+ }
+ return "vendor";
+ }
+ }
+ }
+ }
+ },
+ resolve: {
+ extensions: [".js", ".jsx"],
+ alias: {
+ "@": path.resolve(__vite_injected_original_dirname, "./src"),
+ i18n: path.resolve(__vite_injected_original_dirname, "./src/i18n"),
+ components: path.resolve(__vite_injected_original_dirname, "./src/components"),
+ assets: path.resolve(__vite_injected_original_dirname, "./src/assets"),
+ config: path.resolve(__vite_injected_original_dirname, "./src/config"),
+ features: path.resolve(__vite_injected_original_dirname, "./src/features"),
+ lib: path.resolve(__vite_injected_original_dirname, "./src/lib"),
+ scss: path.resolve(__vite_injected_original_dirname, "./src/scss"),
+ translations: path.resolve(__vite_injected_original_dirname, "./src/i18n/locales"),
+ utils: path.resolve(__vite_injected_original_dirname, "./src/utils")
+ }
+ }
+ };
+});
+export {
+ vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.mjs", "package.json"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"F:\\\\Programming\\\\mue\";const __vite_injected_original_filename = \"F:\\\\Programming\\\\mue\\\\vite.config.mjs\";const __vite_injected_original_import_meta_url = \"file:///F:/Programming/mue/vite.config.mjs\";import { defineConfig, loadEnv } from 'vite';\r\nimport react from '@vitejs/plugin-react-swc';\r\nimport path from 'path';\r\nimport fs from 'fs';\r\nimport ADMZip from 'adm-zip';\r\nimport * as pkg from './package.json';\r\nimport progress from 'vite-plugin-progress';\r\n\r\nconst isProd = process.env.NODE_ENV === 'production';\r\n\r\nconst prepareBuilds = () => ({\r\n  name: 'prepareBuilds',\r\n  buildEnd() {\r\n    if (isProd) {\r\n      // make directories if not exist\r\n      fs.mkdirSync(path.resolve(__dirname, './build'), { recursive: true });\r\n      fs.mkdirSync(path.resolve(__dirname, './dist'), { recursive: true });\r\n\r\n      // chrome\r\n      fs.mkdirSync(path.resolve(__dirname, './build/chrome'), { recursive: true });\r\n      fs.copyFileSync(\r\n        path.resolve(__dirname, './manifest/chrome.json'),\r\n        path.resolve(__dirname, './build/chrome/manifest.json'),\r\n      );\r\n      fs.copyFileSync(\r\n        path.resolve(__dirname, './manifest/background.js'),\r\n        path.resolve(__dirname, './build/chrome/background.js'),\r\n      );\r\n      fs.cpSync(\r\n        path.resolve(__dirname, './manifest/_locales'),\r\n        path.resolve(__dirname, './build/chrome/_locales'),\r\n        {\r\n          recursive: true,\r\n        },\r\n      );\r\n      fs.cpSync(path.resolve(__dirname, './dist'), path.resolve(__dirname, './build/chrome/'), {\r\n        recursive: true,\r\n      });\r\n      fs.cpSync(\r\n        path.resolve(__dirname, './src/assets/icons'),\r\n        path.resolve(__dirname, './build/chrome/icons'),\r\n        {\r\n          recursive: true,\r\n        },\r\n      );\r\n      fs.mkdirSync(path.resolve(__dirname, './build/chrome/src/assets'), { recursive: true });\r\n      fs.cpSync(\r\n        path.resolve(__dirname, './src/assets'),\r\n        path.resolve(__dirname, './build/chrome/src/assets'),\r\n        {\r\n          recursive: true,\r\n        },\r\n      );\r\n\r\n      // firefox\r\n      fs.mkdirSync(path.resolve(__dirname, './build/firefox'), { recursive: true });\r\n      fs.copyFileSync(\r\n        path.resolve(__dirname, './manifest/firefox.json'),\r\n        path.resolve(__dirname, './build/firefox/manifest.json'),\r\n      );\r\n      fs.copyFileSync(\r\n        path.resolve(__dirname, './manifest/background.js'),\r\n        path.resolve(__dirname, './build/firefox/background.js'),\r\n      );\r\n      fs.cpSync(path.resolve(__dirname, './dist'), path.resolve(__dirname, './build/firefox/'), {\r\n        recursive: true,\r\n      });\r\n      fs.cpSync(\r\n        path.resolve(__dirname, './src/assets/icons'),\r\n        path.resolve(__dirname, './build/firefox/icons'),\r\n        {\r\n          recursive: true,\r\n        },\r\n      );\r\n      fs.cpSync(\r\n        path.resolve(__dirname, './src/assets'),\r\n        path.resolve(__dirname, './build/firefox/src/assets'),\r\n        {\r\n          recursive: true,\r\n        },\r\n      );\r\n\r\n      // create zip\r\n      const zip = new ADMZip();\r\n      zip.addLocalFolder(path.resolve(__dirname, './build/chrome'));\r\n      zip.writeZip(path.resolve(__dirname, `./build/chrome-${pkg.version}.zip`));\r\n\r\n      const zip2 = new ADMZip();\r\n      zip2.addLocalFolder(path.resolve(__dirname, './build/firefox'));\r\n      zip2.writeZip(path.resolve(__dirname, `./build/firefox-${pkg.version}.zip`));\r\n    }\r\n  },\r\n});\r\n\r\nexport default defineConfig(({ command, mode }) => {\r\n  const env = loadEnv(mode, process.cwd(), '');\r\n  return {\r\n    define: {\r\n      __APP_ENV__: JSON.stringify(env.APP_ENV),\r\n    },\r\n    plugins: [react(), prepareBuilds(), progress()],\r\n    server: {\r\n      open: true,\r\n      hmr: {\r\n        protocol: 'ws',\r\n        host: 'localhost',\r\n      },\r\n    },\r\n    build: {\r\n      minify: isProd ? 'esbuild' : false,\r\n      sourcemap: !isProd,\r\n      rollupOptions: {\r\n        output: {\r\n          manualChunks(id) {\r\n            if (id.includes('node_modules')) {\r\n              if (id.includes('@mui')) {\r\n                return 'vendor_mui';\r\n              }\r\n\r\n              return 'vendor';\r\n            }\r\n          },\r\n        },\r\n      },\r\n    },\r\n    resolve: {\r\n      extensions: ['.js', '.jsx'],\r\n      alias: {\r\n        '@': path.resolve(__dirname, './src'),\r\n        i18n: path.resolve(__dirname, './src/i18n'),\r\n        components: path.resolve(__dirname, './src/components'),\r\n        assets: path.resolve(__dirname, './src/assets'),\r\n        config: path.resolve(__dirname, './src/config'),\r\n        features: path.resolve(__dirname, './src/features'),\r\n        lib: path.resolve(__dirname, './src/lib'),\r\n        scss: path.resolve(__dirname, './src/scss'),\r\n        translations: path.resolve(__dirname, './src/i18n/locales'),\r\n        utils: path.resolve(__dirname, './src/utils'),\r\n      },\r\n    },\r\n  };\r\n});\r\n", "{\n  \"name\": \"mue\",\n  \"private\": true,\n  \"author\": \"The Mue Authors (https://github.com/mue/mue/graphs/contributors)\",\n  \"description\": \"Fast, open and free-to-use new tab page for modern browsers.\",\n  \"repository\": {\n    \"url\": \"github:mue/mue\"\n  },\n  \"homepage\": \"https://muetab.com\",\n  \"bugs\": \"https://github.com/mue/mue/issues/new?assignees=&labels=bug&template=bug-report.md&title=%5BBUG%5D\",\n  \"license\": \"BSD-3-Clause\",\n  \"version\": \"7.1.0\",\n  \"dependencies\": {\n    \"@eartharoid/i18n\": \"1.2.1\",\n    \"@emotion/react\": \"^11.11.4\",\n    \"@emotion/styled\": \"^11.11.5\",\n    \"@floating-ui/react-dom\": \"2.1.0\",\n    \"@fontsource/lexend-deca\": \"5.0.12\",\n    \"@fontsource/montserrat\": \"5.0.17\",\n    \"@muetab/react-sortable-hoc\": \"^2.0.1\",\n    \"@mui/material\": \"5.15.18\",\n    \"@sentry/react\": \"^8.2.1\",\n    \"embla-carousel-autoplay\": \"8.1.3\",\n    \"embla-carousel-react\": \"8.1.3\",\n    \"fast-blurhash\": \"^1.1.2\",\n    \"image-conversion\": \"^2.1.1\",\n    \"react\": \"^18.3.1\",\n    \"react-best-gradient-color-picker\": \"^3.0.7\",\n    \"react-clock\": \"5.0.0\",\n    \"react-dom\": \"^18.3.1\",\n    \"react-icons\": \"^5.2.1\",\n    \"react-modal\": \"3.16.1\",\n    \"react-toastify\": \"10.0.5\",\n    \"use-debounce\": \"^10.0.0\"\n  },\n  \"devDependencies\": {\n    \"@commitlint/cli\": \"^19.3.0\",\n    \"@commitlint/config-conventional\": \"^19.2.2\",\n    \"@eartharoid/deep-merge\": \"^0.0.2\",\n    \"@vitejs/plugin-react-swc\": \"^3.6.0\",\n    \"adm-zip\": \"^0.5.12\",\n    \"eslint\": \"^8.57.0\",\n    \"eslint-config-prettier\": \"^9.1.0\",\n    \"eslint-config-react-app\": \"^7.0.1\",\n    \"husky\": \"^9.0.11\",\n    \"prettier\": \"^3.2.5\",\n    \"sass\": \"^1.77.2\",\n    \"stylelint\": \"^16.5.0\",\n    \"stylelint-config-standard-scss\": \"^13.1.0\",\n    \"stylelint-scss\": \"^6.3.0\",\n    \"vite\": \"5.2.11\",\n    \"vite-plugin-progress\": \"^0.0.7\"\n  },\n  \"scripts\": {\n    \"dev\": \"vite\",\n    \"dev:host\": \"vite --host\",\n    \"translations\": \"cd scripts && node updatetranslations.js\",\n    \"build\": \"vite build\",\n    \"pretty\": \"prettier --write \\\"./**/*.{js,jsx,json,scss,css}\\\"\",\n    \"lint\": \"eslint \\\"./src/**/*.{js,jsx}\\\" && stylelint \\\"./src/**/*.{scss,css}\\\"\",\n    \"lint:fix\": \"eslint \\\"./src/**/*.{js,jsx}\\\" --fix && stylelint \\\"./src/**/*.{scss,css}\\\" --fix\",\n    \"postinstall\": \"husky\"\n  }\n}\n"],
  "mappings": "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",
  "names": []
}
