diff --git a/app/account/index.php b/app/account/index.php index 4e36dc6..ddbecff 100644 --- a/app/account/index.php +++ b/app/account/index.php @@ -55,6 +55,6 @@ - + \ No newline at end of file diff --git a/app/account/style.css b/app/account/style.css index d9f3cbf..3ccef01 100644 --- a/app/account/style.css +++ b/app/account/style.css @@ -1,7 +1,33 @@ -/* Import the font "Dosis" that's used */ +/* Import the fonts "Dosis" and "Ubuntu" that's used */ + +@font-face { + font-family: 'Dosis'; + font-style: normal; + font-weight: 800; + src: url('../../src/fonts/dosis-v27-latin-800.eot'); + /* IE9 Compat Modes */ + src: local(''), url('../../src/fonts/dosis-v27-latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../../src/fonts/dosis-v27-latin-800.woff2') format('woff2'), /* Super Modern Browsers */ + url('../../src/fonts/dosis-v27-latin-800.woff') format('woff'), /* Modern Browsers */ + url('../../src/fonts/dosis-v27-latin-800.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../../src/fonts/dosis-v27-latin-800.svg#Dosis') format('svg'); + /* Legacy iOS */ +} + +@font-face { + font-family: 'Ubuntu'; + font-style: normal; + font-weight: 500; + src: url('../../src/fonts/ubuntu-v20-latin-500.eot'); + /* IE9 Compat Modes */ + src: local(''), url('../../src/fonts/ubuntu-v20-latin-500.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../../src/fonts/ubuntu-v20-latin-500.woff2') format('woff2'), /* Super Modern Browsers */ + url('../../src/fonts/ubuntu-v20-latin-500.woff') format('woff'), /* Modern Browsers */ + url('../../src/fonts/ubuntu-v20-latin-500.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../../src/fonts/ubuntu-v20-latin-500.svg#Ubuntu') format('svg'); + /* Legacy iOS */ +} -@import url('https://fonts.googleapis.com/css2?family=Dosis:wght@800&display=swap'); -@import url('https://fonts.googleapis.com/css2?family=Ubuntu:wght@500&display=swap'); /* Theme switch */ diff --git a/app/app.css b/app/app.css index 2985ab3..8ab54dc 100644 --- a/app/app.css +++ b/app/app.css @@ -1,6 +1,19 @@ /* Import the font "Dosis" that's used */ -@import url('https://fonts.googleapis.com/css2?family=Dosis:wght@800&display=swap'); +@font-face { + font-family: 'Dosis'; + font-style: normal; + font-weight: 800; + src: url('../src/fonts/dosis-v27-latin-800.eot'); + /* IE9 Compat Modes */ + src: local(''), url('../src/fonts/dosis-v27-latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../src/fonts/dosis-v27-latin-800.woff2') format('woff2'), /* Super Modern Browsers */ + url('../src/fonts/dosis-v27-latin-800.woff') format('woff'), /* Modern Browsers */ + url('../src/fonts/dosis-v27-latin-800.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../src/fonts/dosis-v27-latin-800.svg#Dosis') format('svg'); + /* Legacy iOS */ +} + /* Theme switch */ diff --git a/app/app.php b/app/app.php index fd9455e..bb9d58f 100644 --- a/app/app.php +++ b/app/app.php @@ -28,7 +28,8 @@ - + + @@ -42,7 +43,7 @@
- + diff --git a/app/fach/app.css b/app/fach/app.css index c4a5016..98b55e8 100644 --- a/app/fach/app.css +++ b/app/fach/app.css @@ -1,6 +1,19 @@ /* Import the font "Dosis" that's used */ -@import url('https://fonts.googleapis.com/css2?family=Dosis:wght@800&display=swap'); +@font-face { + font-family: 'Dosis'; + font-style: normal; + font-weight: 800; + src: url('../../src/fonts/dosis-v27-latin-800.eot'); + /* IE9 Compat Modes */ + src: local(''), url('../../src/fonts/dosis-v27-latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../../src/fonts/dosis-v27-latin-800.woff2') format('woff2'), /* Super Modern Browsers */ + url('../../src/fonts/dosis-v27-latin-800.woff') format('woff'), /* Modern Browsers */ + url('../../src/fonts/dosis-v27-latin-800.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../../src/fonts/dosis-v27-latin-800.svg#Dosis') format('svg'); + /* Legacy iOS */ +} + /* Theme switch */ diff --git a/app/fach/index.php b/app/fach/index.php index 4c6327e..43abf1b 100644 --- a/app/fach/index.php +++ b/app/fach/index.php @@ -79,7 +79,8 @@ - + + @@ -153,6 +154,7 @@ // Get number of types AND Get averages $num_type_t = 0; $num_t_grades_sum = 0; + $grade_t = 0; foreach ($grades as $grade_entry) { $grade_type_calc = $grade_entry["type"]; $grade = $grade_entry["grade"]; @@ -161,7 +163,7 @@ $num_t_grades_sum += $grade; } } - $grade_t = $num_t_grades_sum / $num_type_t; + if(!($num_t_grades_sum == 0 || $num_type_t)) $grade_t = $num_t_grades_sum / $num_type_t; $num_type_K = 0; $num_type_M = 0; $num_type_S = 0; @@ -218,7 +220,7 @@ - + \ No newline at end of file diff --git a/app/fach_bearbeiten/app.css b/app/fach_bearbeiten/app.css index 632f52e..741901a 100644 --- a/app/fach_bearbeiten/app.css +++ b/app/fach_bearbeiten/app.css @@ -1,6 +1,19 @@ /* Import the font "Dosis" that's used */ -@import url('https://fonts.googleapis.com/css2?family=Dosis:wght@800&display=swap'); +@font-face { + font-family: 'Dosis'; + font-style: normal; + font-weight: 800; + src: url('../../src/fonts/dosis-v27-latin-800.eot'); + /* IE9 Compat Modes */ + src: local(''), url('../../src/fonts/dosis-v27-latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../../src/fonts/dosis-v27-latin-800.woff2') format('woff2'), /* Super Modern Browsers */ + url('../../src/fonts/dosis-v27-latin-800.woff') format('woff'), /* Modern Browsers */ + url('../../src/fonts/dosis-v27-latin-800.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../../src/fonts/dosis-v27-latin-800.svg#Dosis') format('svg'); + /* Legacy iOS */ +} + /* Theme switch */ diff --git a/app/fach_bearbeiten/index.php b/app/fach_bearbeiten/index.php index 994e2b3..00115b4 100644 --- a/app/fach_bearbeiten/index.php +++ b/app/fach_bearbeiten/index.php @@ -57,7 +57,8 @@ - + + @@ -101,7 +102,7 @@ - + diff --git a/app/fach_erstellen/app.css b/app/fach_erstellen/app.css index f3f40c8..3c47b42 100644 --- a/app/fach_erstellen/app.css +++ b/app/fach_erstellen/app.css @@ -1,6 +1,19 @@ /* Import the font "Dosis" that's used */ -@import url('https://fonts.googleapis.com/css2?family=Dosis:wght@800&display=swap'); +@font-face { + font-family: 'Dosis'; + font-style: normal; + font-weight: 800; + src: url('../../src/fonts/dosis-v27-latin-800.eot'); + /* IE9 Compat Modes */ + src: local(''), url('../../src/fonts/dosis-v27-latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../../src/fonts/dosis-v27-latin-800.woff2') format('woff2'), /* Super Modern Browsers */ + url('../../src/fonts/dosis-v27-latin-800.woff') format('woff'), /* Modern Browsers */ + url('../../src/fonts/dosis-v27-latin-800.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../../src/fonts/dosis-v27-latin-800.svg#Dosis') format('svg'); + /* Legacy iOS */ +} + /* Theme switch */ diff --git a/app/fach_erstellen/index.php b/app/fach_erstellen/index.php index 9b1fcd6..583e262 100644 --- a/app/fach_erstellen/index.php +++ b/app/fach_erstellen/index.php @@ -27,7 +27,8 @@ - + + @@ -67,7 +68,7 @@ - + diff --git a/app/note_bearbeiten/app.css b/app/note_bearbeiten/app.css index 906b25f..b03e861 100644 --- a/app/note_bearbeiten/app.css +++ b/app/note_bearbeiten/app.css @@ -1,6 +1,19 @@ /* Import the font "Dosis" that's used */ -@import url('https://fonts.googleapis.com/css2?family=Dosis:wght@800&display=swap'); +@font-face { + font-family: 'Dosis'; + font-style: normal; + font-weight: 800; + src: url('../../src/fonts/dosis-v27-latin-800.eot'); + /* IE9 Compat Modes */ + src: local(''), url('../../src/fonts/dosis-v27-latin-800.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('../../src/fonts/dosis-v27-latin-800.woff2') format('woff2'), /* Super Modern Browsers */ + url('../../src/fonts/dosis-v27-latin-800.woff') format('woff'), /* Modern Browsers */ + url('../../src/fonts/dosis-v27-latin-800.ttf') format('truetype'), /* Safari, Android, iOS */ + url('../../src/fonts/dosis-v27-latin-800.svg#Dosis') format('svg'); + /* Legacy iOS */ +} + /* Theme switch */ diff --git a/app/note_bearbeiten/index.php b/app/note_bearbeiten/index.php index 498fb16..65e360b 100644 --- a/app/note_bearbeiten/index.php +++ b/app/note_bearbeiten/index.php @@ -57,12 +57,13 @@ - + + - +