diff --git a/build.gradle b/build.gradle index 0e72a36..aa49ef2 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'war' apply plugin: 'application' group = 'de.jottyfan.camporganizer' -version = '0.1.1' +version = '0.1.2' 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 f9af22f..959ce5e 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -1,23 +1,82 @@ +/* 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 */ +} + +/* fira-sans-regular - latin */ +@font-face { + font-family: 'Fira Sans'; + font-style: normal; + font-weight: 400; + src: url('../fonts/fira-sans-v16-latin-regular.eot'); /* IE9 Compat Modes */ + src: local(''), + url('../fonts/fira-sans-v16-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../fonts/fira-sans-v16-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('../fonts/fira-sans-v16-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('../fonts/fira-sans-v16-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../fonts/fira-sans-v16-latin-regular.svg#FiraSans') format('svg'); /* Legacy iOS */ +} + html { width: 100vw; height: 100vh; } body { - background-image: linear-gradient(to bottom right, rgb(255, 190, 111), - rgb(198, 70, 0)); + background-image: linear-gradient(to bottom right, rgb(255, 255, 255), + rgb(154, 153, 150)); +} + +a { + font-family: 'Fira Sans'; +} + +span { + font-family: 'Fira Sans'; +} + +div { + font-family: 'Fira Sans'; +} + +.headlinefont { + font-family: 'Cabin Sketch' !important; + font-size: xx-large; +} + +.hugefont { + font-family: 'Cabin Sketch' !important; + font-size: 32px; +} + +.menufont { + font-family: 'Cabin Sketch' !important; +} + +.buttonfont { + font-family: 'Cabin Sketch' !important; } .versionclip { transform: rotate(270deg); margin-top: 20px; position: fixed; - top: 8px; + top: 4px; right: -32px; font-size: smaller; padding: 8px; background-image: linear-gradient(to bottom, rgb(154, 153, 150), #fff); border-radius: 6px; + font-family: 'Fira Sans'; } .versionlink { @@ -88,6 +147,7 @@ body { background: transparent; border: 2px solid transparent; padding: 8px; + font-family: 'Cabin Sketch'; } .linkbtn:hover { @@ -228,4 +288,4 @@ body { .mytoggle_btn:hover { background-color: #abcdef; -} \ No newline at end of file +} 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 new file mode 100644 index 0000000..0897733 Binary files /dev/null and b/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.eot 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 new file mode 100644 index 0000000..a0ba3be --- /dev/null +++ b/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.svg @@ -0,0 +1,2394 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000..3b1943d Binary files /dev/null and b/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.ttf 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 new file mode 100644 index 0000000..fecd3af Binary files /dev/null and b/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.woff 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 new file mode 100644 index 0000000..5b052bb Binary files /dev/null and b/src/main/resources/static/fonts/cabin-sketch-v19-latin-regular.woff2 differ diff --git a/src/main/resources/static/fonts/fira-sans-v16-latin-regular.eot b/src/main/resources/static/fonts/fira-sans-v16-latin-regular.eot new file mode 100644 index 0000000..cd95053 Binary files /dev/null and b/src/main/resources/static/fonts/fira-sans-v16-latin-regular.eot differ diff --git a/src/main/resources/static/fonts/fira-sans-v16-latin-regular.svg b/src/main/resources/static/fonts/fira-sans-v16-latin-regular.svg new file mode 100644 index 0000000..1e52097 --- /dev/null +++ b/src/main/resources/static/fonts/fira-sans-v16-latin-regular.svg @@ -0,0 +1,330 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/static/fonts/fira-sans-v16-latin-regular.ttf b/src/main/resources/static/fonts/fira-sans-v16-latin-regular.ttf new file mode 100644 index 0000000..442497c Binary files /dev/null and b/src/main/resources/static/fonts/fira-sans-v16-latin-regular.ttf differ diff --git a/src/main/resources/static/fonts/fira-sans-v16-latin-regular.woff b/src/main/resources/static/fonts/fira-sans-v16-latin-regular.woff new file mode 100644 index 0000000..758375e Binary files /dev/null and b/src/main/resources/static/fonts/fira-sans-v16-latin-regular.woff differ diff --git a/src/main/resources/static/fonts/fira-sans-v16-latin-regular.woff2 b/src/main/resources/static/fonts/fira-sans-v16-latin-regular.woff2 new file mode 100644 index 0000000..237640c Binary files /dev/null and b/src/main/resources/static/fonts/fira-sans-v16-latin-regular.woff2 differ diff --git a/src/main/resources/templates/dashboard.html b/src/main/resources/templates/dashboard.html index 4c87c6d..a07c476 100644 --- a/src/main/resources/templates/dashboard.html +++ b/src/main/resources/templates/dashboard.html @@ -26,7 +26,7 @@ th:aria-controls="'#acc-body-' + ${b.pk}">  in  in  diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html index 3bc2ce5..72659cc 100644 --- a/src/main/resources/templates/error.html +++ b/src/main/resources/templates/error.html @@ -11,7 +11,7 @@
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index acda33b..7fa5ff3 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -7,9 +7,8 @@
- - Unsere Freizeiten + + Unsere Freizeiten
@@ -18,7 +17,8 @@
-   +  
@@ -49,7 +49,7 @@
- jetzt anmelden + jetzt anmelden
diff --git a/src/main/resources/templates/template.html b/src/main/resources/templates/template.html index eb1c6e8..8069481 100644 --- a/src/main/resources/templates/template.html +++ b/src/main/resources/templates/template.html @@ -20,9 +20,9 @@
-
- [[${currentUser}]] ausloggen - einloggen +
+ [[${currentUser}]] ausloggen + einloggen
Layout header