Skip to content

Commit 143d833

Browse files
authored
Merge pull request #212 from gtt-project/update-dependencies
Update dependencies
2 parents 52b8f98 + d5f2501 commit 143d833

File tree

5 files changed

+448
-411
lines changed

5 files changed

+448
-411
lines changed

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@
2121
"homepage": "https://github.com/gtt-project/redmine_gtt#readme",
2222
"dependencies": {
2323
"@juggle/resize-observer": "^3.4.0",
24-
"@material-design-icons/font": "^0.12.1",
24+
"@material-design-icons/font": "^0.14.2",
2525
"geojson": "^0.5.0",
26-
"ol": "^6.15.1",
27-
"ol-ext": "^3.2.30"
26+
"ol": "^7.2.2",
27+
"ol-ext": "4.0.4"
2828
},
2929
"devDependencies": {
3030
"@types/geojson": "^7946.0.10",
31-
"@types/jquery": "^3.5.14",
31+
"@types/jquery": "^3.5.16",
3232
"@types/jqueryui": "^1.12.16",
3333
"@types/ol-ext": "npm:@siedlerchr/types-ol-ext",
34-
"css-loader": "^6.7.1",
35-
"sass": "^1.54.9",
36-
"sass-loader": "^13.0.2",
34+
"css-loader": "^6.7.3",
35+
"sass": "^1.58.0",
36+
"sass-loader": "^13.2.0",
3737
"style-loader": "^3.3.1",
38-
"ts-loader": "^9.3.1",
39-
"typescript": "^4.8.3",
40-
"webpack": "^5.74.0",
41-
"webpack-cli": "^4.10.0"
38+
"ts-loader": "^9.4.2",
39+
"typescript": "^4.9.5",
40+
"webpack": "^5.75.0",
41+
"webpack-cli": "^5.0.1"
4242
}
4343
}

src/components/gtt-client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@ export class GttClient {
12811281
reloadFontSymbol() {
12821282
if ('fonts' in document) {
12831283
const symbolFonts: Array<String> = []
1284-
for (const font in FontSymbol.prototype.defs.fonts) {
1284+
for (const font in FontSymbol.defs.fonts) {
12851285
symbolFonts.push(font)
12861286
}
12871287
if (symbolFonts.length > 0) {

src/components/gtt-setting.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ export const gtt_setting = ():void => {
3333
}
3434
});
3535

36-
const glyph = FontSymbol.prototype.defs.glyphs
36+
const glyph = FontSymbol.defs.glyphs
3737
document.querySelectorAll("[id^='settings_tracker_']").forEach((element: HTMLSelectElement) => {
3838
const selectedValue = element.value
3939
if (element.length === 1 && selectedValue !== "") {
4040
element.remove(0)
4141
// element.append(new Option("", "", false, false))
4242
}
43-
for (let font in FontSymbol.prototype.defs.fonts) {
43+
for (let font in FontSymbol.defs.fonts) {
4444
const optgroup = document.createElement('optgroup')
45-
optgroup.label = FontSymbol.prototype.defs.fonts[font].name
45+
optgroup.label = FontSymbol.defs.fonts[font].name
4646
for (let i in glyph) {
4747
if (glyph[i].font == font) {
4848
const selected = selectedValue === i

src/stylesheets/app.scss

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
/**
22
* Application Styles
33
*/
4+
:root,
5+
:host {
6+
--ol-background-color: white;
7+
--ol-accent-background-color: #F5F5F5;
8+
--ol-subtle-background-color: rgba(128, 128, 128, 0.25);
9+
--ol-partial-background-color: rgba(255, 255, 255, 0.75);
10+
--ol-foreground-color: #F5F5F5;
11+
--ol-subtle-foreground-color: #FFFFFF;
12+
--ol-brand-color: #34495e;
13+
}
14+
15+
.ol-control button:hover {
16+
background-color: #3f5872;
17+
}
18+
19+
.ol-control.ol-bar .ol-toggle.ol-active button:hover, .ol-control.ol-bar .ol-toggle.ol-active>button {
20+
background-color: #f1515c;
21+
color: #fff;
22+
}
23+
424
.ol-map {
525
width: 100%;
626
height: 400px;

0 commit comments

Comments
 (0)