Skip to content

Commit

Permalink
PHTG-124 replaces colors and logo (#11)
Browse files Browse the repository at this point in the history 
* PHTG-124 replaces colors and logo

* PHTG-123 - Umbenennung des Inhalts-Labels

* PHTG-124 updates by given feedback

* PHTG-124 makes links blue again

---------

Co-authored-by: Kathleen Neumann <[email protected]>
  • Loading branch information
@TiloNN @kkrebs
TiloNN and kkrebs authored Sep 25, 2024
1 parent 1a26310 commit 001c440
Show file tree
Hide file tree
Showing 10 changed files with 462 additions and 129 deletions.
338 changes: 338 additions & 0 deletions src/main/resources/META-INF/resources/images/logo-phtg24-cut.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/resources/META-INF/resources/images/logo-phtg24.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
69 changes: 69 additions & 0 deletions src/main/resources/META-INF/resources/images/logo-phtg24.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 19 additions & 27 deletions src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_buttons.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,31 @@
// set the defaults for all responsive levels here
// no (xl) media query necessary (desktop first)

.btn-secondary {
color: $green;
&:hover,
&:focus {
color: $green;
.viewer .btn-secondary {
color: $gray-dark;
background-color: transparent;
&:hover,
&:active,
&:focus {
color: $text-color;
border-color: transparent;
background-color: transparent;
}
&:hover {
border-color: $gray-medium;
}
&:disabled {
color: $gray-dark;
background-color: transparent;
border-color: transparent;
}
}
}

.viewer .btn-secondary {
color: $gray-dark;
background-color: transparent;
&:hover,
&:active,
&:focus {
.btn-secondary:not(:disabled):not(.disabled):active {
color: $text-color;
border-color: transparent;
background-color: transparent;
}
&:hover {
border-color: $gray-medium;
}
&:disabled {
color: $gray-dark;
background-color: transparent;
border-color: transparent;
}
}

.btn-secondary:not(:disabled):not(.disabled):active {
color: $text-color;
background-color: transparent;
border-color: transparent;
}

// Large devices (desktops) and below: <= 1200px
@include media-breakpoint-down(lg) {
Expand Down
83 changes: 1 addition & 82 deletions src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_fonts.scss
View file
Original file line number Diff line number Diff line change
@@ -1,84 +1,3 @@
/* font family definition
* - add the needed fonts here
*/

@font-face{
font-family:myriad-pro;
src:
url(https://use.typekit.net/af/1b1b1e/00000000000000000001709e/27/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n7&v=3) format("woff2"),
url(https://use.typekit.net/af/1b1b1e/00000000000000000001709e/27/d?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n7&v=3) format("woff"),
url(https://use.typekit.net/af/1b1b1e/00000000000000000001709e/27/a?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n7&v=3) format("opentype");

font-weight:700;
font-style:normal;
font-display:swap;
}
@font-face{
font-family:myriad-pro;
src:
url(https://use.typekit.net/af/2e2357/00000000000000000001709f/27/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=i7&v=3) format("woff2"),
url(https://use.typekit.net/af/2e2357/00000000000000000001709f/27/d?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=i7&v=3) format("woff"),
url(https://use.typekit.net/af/2e2357/00000000000000000001709f/27/a?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=i7&v=3) format("opentype");
font-weight:700;
font-style:italic;
font-display:swap;
}
@font-face{
font-family:myriad-pro;
src:
url(https://use.typekit.net/af/d32e26/00000000000000000001709b/27/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=i4&v=3) format("woff2"),
url(https://use.typekit.net/af/d32e26/00000000000000000001709b/27/d?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=i4&v=3) format("woff"),
url(https://use.typekit.net/af/d32e26/00000000000000000001709b/27/a?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=i4&v=3) format("opentype");
font-weight:400;
font-style:italic;
font-display:swap;
}
@font-face{font-family:myriad-pro;
src:
url(https://use.typekit.net/af/c630c3/000000000000000000017098/27/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n3&v=3) format("woff2"),
url(https://use.typekit.net/af/c630c3/000000000000000000017098/27/d?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n3&v=3) format("woff"),
url(https://use.typekit.net/af/c630c3/000000000000000000017098/27/a?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n3&v=3) format("opentype");
font-weight:300;
font-style:normal;
font-display:swap;
}
@font-face{
font-family:myriad-pro;
src:
url(https://use.typekit.net/af/ee605b/000000000000000000017099/27/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=i3&v=3) format("woff2"),
url(https://use.typekit.net/af/ee605b/000000000000000000017099/27/d?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=i3&v=3) format("woff"),
url(https://use.typekit.net/af/ee605b/000000000000000000017099/27/a?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=i3&v=3) format("opentype");
font-weight:300;
font-style:italic;
font-display:swap;
}
@font-face{
font-family:myriad-pro;
src:
url(https://use.typekit.net/af/cafa63/00000000000000000001709a/27/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n4&v=3) format("woff2"),
url(https://use.typekit.net/af/cafa63/00000000000000000001709a/27/d?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n4&v=3) format("woff"),
url(https://use.typekit.net/af/cafa63/00000000000000000001709a/27/a?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n4&v=3) format("opentype");
font-weight:400;
font-style:normal;
font-display:swap;
}
@font-face{
font-family:myriad-pro;
src:
url(https://use.typekit.net/af/80c5d0/00000000000000000001709c/27/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n6&v=3) format("woff2"),
url(https://use.typekit.net/af/80c5d0/00000000000000000001709c/27/d?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n6&v=3) format("woff"),
url(https://use.typekit.net/af/80c5d0/00000000000000000001709c/27/a?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n6&v=3) format("opentype");
font-weight:600;
font-style:normal;
font-display:swap;
}
@font-face{
font-family:myriad-pro;
src:
url(https://use.typekit.net/af/d50a1b/00000000000000000001709d/27/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=i6&v=3) format("woff2"),
url(https://use.typekit.net/af/d50a1b/00000000000000000001709d/27/d?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=i6&v=3) format("woff"),
url(https://use.typekit.net/af/d50a1b/00000000000000000001709d/27/a?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=i6&v=3) format("opentype");
font-weight:600;
font-style:italic;
font-display:swap;
}
*/
8 changes: 0 additions & 8 deletions src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_header.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,6 @@
// set the defaults for all responsive levels here
// no (xl) media query necessary (desktop first)

// logo and menu container
#project_logo_box {
img {
width: 500px;
height: 65px;
}
}

// Large devices (desktops) and below: <= 1200px
@include media-breakpoint-down(lg) {
// add/overwrite styles for responsive level lg and lower
Expand Down
20 changes: 14 additions & 6 deletions src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_navigation.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,38 @@
background-color: transparent;
}
.mir-main-nav {
background-color: $green-medium;
background-color: $green24;
.navbar {
padding: 0;
background-color: $green-medium;
background-color: $green24;
.nav-item {
background-color: $green;
background-color: $green24;
border-left: 5px solid white;
&.active {
.nav-link {
color: $white;
background-color: $green24-medium;
}
}
.nav-link {
padding: 0.5rem 1rem;
&.active,
&:focus,
&:hover {
color: $white;
background-color: darken($green, 10%);
background-color: $green24-medium;
}
}
}
#basket-list-item {
.nav-link {
color: $green;
color: white;
padding: 0.5rem 1rem;
border-left: 5px solid white;
&:focus,
&:hover {
color: darken($green, 10%);
color: white;
background-color: $green24-medium;
}
}
}
Expand Down
24 changes: 19 additions & 5 deletions src/main/resources/META-INF/resources/mir-layout/scss/project_styles/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,17 @@ $green-light: #f7faef;
$blue-dark: #1a3260;
$blue-medium: #3e609f;

$green24: #005046;
$green24-medium: #007a6b;

// --------------------------------------------------
// overwrite bootstrap
// --------------------------------------------------

$primary: $green;
$secondary: $green-medium;
$primary: $green24-medium;
$secondary: $green24-medium;

$success: $green24-medium;

$text-color: $black-dark;

Expand All @@ -43,7 +47,7 @@ $link-hover-color: $blue-medium;
$link-hover-decoration: underline dotted;

$font-size-base: 1rem; //.875rem
$font-family-sans-serif: myriad-pro, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
$font-family-sans-serif: Arial, "Helvetica Neue", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
$font-weight-base: 400;
$font-weight-normal: 400;

Expand All @@ -60,5 +64,15 @@ $border-radius-lg: $border-radius;
$input-border-radius: $border-radius;

$dropdown-link-color: $black-dark;
$dropdown-link-hover-color: $green;
$dropdown-link-hover-bg: white;
$dropdown-link-hover-color: $green24;
$dropdown-link-hover-bg: white;

$pagination-color: white;
$pagination-bg: $green24;;
$pagination-border-width: 0;
$pagination-hover-color: white;
$pagination-hover-bg: $green24-medium;
$pagination-active-color: white;
$pagination-active-bg: $green24-medium;
$pagination-disabled-color: white;
$pagination-disabled-bg: $gray-medium;
1 change: 1 addition & 0 deletions src/main/resources/config/reposis_phtg/messages_de.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ mir.help.institutes = Bitte nennen Sie die Organisat
mir.help.role.coreferent = Bitte geben Sie einen Zweitgutachter(in) an.
mir.help.role.referent = Bitte geben Sie einen Erstgutachter(in) an.
mir.identifier.intern = Bestand Campus-Bibliothek\:
mir.metadata.content = Aus dem Inhalt
mir.placeholder.college = Institution
mir.placeholder.collegeplace = Ort der Institution
mir.placeholder.name.organization = Name der Organisation
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/xsl/mir-flatmir-layout-utils.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<div id="project_logo_box">
<a href="https://www.phtg.ch/"
class="">
<img src="{$WebApplicationBaseURL}images/logo-phtg.svg" class="img-fluid" />
<img src="{$WebApplicationBaseURL}images/logo-phtg24-cut.svg" class="img-fluid" />
</a>
</div>
</div>
Expand Down

0 comments on commit 001c440

Please sign in to comment.