From 299f986ada05b655a16d765e2fcf5af072399ed7 Mon Sep 17 00:00:00 2001 From: feycot Date: Sat, 14 Jan 2023 01:48:34 +0500 Subject: [PATCH 1/7] add dark theme --- package-lock.json | 14 +++++++------- package.json | 2 +- resources/views/layouts/app.blade.php | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index ccc8c955f..74047efe4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@popperjs/core": "^2.11.5", "@reduxjs/toolkit": "^1.6.2", "axios": "^0.25", - "bootstrap": "^5.2.3", + "bootstrap": "^5.3.0-alpha1", "codemirror": "^5.64.0", "highlight.js": "^11.x", "i18next": "^21.5.4", @@ -3190,9 +3190,9 @@ "license": "ISC" }, "node_modules/bootstrap": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", - "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", + "version": "5.3.0-alpha1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.0-alpha1.tgz", + "integrity": "sha512-ABZpKK4ObS3kKlIqH+ZVDqoy5t/bhFG0oHTAzByUdon7YIom0lpCeTqRniDzJmbtcWkNe800VVPBiJgxSYTYew==", "funding": [ { "type": "github", @@ -13529,9 +13529,9 @@ "dev": true }, "bootstrap": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.3.tgz", - "integrity": "sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==", + "version": "5.3.0-alpha1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.0-alpha1.tgz", + "integrity": "sha512-ABZpKK4ObS3kKlIqH+ZVDqoy5t/bhFG0oHTAzByUdon7YIom0lpCeTqRniDzJmbtcWkNe800VVPBiJgxSYTYew==", "requires": {} }, "brace-expansion": { diff --git a/package.json b/package.json index 61e7a8dfb..541796a66 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@popperjs/core": "^2.11.5", "@reduxjs/toolkit": "^1.6.2", "axios": "^0.25", - "bootstrap": "^5.2.3", + "bootstrap": "^5.3.0-alpha1", "codemirror": "^5.64.0", "highlight.js": "^11.x", "i18next": "^21.5.4", diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 81e115302..bf99ebd45 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -1,5 +1,5 @@ - + @@ -70,4 +70,4 @@ @stack('scripts') - \ No newline at end of file + From cbf6f76cd8634cef3edfd4006284857225243b10 Mon Sep 17 00:00:00 2001 From: Aintdead86 <96647913+antonDedyaev@users.noreply.github.com> Date: Wed, 18 Jan 2023 16:16:08 +0300 Subject: [PATCH 2/7] add theme selector for components styling --- resources/js/common/currentTheme.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 resources/js/common/currentTheme.js diff --git a/resources/js/common/currentTheme.js b/resources/js/common/currentTheme.js new file mode 100644 index 000000000..fc181f39f --- /dev/null +++ b/resources/js/common/currentTheme.js @@ -0,0 +1 @@ +export default document.querySelector('html').dataset.bsTheme; From e5f76c967a0bae40f25f4743ead1ec1b0931c2c1 Mon Sep 17 00:00:00 2001 From: Aintdead86 <96647913+antonDedyaev@users.noreply.github.com> Date: Wed, 18 Jan 2023 16:18:17 +0300 Subject: [PATCH 3/7] remove nav-tabs-link variable that overrides bootstrap theme styling --- resources/sass/_variables.scss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss index 0e9a53ca0..1d202f760 100644 --- a/resources/sass/_variables.scss +++ b/resources/sass/_variables.scss @@ -1,5 +1,2 @@ -// Body -$nav-tabs-link-active-bg: #fff; - // Typography -$font-family-sans-serif: 'Onest', sans-serif; \ No newline at end of file +$font-family-sans-serif: 'Onest', sans-serif; From 40b99652c77c136ee87978e748387f947bd1e19a Mon Sep 17 00:00:00 2001 From: Aintdead86 <96647913+antonDedyaev@users.noreply.github.com> Date: Wed, 18 Jan 2023 16:19:50 +0300 Subject: [PATCH 4/7] change semantics of background-color class for ul --- resources/views/exercise/navigation.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/exercise/navigation.blade.php b/resources/views/exercise/navigation.blade.php index 236db450e..c083dc63a 100644 --- a/resources/views/exercise/navigation.blade.php +++ b/resources/views/exercise/navigation.blade.php @@ -1,4 +1,4 @@ -