Skip to content

Commit

Permalink
chore(deps-dev): update develop branch
Browse files Browse the repository at this point in the history
  • Loading branch information
nimdanitro committed Oct 8, 2024
2 parents 205eefc + 3975092 commit 14c9a49
Show file tree
Hide file tree
Showing 5 changed files with 242 additions and 70 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
## [unreleased]

### 🐛 Bug Fixes

- *(ui)* Improve mono-font-family ([#459](https://github.com/f-eld-ch/sitrep/issues/459)) - ([8335b34](https://github.com/f-eld-ch/sitrep/commit/8335b34dc1be3cc1690d4d82098f17d04de9a632))

### ⚙️ Other

- *(deps)* Bump i18next from 23.15.1 to 23.15.2 in /ui ([#457](https://github.com/f-eld-ch/sitrep/issues/457)) - ([1a46b1b](https://github.com/f-eld-ch/sitrep/commit/1a46b1bbd9a0a74625968b8e4abb442091ad3cf0))
- *(deps)* Bump ytanikin/PRConventionalCommits from 1.1.0 to 1.3.0 ([#450](https://github.com/f-eld-ch/sitrep/issues/450)) - ([c8ed466](https://github.com/f-eld-ch/sitrep/commit/c8ed466fea65fda46f15826a8aae3332b6f0bb8a))
- Add proper permisisons to PR Validation - ([afcb730](https://github.com/f-eld-ch/sitrep/commit/afcb730e6bafebc3a74b29008a87cbf91b3d0ecc))
- Use forked ConventionalCommits validation workflow ([#453](https://github.com/f-eld-ch/sitrep/issues/453)) - ([0c28812](https://github.com/f-eld-ch/sitrep/commit/0c28812b18868a4e3d8636b84aba88c6acdb107e))
Expand Down
16 changes: 8 additions & 8 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dayjs": "^1.11.13",
"graphql": "^16.9.0",
"hat": "^0.0.3",
"i18next": "^23.15.1",
"i18next": "^23.15.2",
"i18next-browser-languagedetector": "^8.0.0",
"lodash": "^4.17.21",
"mapbox-gl-style-switcher": "^1.0.11",
Expand Down Expand Up @@ -61,9 +61,9 @@
]
},
"devDependencies": {
"@eslint/compat": "^1.1.1",
"@eslint/compat": "^1.2.0",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.11.1",
"@eslint/js": "^9.12.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^16.0.1",
Expand All @@ -74,20 +74,20 @@
"@types/jest": "^29.5.13",
"@types/lodash": "^4.17.10",
"@types/mapbox__mapbox-gl-draw": "~1.4.6",
"@types/node": "^20.16.10",
"@types/node": "^20.16.11",
"@types/react": "^18.3.11",
"@types/react-color": "^3.0.12",
"@types/react-dom": "^18.3.0",
"@types/react-router-dom": "^5.3.3",
"@types/semver": "^7.5.8",
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^8.8.0",
"@typescript-eslint/parser": "^8.8.0",
"@typescript-eslint/typescript-estree": "^8.8.0",
"@typescript-eslint/eslint-plugin": "^8.8.1",
"@typescript-eslint/parser": "^8.8.1",
"@typescript-eslint/typescript-estree": "^8.8.1",
"@vite-pwa/assets-generator": "^0.2.6",
"@vitejs/plugin-react-swc": "^3.7.1",
"@vitest/coverage-v8": "^2.1.2",
"eslint": "^9.11.1",
"eslint": "^9.12.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.1",
Expand Down
32 changes: 22 additions & 10 deletions ui/src/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ $grey-lighter: hsl(221, 14%, 86%);
$grey-lightest: hsl(221, 14%, 93%);

// Override global Sass variables from the /utilities folder
@use "bulma/sass/utilities" with ($family-primary: '"B612",sans-serif',
$family-monospace: '"B612 Mono", monospace',
@use "bulma/sass/utilities" with (
$family-primary: "B612",
$family-monospace: "B612 Mono",
$primary: $orange,
$warning: $yellow,
$danger: $red,
Expand All @@ -31,7 +32,8 @@ $grey-lightest: hsl(221, 14%, 93%);
$grey: $grey,
$grey-light: $grey-light,
$grey-lighter: $grey-lighter,
$grey-lightest: $grey-lightest);
$grey-lightest: $grey-lightest
);

// Import the components we need
@forward "bulma/sass/base";
Expand All @@ -41,12 +43,20 @@ $grey-lightest: hsl(221, 14%, 93%);
@forward "bulma/sass/components/breadcrumb";
@forward "bulma/sass/components/card";
@forward "bulma/sass/components/dropdown";
@use "bulma/sass/components/message" with ($message-body-padding: 1em 1.5em 0em 1em);
@use "bulma/sass/components/modal" with ($modal-content-width: 80rem);
@use "bulma/sass/components/navbar" with ($navbar-height: $navbar-height);
@use "bulma/sass/components/message" with (
$message-body-padding: 1em 1.5em 0em 1em
);
@use "bulma/sass/components/modal" with (
$modal-content-width: 80rem
);
@use "bulma/sass/components/navbar" with (
$navbar-height: $navbar-height
);
@forward "bulma/sass/components/tabs";

@use "bulma/sass/form" with ($input-shadow: none);
@use "bulma/sass/form" with (
$input-shadow: none
);

// Import the bulma elements we need
@forward "bulma/sass/elements/box";
Expand All @@ -60,7 +70,9 @@ $grey-lightest: hsl(221, 14%, 93%);
@forward "bulma/sass/elements/tag";
@forward "bulma/sass/elements/title";

@use "bulma/sass/layout/footer" with ($footer-padding: 2rem 1.5rem 2rem);
@use "bulma/sass/layout/footer" with (
$footer-padding: 2rem 1.5rem 2rem
);
@forward "bulma/sass/layout/hero";
@forward "bulma/sass/layout/section";
@forward "bulma/sass/layout/level";
Expand Down Expand Up @@ -112,7 +124,8 @@ section {
}

.tbody {
tr {}
tr {
}
}
}

Expand All @@ -130,7 +143,6 @@ section {
border-color: $red;
}


@media screen {
.is-print {
display: none !important;
Expand Down
1 change: 1 addition & 0 deletions ui/src/views/map/Map.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ function MapView() {
mapStyle={mapStyle.uri}
scrollZoom={true}
reuseMaps={false}
RTLTextPlugin={undefined}
>
<AttributionControl position="bottom-left" compact={true} />
{/* All Map Controls */}
Expand Down
Loading

0 comments on commit 14c9a49

Please sign in to comment.