diff --git a/build.gradle b/build.gradle index aa49ef2..17e905e 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'war' apply plugin: 'application' group = 'de.jottyfan.camporganizer' -version = '0.1.2' +version = '0.1.3' sourceCompatibility = 17 mainClassName = "de.jottyfan.camporganizer.Main" diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index 959ce5e..0feb186 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -1,15 +1,14 @@ -/* cabin-sketch-regular - latin */ @font-face { font-family: 'Cabin Sketch'; font-style: normal; - font-weight: 400; - src: url('../fonts/cabin-sketch-v19-latin-regular.eot'); /* IE9 Compat Modes */ - src: local(''), - url('../fonts/cabin-sketch-eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../fonts/cabin-sketch-v19-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ - url('../fonts/cabin-sketch-v19-latin-regular.woff') format('woff'), /* Modern Browsers */ - url('../fonts/cabin-sketch-v19-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ - url('../fonts/cabin-sketch-v19-latin-regular.svg#CabinSketch') format('svg'); /* Legacy iOS */ + font-weight: 700; + font-display: swap; + src: url('../fonts/Cabin-Sketch-700.eot'); /* IE9 */ + src: url('../fonts/Cabin-Sketch-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/Cabin-Sketch-700.woff2') format('woff2'), /* Modern Browsers */ + url('../fonts/Cabin-Sketch-700.woff') format('woff'), /* Modern Browsers */ + url('../fonts/Cabin-Sketch-700.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/Cabin-Sketch-700.svg#CabinSketch') format('svg'); /* Legacy iOS */ } /* fira-sans-regular - latin */ diff --git a/src/main/resources/static/fonts/Cabin-Sketch-700.eot b/src/main/resources/static/fonts/Cabin-Sketch-700.eot new file mode 100644 index 0000000..7c33635 Binary files /dev/null and b/src/main/resources/static/fonts/Cabin-Sketch-700.eot differ diff --git a/src/main/resources/static/fonts/Cabin-Sketch-700.svg b/src/main/resources/static/fonts/Cabin-Sketch-700.svg new file mode 100644 index 0000000..465a9be --- /dev/null +++ b/src/main/resources/static/fonts/Cabin-Sketch-700.svg @@ -0,0 +1,4329 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/static/fonts/Cabin-Sketch-700.ttf b/src/main/resources/static/fonts/Cabin-Sketch-700.ttf new file mode 100644 index 0000000..e3aa32a Binary files /dev/null and b/src/main/resources/static/fonts/Cabin-Sketch-700.ttf differ diff --git a/src/main/resources/static/fonts/Cabin-Sketch-700.woff b/src/main/resources/static/fonts/Cabin-Sketch-700.woff new file mode 100644 index 0000000..db7af4b Binary files /dev/null and b/src/main/resources/static/fonts/Cabin-Sketch-700.woff differ diff --git a/src/main/resources/static/fonts/Cabin-Sketch-700.woff2 b/src/main/resources/static/fonts/Cabin-Sketch-700.woff2 new file mode 100644 index 0000000..f85ad90 Binary files /dev/null and b/src/main/resources/static/fonts/Cabin-Sketch-700.woff2 differ diff --git a/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.eot b/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.eot deleted file mode 100644 index 0897733..0000000 Binary files a/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.eot and /dev/null differ diff --git a/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.svg b/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.svg deleted file mode 100644 index a0ba3be..0000000 --- a/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.svg +++ /dev/null @@ -1,2394 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.ttf b/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.ttf deleted file mode 100644 index 3b1943d..0000000 Binary files a/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.ttf and /dev/null differ diff --git a/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.woff b/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.woff deleted file mode 100644 index fecd3af..0000000 Binary files a/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.woff and /dev/null differ diff --git a/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.woff2 b/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.woff2 deleted file mode 100644 index 5b052bb..0000000 Binary files a/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.woff2 and /dev/null differ diff --git a/src/main/resources/static/fonts/readme.txt b/src/main/resources/static/fonts/readme.txt new file mode 100644 index 0000000..a0d7331 --- /dev/null +++ b/src/main/resources/static/fonts/readme.txt @@ -0,0 +1 @@ +got files from https://www.axllent.org/code/google-font-downloader/ \ No newline at end of file