Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix styles #335

Merged
merged 2 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file removed .nojekyll
Empty file.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Recommended to use and install as PWA (Progressive Web App):

For start local development install dependencies
```
npm i
npm ci
```

then run generate dictionary
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "interslavic",
"version": "1.23.1",
"version": "1.23.2",
"description": "Interslavic Dictionary",
"license": "MIT",
"author": {
Expand Down
59 changes: 23 additions & 36 deletions src/colors.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,24 @@
body {
--gray-1: #111;
--gray-2: #222;
--gray-3: #333;
--gray-4: #444;
--gray-5: #555;
--gray-6: #666;
--gray-7: #777;
--gray-8: #888;
--gray-9: #999;
--gray-a: #aaa;
--gray-b: #bbb;
--gray-c: #ccc;
--gray-d: #ddd;
--gray-e: #eee;
}

.color-theme--light {
--primary-color: #1E88E5;
--primary-color-fg: #fff;
--muted-text-color: #6c757d;
--muted-text-color: #9E9E9E;
--light-gray-color: #999;
--valid-color: #43A047;
--invalid-color: #E53935;
Expand All @@ -14,33 +31,18 @@
--table-border-color: var(--gray-9);
--overlay-color: #000;
--tips-font-color: #122f80;
--tips-background-color: #e4f1fc;
--main-background-color: #FAFAFA;
--status-badge-color: #fff;

--dark: #212121;
--light: #fff;
--transperent: rgba(1, 1, 1, 0);

--gray-1: #111;
--gray-2: #222;
--gray-3: #333;
--gray-4: #444;
--gray-5: #555;
--gray-6: #666;
--gray-7: #777;
--gray-8: #888;
--gray-9: #999;
--gray-a: #aaa;
--gray-b: #bbb;
--gray-c: #ccc;
--gray-d: #ddd;
--gray-e: #eee;
}

.color-theme--dark {
--primary-color: #1E88E5;
--primary-color: #42A5F5;
--primary-color-fg: #fff;
--muted-text-color: #6c757d;
--muted-text-color: #BDBDBD;
--light-gray-color: #999;
--valid-color: #43A047;
--invalid-color: #E53935;
Expand All @@ -49,29 +51,14 @@
--input-border-color: #444;
--shadow: 0 8px 16px rgba(0, 0, 0, .05);
--border: 1px solid var(--input-border-color);
--table-highlighted-cell: #0288D1;
--table-highlighted-cell: #1976D2;
--table-border-color: var(--gray-9);
--overlay-color: #000;
--tips-font-color: #122f80;
--tips-background-color: #e4f1fc;
--main-background-color: #262626;
--status-badge-color: #fff;

--dark: #fff;
--light: #212121;
--transperent: rgba(1, 1, 1, 0);

--gray-1: #111;
--gray-2: #222;
--gray-3: #333;
--gray-4: #444;
--gray-5: #555;
--gray-6: #666;
--gray-7: #777;
--gray-8: #888;
--gray-9: #999;
--gray-a: #aaa;
--gray-b: #bbb;
--gray-c: #ccc;
--gray-d: #ddd;
--gray-e: #eee;
}
4 changes: 4 additions & 0 deletions src/components/Controls/Controls.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
margin-right: var(--gap-size);
}

.pos-selector {
padding-bottom: 2px;
}

.search-type-selector,
.pos-selector,
.flavorisation-selector {
Expand Down
6 changes: 2 additions & 4 deletions src/components/Pages/CommunityPage/CommunityPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,8 @@ export const CommunityPage = () => {
setFbAvailable(true);
}
});
} catch (err) {
// eslint-disable-next-line no-console
console.error(err)
}
// eslint-disable-next-line @typescript-eslint/no-unused-vars
} catch (err) {}
}, [setFbAvailable]);

useEffect(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/ResultsCard/ResultsCard.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
top: 5px;
right: 5px;
background: var(--invalid-color);
color: var(--light);
color: var(--status-badge-color);
font-weight: 700;
font-size: var(--text-xs);
line-height: var(--text-xs-line);
Expand Down
6 changes: 2 additions & 4 deletions src/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,8 @@ function getInitialState(): IMainState {
page: getPageFromPath(),
...savedState,
};
} catch (err) {
// eslint-disable-next-line no-console
console.error(err)
}
// eslint-disable-next-line @typescript-eslint/no-unused-vars
} catch (err) {}

setLang(state.interfaceLang);
Dictionary.setIsvSearchLetters(state.isvSearchLetters);
Expand Down
3 changes: 2 additions & 1 deletion src/sw.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ const cacheUrls = [
'data/basic.json',
'data/translateStatistic.json',
...addLangs.map((lang) => `data/${lang}.json`),
'manifest.json',
'grammarComponent.js',
'communityComponent.js',
'index.js',
'sw.js',
'styles/grammarComponent.css',
'styles/communityComponent.css',
'styles/index.css',
];

Expand Down
2 changes: 1 addition & 1 deletion webpack.config.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ module.exports = {
template: path.join(srcPath, 'index.html.ejs'),
filename: 'index.html',
path: outputPath,
excludeChunks: ['sw', 'grammarComponent', 'viewerComponent'],
excludeChunks: ['sw', 'grammarComponent', 'viewerComponent', 'communityComponent'],
env: {
BASE_URL: baseUrl,
},
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ module.exports = {
template: path.join(srcPath, 'index.html.ejs'),
filename: 'index.html',
path: outputPath,
excludeChunks: ['sw', 'grammarComponent', 'viewerComponent'],
excludeChunks: ['sw', 'grammarComponent', 'viewerComponent', 'communityComponent'],
env: {
BASE_URL: baseUrl,
},
Expand Down
Loading