aboutsummaryrefslogtreecommitdiff
path: root/resources/assets
diff options
context:
space:
mode:
authorRasmus Fuhse <fuhse@data-quest.de>2025-01-10 12:13:24 +0000
committerRasmus Fuhse <fuhse@data-quest.de>2025-01-10 12:13:24 +0000
commit39745c9aa8bb099e8bda1f4d775ed229dbe97be4 (patch)
treea2a96deecf48e62d995507c5c8b39eea9ae9293d /resources/assets
parent03e8e1d8f9100cf9bfcb111b63ac4077f510a026 (diff)
Resolve "Studiengruppen erweitern" - Hauptbronch
Closes #3616 Merge request studip/studip!2509
Diffstat (limited to 'resources/assets')
-rw-r--r--resources/assets/javascripts/lib/global_search.js7
-rw-r--r--resources/assets/javascripts/lib/search.js7
-rw-r--r--resources/assets/stylesheets/scss/forms.scss7
-rw-r--r--resources/assets/stylesheets/scss/studygroup.scss104
-rw-r--r--resources/assets/stylesheets/scss/tables.scss6
5 files changed, 130 insertions, 1 deletions
diff --git a/resources/assets/javascripts/lib/global_search.js b/resources/assets/javascripts/lib/global_search.js
index 19154a1..4c46c77 100644
--- a/resources/assets/javascripts/lib/global_search.js
+++ b/resources/assets/javascripts/lib/global_search.js
@@ -131,6 +131,13 @@ const GlobalSearch = {
.appendTo(details);
}
+ // Details: Descriptional text
+ if (result.found_tag !== null) {
+ $('<div class="globalsearch-result-description">')
+ .html(result.found_tag)
+ .appendTo(details);
+ }
+
// Details: Additional information
if (result.additional !== null) {
$('<div class="globalsearch-result-additional">')
diff --git a/resources/assets/javascripts/lib/search.js b/resources/assets/javascripts/lib/search.js
index ff3a98d..5c0e3e8 100644
--- a/resources/assets/javascripts/lib/search.js
+++ b/resources/assets/javascripts/lib/search.js
@@ -245,6 +245,13 @@ const Search = {
.appendTo(details);
}
+ // Details: Tags
+ if (result.found_tag !== null) {
+ $('<div class="search-result-description">')
+ .html(result.found_tag)
+ .appendTo(details);
+ }
+
if (result.dates !== null) {
$('<div class="search-result-dates">')
.html(result.dates)
diff --git a/resources/assets/stylesheets/scss/forms.scss b/resources/assets/stylesheets/scss/forms.scss
index 0a707c8..5c8f3a4 100644
--- a/resources/assets/stylesheets/scss/forms.scss
+++ b/resources/assets/stylesheets/scss/forms.scss
@@ -562,6 +562,13 @@ form.default {
margin-top: 0.5ex;
}
}
+ .multiquicksearch > li {
+ display: flex;
+ align-items: center;
+ a.delete_item {
+ margin-left: 5px;
+ }
+ }
}
form.narrow {
diff --git a/resources/assets/stylesheets/scss/studygroup.scss b/resources/assets/stylesheets/scss/studygroup.scss
index 8eb0c4c..18cde00 100644
--- a/resources/assets/stylesheets/scss/studygroup.scss
+++ b/resources/assets/stylesheets/scss/studygroup.scss
@@ -52,3 +52,107 @@ ul.studygroup-gallery {
}
}
}
+
+.connectedcourses {
+ .teaser {
+ font-size: 24px;
+ }
+ .connectedstudygroups-empty-background {
+ @include empty-placeholder-image('network2', false);
+ }
+ footer {
+ background-color: var(--content-color-20);
+ border-top: 1px solid var(--brand-color-darker);
+ clear: both;
+ padding: 0;
+ height: 58px;
+ }
+}
+
+.studip-tiles {
+ display: flex;
+ align-items: stretch;
+ flex-wrap: wrap;
+ > * {
+ display: flex;
+ flex-direction: column;
+ width: 270px;
+ border: 1px solid var(--content-color-20);
+ padding: 10px;
+ margin-bottom: 10px;
+ align-items: stretch;
+ margin-right: 10px;
+ > * {
+ display: flex;
+ flex-direction: row;
+ margin-bottom: 10px;
+
+ &.with-action-menu {
+ justify-content: space-between;
+ > * {
+ margin-right: 0px;
+ &:first-child {
+ display: flex;
+ flex-direction: row;
+ > * {
+ margin-right: 10px;
+ }
+ }
+ }
+ }
+ .actions {
+ text-align: right;
+ }
+ &:last-child {
+ margin-bottom: 0px;
+ }
+ > * {
+ margin-right: 10px;
+ }
+ }
+ }
+}
+
+.studip-contents-overview-teaser {
+ max-width: 782px;
+ background-color: var(--content-color-20);
+ background-image: url('#{$image-path}/courseware-keyvisual-negative.svg');
+ background-repeat: no-repeat;
+ background-size: 196px;
+ background-position-y: 50%;
+ background-position-x: 24px;
+ padding: 24px;
+ margin-bottom: 10px;
+
+ .teaser-content {
+ padding-left: 220px;
+
+ header {
+ font-size: 1.5em;
+ margin-bottom: 0.5em;
+ }
+ }
+}
+
+.responsive-display {
+ .cw-contents-overview-teaser {
+ max-width: 782px;
+ background-size: 60%;
+ background-position-y: 24px;
+ background-position-x: 50%;
+ padding: 24px;
+ margin-bottom: 10px;
+
+ .teaser-content {
+ padding-top: 28%;
+ padding-left: 0;
+ text-align: justify;
+
+ header {
+ font-size: 1.5em;
+ margin: 1em 0 0.5em 0;
+ text-align: center;
+ }
+ }
+ }
+}
diff --git a/resources/assets/stylesheets/scss/tables.scss b/resources/assets/stylesheets/scss/tables.scss
index 2c05362..32a26c2 100644
--- a/resources/assets/stylesheets/scss/tables.scss
+++ b/resources/assets/stylesheets/scss/tables.scss
@@ -623,10 +623,14 @@ table.default {
font-size: $font-size-base;
border-left: 1px solid var(--color--table-border);
margin-bottom: -2px;
- min-height: 26px;
+ min-height: 30px;
padding-bottom: 3px;
padding-left: 0.5em;
padding-top: 4px;
+ input[type=text] {
+ width: auto; // otherwise it can be 100%, so there is no space left for other parts of the actions-area
+ max-height: 30px;
+ }
}
td.actions, th.actions {