Skip to content

Commit

Permalink
Merge pull request #291 from UniversityofWarwick/ID-416
Browse files Browse the repository at this point in the history
ID-416 ID7.1 can be toggled via class id7-point-1 to id7-utility-masthead
  • Loading branch information
halfninja authored Jul 3, 2024

Verified

This commit was signed with the committer’s verified signature.
jalling97 John Alling
2 parents b2c4c6a + 79bcbeb commit 9533e3c
Showing 5 changed files with 43 additions and 1 deletion.
2 changes: 1 addition & 1 deletion docs/_includes/utility-masthead.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="id7-utility-masthead">
<div class="id7-utility-masthead id7-point-1">
{% include utility-bar.html %}
{% include masthead.html %}
</div>
4 changes: 4 additions & 0 deletions less/header.less
Original file line number Diff line number Diff line change
@@ -43,6 +43,10 @@
.position-logo-colour-block(@id7-masthead-logo-height-sm, @id7-masthead-logo-width-sm);
}
}

&.id7-point-1 {

}
}

@import 'utility-bar.less';
16 changes: 16 additions & 0 deletions less/masthead.less
Original file line number Diff line number Diff line change
@@ -223,6 +223,22 @@
}
}

// Overrides for ID7.1, July 2024, ID-416
.id7-utility-masthead.id7-point-1 .id7-masthead {
background-image: none;

.id7-logo-column {
padding-left: 1px;

.id7-logo {
background-image: url("@{id7-image-root-dir}/logo-id7-point-1.svg");
background-repeat: no-repeat;
background-position-x: center;
background-position-y: top;
}
}
}

// Unbranded sites don't get the logo in the masthead
.id7-non-branded {
.id7-masthead {
9 changes: 9 additions & 0 deletions less/mixins/branding.less
Original file line number Diff line number Diff line change
@@ -13,6 +13,11 @@
.id7-utility-masthead {
background-image: url(@url);
}

.id7-utility-masthead.id7-point-1 {
background-image: none;
background-color: white;
}
}

.apply-left-border-image(@url) {
@@ -251,6 +256,10 @@
background-color: @colour;
}

.id7-utility-masthead.id7-point-1::after {
background-color: transparent;
}

@primary-colour: @colour;
@secondary-colour: screen(@colour, lighten(black, 30%));

13 changes: 13 additions & 0 deletions less/utility-bar.less
Original file line number Diff line number Diff line change
@@ -155,3 +155,16 @@

}
}

// Overrides for ID7.1, January 2024, ID-416
.id7-utility-masthead.id7-point-1 .id7-utility-bar {
.link-colour(@text-color);

> ul {
.horizontal-utility-links(0.4em, @text-color);
}

a > .fa-stack.id7-notifications-badge {
> i { color: #dddddd; }
}
}

0 comments on commit 9533e3c

Please sign in to comment.