Merge pull request #31 from RRZE-Webteam/dev

cassandre · web-flow · commit a11af9d5f1ef · 2025-11-17T14:15:48.000+01:00
v1.0.8
diff --git a/assets/css/fau-studium-display.css b/assets/css/fau-studium-display.css
diff --git a/assets/css/fau-studium-display.css.map b/assets/css/fau-studium-display.css.map
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "fau/fau-studium-display",
     "description": "RRZE WordPress Plugin",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "type": "wordpress-plugin",
     "license": "GPL",
     "require": {
diff --git a/config/config.php b/config/config.php
@@ -753,8 +753,8 @@ function get_labels ($lang = 'de', $task = 'labels') {
         ],
         'benefits' => [
             'labels' => [
-                'de' => 'Deine Vorteile an der FAU',
-                'en' => 'Your Benefits at FAU'
+                'de' => 'Vorteile des Studiums an der FAU',
+                'en' => 'Benefits of studying at FAU'
             ]
         ],
         'how_to_apply' => [
@@ -872,8 +872,8 @@ function get_constants($lang = 'de') {
             'en' => plugin()->getUrl() . 'assets/img/student-advice-specific.jpg'
         ],
         'benefits-fau-title' => [
-            'de' => 'Deine Vorteile an der FAU',
-            'en' => 'Your Benefits at FAU'
+            'de' => 'Vorteile des Studiums an der FAU',
+            'en' => 'Benefits of studying at FAU'
         ],
         'benefits-fau-text' => [
             'de' => 'Die FAU bietet Ihnen mit über 275 Studiengängen eine inspirierende Lernumgebung, studentische Gemeinschaft und zahlreiche Möglichkeiten, Ihre Leidenschaft zu entdecken.',
diff --git a/fau-studium-display.php b/fau-studium-display.php
@@ -4,7 +4,7 @@
 Plugin Name: FAU Studium Display
 Plugin URI: https://github.com/RRZE-Webteam/fau-studium-display
 Description: Plugin for displaying the degree program information on websites.
-Version: 1.0.7
+Version: 1.0.8
 Author: RRZE Webteam
 License: GNU General Public License v3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
diff --git a/languages/fau-studium-display.pot b/languages/fau-studium-display.pot
@@ -2,7 +2,7 @@
 # This file is distributed under the GNU General Public License v3.
 msgid ""
 msgstr ""
-"Project-Id-Version: FAU Studium Display 1.0.7\n"
+"Project-Id-Version: FAU Studium Display 1.0.8\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/fau-studium-display\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fau-studium-display",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "main": "build/index.js",
   "scripts": {
     "build": "wp-scripts build",
diff --git a/src/block/block.json b/src/block/block.json
@@ -2,7 +2,7 @@
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 3,
 	"name": "fau-studium/display",
-	"version": "1.0.7",
+	"version": "1.0.8",
 	"title": "FAU-Studium Display",
 	"category": "rrze",
 	"description": "",
diff --git a/src/scss/_layout-full.scss b/src/scss/_layout-full.scss
@@ -34,6 +34,8 @@
             width: 100vw;
             left: 50%;
             margin-left: -50vw;
+            box-sizing: border-box;
+            padding: var(--Spacing-4x, 1rem);
         }
 
         h2, h2:first-child {
@@ -94,27 +96,30 @@
         }
 
         .program-header {
+            box-sizing: border-box;
+            width: 90%;
             max-width: calc(870px + 64px);
-            margin: 0 16px -32px;
-            padding: 16px;
+            margin: 0 auto -32px;
+            padding: var(--Spacing-3x, 0.75rem);
             background-color: #fff;
             color: var(--FAU_Col_FAU-Blau, #04316A);
-            @media screen and (min-width: 768px) {
-                padding: 32px;
+            @media screen and (min-width: 394px) {
+                padding: var(--Spacing-2x, 0.5rem) var(--Spacing-4x, 1rem);
             }
-            @media screen and (min-width: 992px) {
-                margin-left: auto;
-                margin-right: auto;
+            @media screen and (min-width: 768px) {
+                padding: var(--Spacing-4x, 1rem) var(--Spacing-8x, 2rem);
             }
             h1 {
-                @media (max-width: 768px) {
+                font-size: 1.75rem;
+                @media (min-width: 394px) {
                     font-size: 2.5rem;
                 }
             }
             h1, p.program-subtitle {
                 color: var(--FAU_Col_FAU-Blau, #04316A);
                 margin: 0;
                 padding: 0;
+                line-height: 1.5;
             }
         }
 
@@ -143,6 +148,7 @@
         .fact-sheet {
             padding: 40px 16px 16px;
             margin-top: 56px;
+            box-sizing: border-box;
             @media screen and (min-width: 768px) {
                 //padding: 40px 32px 32px;
             }
@@ -199,6 +205,7 @@
             h3 {
                 color: #fff;
                 font-size: var(--H-Heading-2, 2rem);
+                margin-bottom: 0;
             }
 
             .student-advice {
@@ -299,7 +306,6 @@
                 grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
                 margin-top: 0;
                 background-color: var(--FAU_Col_FAU-Blau, #04316A);
-                padding: 0 16px 16px;
                 @media screen and (min-width: 768px) {
                     grid-template-columns: repeat(2, 1fr);
                 }
@@ -417,12 +423,28 @@
             }
         }
         .student-advice-more {
+            .useful-links {
+                padding: 0;
+            }
             .wp-block-fau-elemental-fau-teaser-grid {
                 margin-bottom: 32px;
                 .fau-teaser-grid {
-                    gap: 32px;
+                    grid-template-columns: repeat(1, 1fr);
+                    gap: 16px;
+                    @media (min-width: 768px) {
+                        grid-template-columns: repeat(2, 1fr);
+                        gap: 32px;
+                    }
                 }
             }
         }
     }
+}
+
+.fau-elemental.single-degree-program {
+    main {
+        //@media (max-width: 393px) {
+            --faue_minimal_inline-margin: 0;
+        //}
+    }
 }
diff --git a/src/scss/_layout-grid.scss b/src/scss/_layout-grid.scss
@@ -106,17 +106,19 @@
     }
 
     .fau-theme & {
+        margin: 0 auto;
         ul.degree-program-grid * {
             font-size: var(--font-size-normal, 1rem);
-        }
-        .wp-block-buttons {
-            .wp-block-button__link {
-                margin: 0;
-                background-color: var(----color-zentral-dunkler, #004A9F);
-                color: var(--color-primary-dunkler-kontrast, #fff);
-                &:hover, &:focus, &:active {
-                    background-color: var(--color-button-hover-bg, #041E42);
-                    color: var(--color-button-hover-text, #fff);
+            .wp-block-buttons {
+                .wp-block-button__link {
+                    margin: 0;
+                    background-color: var(----color-zentral-dunkler, #004A9F);
+                    color: var(--color-primary-dunkler-kontrast, #fff);
+
+                    &:hover, &:focus, &:active {
+                        background-color: var(--color-button-hover-bg, #041E42);
+                        color: var(--color-button-hover-text, #fff);
+                    }
                 }
             }
         }
diff --git a/src/scss/_layout-table.scss b/src/scss/_layout-table.scss
@@ -78,4 +78,8 @@
         }
     }
 
+    .fau-theme & {
+        margin: 0 auto;
+    }
+
 }
diff --git a/src/scss/_search-form.scss b/src/scss/_search-form.scss
@@ -379,9 +379,12 @@
                     height: 48px;
                     background-color: var(--FAU-Col-FAU-Blau-25, #C0CBDA);
                 }
-                &.display-settings-table:before {
-                    mask-image: url(../svg/list.svg);
-                    -webkit-mask-image: url(../svg/list.svg);
+                &.display-settings-table {
+                    margin-left: var(--Spacing-2x, .5rem);
+                    &:before {
+                        mask-image: url(../svg/list.svg);
+                        -webkit-mask-image: url(../svg/list.svg);
+                    }
                 }
                 &.display-settings-grid:before {
                     mask-image: url(../svg/grid.svg);
diff --git a/templates/degree-program-full.php b/templates/degree-program-full.php
@@ -680,8 +680,8 @@
 
             // Useful Links
             if (!empty($useful_links)) {
-                echo '<div class="useful-links width-large">'
-                     . '<h3>' . ($labels['useful_links'] ?? 'useful_links') . '</h3>'
+                echo '<h3 class="width-large">' . ($labels['useful_links'] ?? 'useful_links') . '</h3>'
+                     . '<div class="useful-links width-large">'
                      . $useful_links
                      . '</div>';
             }
diff --git a/templates/degree-program-grid.php b/templates/degree-program-grid.php

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "fau/fau-studium-display",`
`3`	`3`	`"description": "RRZE WordPress Plugin",`
`4`		`- "version": "1.0.7",`
	`4`	`+ "version": "1.0.8",`
`5`	`5`	`"type": "wordpress-plugin",`
`6`	`6`	`"license": "GPL",`
`7`	`7`	`"require": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "fau-studium-display",`
`3`		`- "version": "1.0.7",`
	`3`	`+ "version": "1.0.8",`
`4`	`4`	`"main": "build/index.js",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "wp-scripts build",`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@`
`34`	`34`	`width: 100vw;`
`35`	`35`	`left: 50%;`
`36`	`36`	`margin-left: -50vw;`
	`37`	`+ box-sizing: border-box;`
	`38`	`+ padding: var(--Spacing-4x, 1rem);`
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`h2, h2:first-child {`
`@@ -94,27 +96,30 @@`
`94`	`96`	`}`
`95`	`97`
`96`	`98`	`.program-header {`
	`99`	`+ box-sizing: border-box;`
	`100`	`+ width: 90%;`
`97`	`101`	`max-width: calc(870px + 64px);`
`98`		`- margin: 0 16px -32px;`
`99`		`- padding: 16px;`
	`102`	`+ margin: 0 auto -32px;`
	`103`	`+ padding: var(--Spacing-3x, 0.75rem);`
`100`	`104`	`background-color: #fff;`
`101`	`105`	`color: var(--FAU_Col_FAU-Blau, #04316A);`
`102`		`- @media screen and (min-width: 768px) {`
`103`		`- padding: 32px;`
	`106`	`+ @media screen and (min-width: 394px) {`
	`107`	`+ padding: var(--Spacing-2x, 0.5rem) var(--Spacing-4x, 1rem);`
`104`	`108`	`}`
`105`		`- @media screen and (min-width: 992px) {`
`106`		`- margin-left: auto;`
`107`		`- margin-right: auto;`
	`109`	`+ @media screen and (min-width: 768px) {`
	`110`	`+ padding: var(--Spacing-4x, 1rem) var(--Spacing-8x, 2rem);`
`108`	`111`	`}`
`109`	`112`	`h1 {`
`110`		`- @media (max-width: 768px) {`
	`113`	`+ font-size: 1.75rem;`
	`114`	`+ @media (min-width: 394px) {`
`111`	`115`	`font-size: 2.5rem;`
`112`	`116`	`}`
`113`	`117`	`}`
`114`	`118`	`h1, p.program-subtitle {`
`115`	`119`	`color: var(--FAU_Col_FAU-Blau, #04316A);`
`116`	`120`	`margin: 0;`
`117`	`121`	`padding: 0;`
	`122`	`+ line-height: 1.5;`
`118`	`123`	`}`
`119`	`124`	`}`
`120`	`125`
`@@ -143,6 +148,7 @@`
`143`	`148`	`.fact-sheet {`
`144`	`149`	`padding: 40px 16px 16px;`
`145`	`150`	`margin-top: 56px;`
	`151`	`+ box-sizing: border-box;`
`146`	`152`	`@media screen and (min-width: 768px) {`
`147`	`153`	`//padding: 40px 32px 32px;`
`148`	`154`	`}`
`@@ -199,6 +205,7 @@`
`199`	`205`	`h3 {`
`200`	`206`	`color: #fff;`
`201`	`207`	`font-size: var(--H-Heading-2, 2rem);`
	`208`	`+ margin-bottom: 0;`
`202`	`209`	`}`
`203`	`210`
`204`	`211`	`.student-advice {`
`@@ -299,7 +306,6 @@`
`299`	`306`	`grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));`
`300`	`307`	`margin-top: 0;`
`301`	`308`	`background-color: var(--FAU_Col_FAU-Blau, #04316A);`
`302`		`- padding: 0 16px 16px;`
`303`	`309`	`@media screen and (min-width: 768px) {`
`304`	`310`	`grid-template-columns: repeat(2, 1fr);`
`305`	`311`	`}`
`@@ -417,12 +423,28 @@`
`417`	`423`	`}`
`418`	`424`	`}`
`419`	`425`	`.student-advice-more {`
	`426`	`+ .useful-links {`
	`427`	`+ padding: 0;`
	`428`	`+ }`
`420`	`429`	`.wp-block-fau-elemental-fau-teaser-grid {`
`421`	`430`	`margin-bottom: 32px;`
`422`	`431`	`.fau-teaser-grid {`
`423`		`- gap: 32px;`
	`432`	`+ grid-template-columns: repeat(1, 1fr);`
	`433`	`+ gap: 16px;`
	`434`	`+ @media (min-width: 768px) {`
	`435`	`+ grid-template-columns: repeat(2, 1fr);`
	`436`	`+ gap: 32px;`
	`437`	`+ }`
`424`	`438`	`}`
`425`	`439`	`}`
`426`	`440`	`}`
`427`	`441`	`}`
	`442`	`+}`
	`443`	`+`
	`444`	`+.fau-elemental.single-degree-program {`
	`445`	`+ main {`
	`446`	`+ //@media (max-width: 393px) {`
	`447`	`+ --faue_minimal_inline-margin: 0;`
	`448`	`+ //}`
	`449`	`+ }`
`428`	`450`	`}`