From 062e6e5f904520cff576ed708fa87ed699784966 Mon Sep 17 00:00:00 2001 From: SimonGschnell Date: Wed, 29 Jan 2025 14:04:36 +0100 Subject: [PATCH] update(Sprachen.js): updates the usage of the classes fhc-entry in the Sprachen.js component --- application/views/CisRouterView/CisRouterView.php | 1 + public/css/Cis4/Cis.css | 5 +++++ public/css/components/Sprachen.css | 11 +++++++++++ public/js/components/Cis/Sprachen.js | 2 +- public/js/components/searchbar/student.js | 6 +++--- public/js/composables/CalendarDate.js | 2 +- 6 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 public/css/components/Sprachen.css diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php index 137f6cc65..a7b3d6f80 100644 --- a/application/views/CisRouterView/CisRouterView.php +++ b/application/views/CisRouterView/CisRouterView.php @@ -14,6 +14,7 @@ $includesArray = array( 'public/css/Fhc.css', 'public/css/components/dashboard.css', 'public/css/components/calendar.css', + 'public/css/components/Sprachen.css', 'public/css/components/MyLv.css', 'public/css/components/FilterComponent.css', 'public/css/components/Profil.css', diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css index 0da74a503..155dd9174 100644 --- a/public/css/Cis4/Cis.css +++ b/public/css/Cis4/Cis.css @@ -1,5 +1,7 @@ /* basic */ @import '../components/searchbar/searchbar.css'; +@import '../components/Sprachen.css'; + html { font-size: 0.875em; } @@ -7,6 +9,7 @@ html { /* variables */ :root { --fhc-cis-primary: #00649c; + --fhc-cis-primary-hover: #005585; --fhc-cis-header-px: 1rem; --fhc-cis-header-py: .5rem; --fhc-cis-main-px: 1.5rem; @@ -50,6 +53,8 @@ html { } } + + /* buttons */ #cis-header .btn-level-1, #cis-header .btn-level-1 + .btn, diff --git a/public/css/components/Sprachen.css b/public/css/components/Sprachen.css new file mode 100644 index 000000000..99c47f315 --- /dev/null +++ b/public/css/components/Sprachen.css @@ -0,0 +1,11 @@ +.sprachen-entry{ + background-color: var(--fhc-cis-primary); +} + +[selected="true"].sprachen-entry { + background-color: var(--fhc-cis-primary-hover); +} + +.sprachen-entry.btn { + border-radius: 0 !important; +} diff --git a/public/js/components/Cis/Sprachen.js b/public/js/components/Cis/Sprachen.js index b64abb544..397efae82 100644 --- a/public/js/components/Cis/Sprachen.js +++ b/public/js/components/Cis/Sprachen.js @@ -21,7 +21,7 @@ export default { template:/*html*/`
- +
`, diff --git a/public/js/components/searchbar/student.js b/public/js/components/searchbar/student.js index 4bc801fa7..a9d52da90 100644 --- a/public/js/components/searchbar/student.js +++ b/public/js/components/searchbar/student.js @@ -38,7 +38,7 @@ export default {
-
Studiengang
+
{{$p.t('lehre','studiengang')}}
{{ res.studiengang }}
@@ -52,14 +52,14 @@ export default {
-
Matrikelnummer
+
{{$p.t('person','personenkennzeichen')}}
{{ res.matrikelnr }}
-
EMail
+
{{$p.t('person','email')}}