Skip to content

Commit f3d8e6c

Browse files
Merged in task/main-glam/GLAM-1030 (pull request DSpace#3653)
[GLAM-1030]
2 parents 30ff954 + f7da5ee commit f3d8e6c

4 files changed

Lines changed: 18 additions & 11 deletions

File tree

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
.logo-circle {
2-
width: 120px;
3-
height: 120px;
2+
width: var(--ds-header-logo-height);
3+
height: var(--ds-header-logo-height);
44
background-position: center;
55
background-color: #ddd;
66
border-radius: 100%;
77
background-image: url("/assets/images/dspace-glam-logo.svg");
88
background-repeat: no-repeat;
9+
10+
@media screen and (max-width: map-get($grid-breakpoints, md)) {
11+
height: var(--ds-header-logo-height-xs);
12+
width: var(--ds-header-logo-height-xs);
13+
}
914
}
10-
15+
16+
1117
@media screen and (min-width: map-get($grid-breakpoints, md)) {
1218
nav.navbar {
1319
display: none;
@@ -16,7 +22,7 @@
1622
background-color: var(--ds-header-bg);
1723
}
1824
}
19-
25+
2026
.navbar-brand img {
2127
@media screen and (max-width: map-get($grid-breakpoints, md)) {
2228
height: var(--ds-header-logo-height-xs);
@@ -26,11 +32,11 @@
2632
background-image: none !important;
2733
line-height: 1.5;
2834
}
29-
35+
3036
.navbar-toggler {
3137
color: var(--ds-header-icon-color);
3238

3339
&:hover, &:focus {
3440
color: var(--ds-header-icon-color-hover);
3541
}
36-
}
42+
}

src/themes/glam/app/navbar/navbar.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="logo-circle mb-2"></div>
77
</a>
88
<div class="ml-auto right-container">
9-
<ul class="navbar-nav ml-auto ml-auto mb-auto mt-3 list-unstyled">
9+
<ul class="navbar-nav ml-auto ml-auto my-3 list-unstyled">
1010
<li *ngIf="mainSiteUrl">
1111
<div class="nav-item" id="home-icon">
1212
<a [attr.aria-label]="'nav.mainSiteName' | translate" class="nav-link navbar-collapsed" target="_blank" [href]="'https://' + mainSiteUrl" [ngbTooltip]="'nav.mainSiteName' | translate">

src/themes/glam/app/navbar/navbar.component.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.logo-circle {
2-
width: 160px;
3-
height: 160px;
2+
width: var(--ds-header-logo-height);
3+
height: var(--ds-header-logo-height);
44
background-position: center;
55
background-color: #ddd;
66
border-radius: 100%;
@@ -88,5 +88,5 @@ a.navbar-brand img {
8888
}
8989

9090
.search-navbar-wrapper {
91-
padding: 3rem var(--ds-cris-section-horizontal-padding);
91+
padding: 0 var(--ds-cris-section-horizontal-padding) 1rem;
9292
}

src/themes/glam/styles/_theme_css_variable_overrides.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// Override or add CSS variables for your theme here
22

33
:root {
4-
--ds-header-logo-height: 80px;
4+
--ds-header-logo-height: 160px;
5+
--ds-header-logo-height-xs: 120px;
56
--ds-banner-text-background: rgba(0, 0, 0, 0.45);
67
--ds-banner-background-gradient-width: 300px;
78
--ds-home-news-link-color: #{$green};

0 commit comments

Comments
 (0)