Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@janvonde
janvonde committed Nov 15, 2024
2 parents 97404de + abcd9a5 commit 11ede6d
Show file tree
Hide file tree
Showing 20 changed files with 282 additions and 30 deletions.
2 changes: 1 addition & 1 deletion ...r-theme-reference/WebContent/resources/themes/reference/css/dist/reference-cs.min.css.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...i-viewer-theme-reference/WebContent/resources/themes/reference/css/dist/reference.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ewer-theme-reference/WebContent/resources/themes/reference/css/dist/reference.min.css.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...i-viewer-theme-reference/WebContent/resources/themes/reference/css/dist/subtheme1.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ewer-theme-reference/WebContent/resources/themes/reference/css/dist/subtheme1.min.css.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...i-viewer-theme-reference/WebContent/resources/themes/reference/css/dist/subtheme2.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ewer-theme-reference/WebContent/resources/themes/reference/css/dist/subtheme2.min.css.map
View file

Large diffs are not rendered by default.

165 changes: 163 additions & 2 deletions ...reference/WebContent/resources/themes/reference/css/less/views/search/searchAdvanced.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
}
&__select-values {
}

&__action {
.btn--default {
background: #f7f7f7;
Expand Down Expand Up @@ -100,8 +100,169 @@
select {
}
}


// ENTITY TABS
&__entity-tabs {
}
&__entity-tab-link-wrapper {
&.-active {
}
}
&__entity-tab-link {
background-color: @bg-general;
// TOP BORDER FOR ENTITY TABS MIXIN
.tabpseudoelementmixin1(@color) {
border-top: 3px solid @color;
padding-top: 7px;
}

&.-result-group-standard {
&:hover,
&:focus,
&:active {
.tabpseudoelementmixin1(@ci-color1);
}
}
/* COLORING FOR THE ENTITY GHOUPS */
&.-result-group-docstructtype__work {
&:hover,
&:focus,
&:active {
.tabpseudoelementmixin1(#DC7E2E);
}
}
&.-result-group-docstructtype__person {
&:hover,
&:focus,
&:active {
.tabpseudoelementmixin1(#B13B29);
}
}
&.-result-group-docstructtype__agent {
&:hover,
&:focus,
&:active {
.tabpseudoelementmixin1(#568FB2);
}
}
&.-result-group-docstructtype__award {
&:hover,
&:focus,
&:active {
.tabpseudoelementmixin1(#2E8D38);
}
}
&.-result-group-docstructtype__event {
&:hover,
&:focus,
&:active {
.tabpseudoelementmixin1(#8966CA);
}
}
&.-active {
padding-top: 7px;
background: @bg-content-box;
color: @fg-general;
&.-result-group-standard {
.tabpseudoelementmixin1(@ci-color1);
}
&.-result-group-docstructtype__work {
.tabpseudoelementmixin1(#DC7E2E);
}
&.-result-group-docstructtype__person {
.tabpseudoelementmixin1(#B13B29);
}
&.-result-group-docstructtype__agent {
.tabpseudoelementmixin1(#568FB2);
}
&.-result-group-docstructtype__award {
.tabpseudoelementmixin1(#2E8D38);
}
&.-result-group-docstructtype__event {
.tabpseudoelementmixin1(#8966CA);
}
}
& when (@colorModes = true) {
.mx-dark-mode-rules ({
border: 1px solid transparent;
border-bottom: none;
});
.mx-light-mode-rules ({
border: @border;
border-bottom: none;
});
}

}
// REWORK NEEDED
&__action-search-button {
// SUBMIT BUTTON COLORS MIXIN
.entitySearchAdvancedButtonColor(@color) {
border: 1px solid @color;
background: @color;
}
&.-result-group-docstructtype__work {
.entitySearchAdvancedButtonColor(#DC7E2E);
}
&.-result-group-docstructtype__person {
.entitySearchAdvancedButtonColor(#B13B29);
}
&.-result-group-docstructtype__agent {
.entitySearchAdvancedButtonColor(#568FB2);
}
&.-result-group-docstructtype__award {
.entitySearchAdvancedButtonColor(#2E8D38);
}
&.-result-group-docstructtype__event {
.entitySearchAdvancedButtonColor(#8966CA);
}
}

// ENTITY TABS MOBILE DROPDOWN
&__entity-tabs-dropdown {
border: @border;
border-top: none;
background-color: @bg-content-box;
}
&__entity-tabs-dropdown-button-wrapper {

}
&__entity-tabs-dropdown-toggle-button {
border: @border;
border-bottom: none;
background-color: @bg-general;
background: @bg-content-box;
color: @fg-content-box;
&:hover {
color: @fg-content-box;
}
// MOBILE ENTITY DROPDOWN TOGGLE BUTTON COLORS MIXIN
.entitySearchAdvancedDropdownToggleColor(@color) {
border: 1px solid @color;
background: @color;
color: white;
}
&.-result-group-docstructtype__work {
.entitySearchAdvancedDropdownToggleColor(#DC7E2E);
}
&.-result-group-docstructtype__person {
.entitySearchAdvancedDropdownToggleColor(#B13B29);
}
&.-result-group-docstructtype__agent {
.entitySearchAdvancedDropdownToggleColor(#568FB2);
}
&.-result-group-docstructtype__award {
.entitySearchAdvancedDropdownToggleColor(#2E8D38);
}
&.-result-group-docstructtype__event {
.entitySearchAdvancedDropdownToggleColor(#8966CA);
}
}
&__entity-tabs-dropdown-link {
color: @lk-content-box;
}


// GAP SIZING VARIABLE
// @gap-sizer: 5px;
}
Expand Down
16 changes: 16 additions & 0 deletions ...eme-reference/WebContent/resources/themes/reference/css/less/views/search/searchList.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,22 @@
background-color: @bg-content-box;
color: @fg-content-box;
border: @border;
/* COLORING FOR THE ENTITY GHOUPS */
&.docstructtype__work {
border: 1px solid #DC7E2E;
}
&.docstructtype__person {
border: 1px solid #B13B29;
}
&.docstructtype__agent {
border: 1px solid #568FB2;
}
&.docstructtype__award {
border: 1px solid #2E8D38;
}
&.docstructtype__event {
border: 1px solid #8966CA;
}
}
&__hit-header {}
&__hit-number-wrapper {
Expand Down
27 changes: 27 additions & 0 deletions ...er-theme-reference/WebContent/resources/themes/reference/css/less/views/viewMetadata.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,33 @@
==============================================================*/
/* METADATA */
/* BLOCK */
.view-metadata {
&.docstructtype__work {
.metadata__wrapper {
border: 1px solid #DC7E2E;
}
}
&.docstructtype__person {
.metadata__wrapper {
border: 1px solid #B13B29;
}
}
&.docstructtype__agent {
.metadata__wrapper {
border: 1px solid #568FB2;
}
}
&.docstructtype__award {
.metadata__wrapper {
border: 1px solid #2E8D38;
}
}
&.docstructtype__event {
.metadata__wrapper {
border: 1px solid #8966CA;
}
}
}
.metadata {
&__title-wrapper {
}
Expand Down
48 changes: 48 additions & 0 deletions ...ewer-theme-reference/WebContent/resources/themes/reference/css/less/views/viewObject.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,54 @@
/* TEXT */
&__text {}

// COLORS FOR BORDERS BASED ON DOCSTRUCT TYPE
// MAYBE CLEANUP/RECONSTRUCTION NEEDED
&.docstructtype__work {
.image-controls, .view-object__image {
border-width: 1px;
border-color: #DC7E2E;
}
.metadata__wrapper {
border: 1px solid #DC7E2E;
}
}
&.docstructtype__person {
.image-controls, .view-object__image {
border-width: 1px;
border-color: #B13B29;
}
.metadata__wrapper {
border: 1px solid #B13B29;
}
}
&.docstructtype__agent {
.image-controls, .view-object__image {
border-width: 1px;
border-color: #568FB2;
}
.metadata__wrapper {
border: 1px solid #568FB2;
}
}
&.docstructtype__award {
.image-controls, .view-object__image {
border-width: 1px;
border-color: #2E8D38;
}
.metadata__wrapper {
border: 1px solid #2E8D38;
}
}
&.docstructtype__event {
.image-controls, .view-object__image {
border-width: 1px;
border-color: #8966CA;
}
.metadata__wrapper {
border: 1px solid #8966CA;
}
}

}

.view-object-content {
Expand Down
4 changes: 2 additions & 2 deletions goobi-viewer-theme-reference/WebContent/resources/themes/reference/includes/customJS.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@


</script>
<script src="#{request.contextPath}/resources/themes/#{navigationHelper.theme}/javascript/dist/custom.min.js?${navigationHelper.buildVersion}&amp;cachetimestamp=2024-7-4-9-21-35"></script>
<script src="#{request.contextPath}/resources/themes/#{navigationHelper.theme}/javascript/dist/#{navigationHelper.theme}-tags.js?${navigationHelper.buildVersion}&amp;cachetimestamp=2024-7-4-9-21-35"></script>
<script src="#{request.contextPath}/resources/themes/#{navigationHelper.theme}/javascript/dist/custom.min.js?${navigationHelper.buildVersion}&amp;cachetimestamp=2024-10-23-17-17-26"></script>
<script src="#{request.contextPath}/resources/themes/#{navigationHelper.theme}/javascript/dist/#{navigationHelper.theme}-tags.js?${navigationHelper.buildVersion}&amp;cachetimestamp=2024-10-23-17-17-26"></script>
<script>
//TODO: replace with better solution so colorTheme gets set earlier
// switchTheme(#{sessionBean.get('colorTheme')});
Expand Down
4 changes: 2 additions & 2 deletions goobi-viewer-theme-reference/WebContent/resources/themes/reference/template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<ui:include src="/resources/includes/templateHeads/css.xhtml">
<ui:param name="templateName" value="#{templateName}" />
<ui:param name="excludeCSS" value="#{excludeCSS}" />
<ui:param name="cacheBuster" value="cachetimestamp=2024-7-4-9-21-35" />
<ui:param name="cacheBuster" value="cachetimestamp=2024-10-23-17-17-26" />
</ui:include>

<!-- SUBTHEME CSS -->
Expand All @@ -83,7 +83,7 @@
<ui:include src="/resources/includes/templateHeads/js.xhtml">
<ui:param name="templateName" value="#{templateName}" />
<ui:param name="excludeJS" value="#{excludeJS}" />
<ui:param name="cacheBuster" value="cachetimestamp=2024-7-4-9-21-35" />
<ui:param name="cacheBuster" value="cachetimestamp=2024-10-23-17-17-26" />
</ui:include>

<!-- QUICK JS IN VIEWER BACKEND - ADDS <script> NODE - INSERTED WITH INCLUDE FOR CORRECT IDE VALIDATION -->
Expand Down
4 changes: 2 additions & 2 deletions goobi-viewer-theme-reference/WebContent/resources/themes/reference/templateAdmin.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
<ui:include src="/resources/includes/templateHeads/css.xhtml">
<ui:param name="templateName" value="#{templateName}" />
<ui:param name="excludeCSS" value="#{excludeCSS}" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-10-23-17-17-26" />
</ui:include>

<!-- JAVASCRIPT -->
<ui:include src="/resources/includes/templateHeads/js.xhtml">
<ui:param name="templateName" value="#{templateName}" />
<ui:param name="excludeJS" value="#{excludeJS}" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-10-23-17-17-26" />
</ui:include>

</h:head>
Expand Down
4 changes: 2 additions & 2 deletions goobi-viewer-theme-reference/WebContent/resources/themes/reference/templateArchives.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<ui:include src="/resources/includes/templateHeads/css.xhtml">
<ui:param name="templateName" value="#{templateName}" />
<ui:param name="excludeCSS" value="#{excludeCSS}" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-10-23-17-17-26" />
</ui:include>

<!-- QUICK CSS IN VIEWER BACKEND - ADDS <style> NODE - INSERTED WITH INCLUDE FOR CORRECT IDE VALIDATION -->
Expand All @@ -72,7 +72,7 @@
<ui:include src="/resources/includes/templateHeads/js.xhtml">
<ui:param name="templateName" value="#{templateName}" />
<ui:param name="excludeJS" value="#{excludeJS}" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-10-23-17-17-26" />
</ui:include>

<!-- QUICK JS IN VIEWER BACKEND - ADDS <script> NODE - INSERTED WITH INCLUDE FOR CORRECT IDE VALIDATION -->
Expand Down
4 changes: 2 additions & 2 deletions goobi-viewer-theme-reference/WebContent/resources/themes/reference/templateBlank.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<ui:include src="/resources/includes/templateHeads/css.xhtml">
<ui:param name="templateName" value="#{templateName}" />
<ui:param name="excludeCSS" value="#{excludeCSS}" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-10-23-17-17-26" />
</ui:include>

<!-- SUBTHEME CSS -->
Expand All @@ -69,7 +69,7 @@
<ui:include src="/resources/includes/templateHeads/js.xhtml">
<ui:param name="templateName" value="#{templateName}" />
<ui:param name="excludeJS" value="#{excludeJS}" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-10-23-17-17-26" />
</ui:include>

</h:head>
Expand Down
4 changes: 2 additions & 2 deletions ...i-viewer-theme-reference/WebContent/resources/themes/reference/templateBlankUnstyled.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
<ui:include src="/resources/includes/templateHeads/css.xhtml">
<ui:param name="templateName" value="#{templateName}" />
<ui:param name="excludeCSS" value="#{excludeCSS}" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-10-23-17-17-26" />
</ui:include>

<!-- JAVASCRIPT -->
<ui:include src="/resources/includes/templateHeads/js.xhtml">
<ui:param name="templateName" value="#{templateName}" />
<ui:param name="excludeJS" value="#{excludeJS}" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-7-4-9-21-35" />
<ui:param name="cacheBuster" value="-cachetimestamp=2024-10-23-17-17-26" />
</ui:include>

</h:head>
Expand Down
Loading

0 comments on commit 11ede6d

Please sign in to comment.