Skip to content

Commit

Permalink
Merge pull request #1151 from nla/ph-ctpl-241
Browse files Browse the repository at this point in the history
CTPL-241: New NLA branding
  • Loading branch information
CEdwardsBlasikiewicz authored Nov 26, 2024
2 parents d84c383 + 425cc8b commit b21ec7f
Show file tree
Hide file tree
Showing 59 changed files with 2,230 additions and 526 deletions.
3 changes: 3 additions & 0 deletions app/assets/images/arrow_tip.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions app/assets/images/nla-stacked-logo-black.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 2 additions & 44 deletions app/assets/images/nla_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 16 additions & 5 deletions app/assets/images/related-records/2-child.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 16 additions & 5 deletions app/assets/images/related-records/2-parent.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 20 additions & 9 deletions app/assets/images/related-records/3-child.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 15 additions & 4 deletions app/assets/stylesheets/nla/_advanced-search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,21 @@

.advanced-facet-limits {
.facet-field-heading {
background-color: var(--bs-white);

button::after {
float: none;
button {
&::after {
float: none;
display: inline-block;
margin-left: 0.25rem;
}

&.btn:not(.collapsed)::after {
transform: rotate(90deg);
transition: transform 0.15s ease-in-out;
}

&:active {
border-color: transparent;
}
}
}

Expand Down
68 changes: 68 additions & 0 deletions app/assets/stylesheets/nla/_alert.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
@charset "UTF-8";
@import "variables";
@import "nla-custom-bootstrap";

.alert {
border-width: 0;
border-left-style: solid;
border-left-width: 0.25rem;
color: $grey-700;
padding-left: 3rem;
position: relative;

&:before {
position: absolute;
top: 1rem;
left: 1rem;
width: 1rem;
height: 1rem;
font: var(--fa-font-regular);
}

}


.alert-success {
background: $success-light;
border-left-color: $success-dark;

&:before {
content: "\f058";
color: $success-dark;
}
}

.alert-info {
background: $info-light;
border-left-color: $info-dark;

&:before {
content: "\f05a";
color: $info-dark;
}
}

.alert-warning {
background: $warning-light;
border-left-color: $warning-dark;

&:before {
content: "\f06a";
color: $warning-dark;
}
}

.alert-error {
background: $error-light;
border-left-color: $error-dark;

&:before {
content: "\f057";
color: $error-dark;
}
}


.alert p {
margin-bottom: 0;
}
90 changes: 71 additions & 19 deletions app/assets/stylesheets/nla/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@
@import "nla-custom-bootstrap";

.btn {
text-transform: uppercase;
letter-spacing: 0.5px;
border-radius: 5rem;

&.arrow-before {
position: relative;
padding-left: 3rem;
padding-right: 2rem;

&::after {
color: $orange;
content: "\F177";
font: var(--fa-font-regular);
position: absolute;
Expand All @@ -25,7 +23,6 @@
&:hover::after,
&:focus::after {
left: 1.25rem;
color: $white;
}
}

Expand All @@ -35,7 +32,6 @@
padding-right: 3rem;

&::after {
color: $orange;
content: "\F178";
font: var(--fa-font-regular);
position: absolute;
Expand All @@ -48,7 +44,6 @@
&:hover::after,
&:focus::after {
right: 1.25rem;
color: $white;
}
}

Expand All @@ -58,34 +53,91 @@
padding-right: 3rem;

&::after {
color: $orange;
content: "\f1f8";
font: var(--fa-font-regular);
position: absolute;
font-weight: 400;
right: 1.5rem;
top: 50%;
transform: translateY(-50%);
margin-left: 0.5rem;
}

&:hover::after,
&:focus::after {
font: var(--fa-font-solid);
color: $white;
}
}
}

.btn-primary:focus,
.btn-primary:hover,
.btn-primary:active {
background: $light-purple;
border-color: $light-purple;
background: $light-purple;
}

.btn-outline-primary,
.btn-outline-secondary {
background: $white;

&:focus,
&:hover,
&:active {
background-color: $lightest-teal;
color: $black;
text-decoration: none;
}
}
.btn-primary {
background: $black;
color: $white;
border: 1px solid $black;

&:focus,
&:hover,
&:active {
background: $light-teal;
color: $black;
border-color: $light-teal;
box-shadow: none;
}
}


.btn-secondary {
background-color: $white;
border: 1px solid $black;
color: $black;

&:focus,
&:hover,
&:active {
background-color: $light-teal;
color: $black;
border-color: $light-teal;
text-decoration: none;
box-shadow: none;
}
}

.btn-tertiary {
background-color: $white;
border-color: $black;
color: $black;

&:focus,
&:hover,
&:active {
background-color: $black;
color: $white;
text-decoration: none;
}
}

.btn-danger {
background-color: $dark-red;
border-color: $dark-red;
color: $white;

&:focus,
&:hover,
&:active {
background-color: $light-muted-orange;
border-color: $light-muted-orange;
color: $black;
text-decoration: none;
}

}

Loading

0 comments on commit b21ec7f

Please sign in to comment.