Skip to content

Commit

Permalink
Fixing colour contrast
Browse files Browse the repository at this point in the history
  • Loading branch information
ginestra committed Sep 10, 2020
1 parent a308e28 commit f5a5365
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 12 deletions.
6 changes: 4 additions & 2 deletions assets/scss/_settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,16 @@ $nav-anchor: #bdc1c3;
$another-gray: #cdd7dc;
$subhead-color: #9b9ea0;
$dark-blue: #0a2d50;
$bright-blue: #005ad2;
// $bright-blue: #005ad2;
$bright-blue: #0049d2;
$bright-green: #28c382;
$bright-pink: #fc5e72;
$light-gray: #e6e6e6;
$medium-gray: #cacaca;
$dark-gray: #8a8a8a;
$dark-blue-gray: #3f4649;
$dirty-brown: #5f5550;
// $dirty-brown: #5f5550;
$dirty-brown: #4e4440;
$dark-yellow: #f5b90f;
$black: #0a0a0a;
$white: #fefefe;
Expand Down
18 changes: 13 additions & 5 deletions assets/scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ cite:before {
.datetime,
.more,
.more a {
font-size: rem-calc(20);
font-size: rem-calc(24);
color: scale-color($nav-anchor, $lightness: -60%);
}

Expand Down Expand Up @@ -423,7 +423,8 @@ iframe {
}

.with-background {
background: url('/static/images/grid-pattern.svg') $primary-color;
// background: url('/static/images/grid-pattern.svg') $primary-color;
background: url('/static/images/grid-pattern.svg') $dark-blue-gray;
background-size: rem-calc(432);

blockquote {
Expand Down Expand Up @@ -553,6 +554,10 @@ h2.heading-content {
color: scale-color($primary-color, $lightness:-30%);
}

a.post-thumb {
display: block;
}

.post-title,
.subhead {
font-size: rem-calc(24);
Expand Down Expand Up @@ -701,17 +706,20 @@ nav {
line-height: rem-calc(24);

a {
color: #585858;
// color: #585858;
color: $dark-blue-gray;
padding: rem-calc(4);

&:hover {
color: $tertiary-color;
// color: $tertiary-color;
color: $bright-blue;
}
}

.active > a {
background: transparent;
color: $primary-color;
// color: $primary-color;
color: $dark-blue;
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions assets/scss/palette-blue-azure.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
// color:scale-color($primary-color, $lightness:-40%)!important;
// }

.more {
&::after {
color: $tertiary-color;
}
}

a,
h3,
.title,
Expand Down
9 changes: 8 additions & 1 deletion assets/scss/palette-gray-pink.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,20 @@
.gray-pink {

&.with-background {
background-color: $primary-color;
// background-color: $primary-color;
background-color: scale-color($primary-color, $lightness: -70%);
}

// p {
// color: scale-color($bright-pink,$lightness:-50%) !important;
// }

.more {
&::after {
color: $bright-pink;
}
}

a,
h3,
.title,
Expand Down
12 changes: 10 additions & 2 deletions assets/scss/palette-green-blue.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,22 @@
background-color: $bright-green;
}

.more {
&::after {
color: $dark-blue;
}
}

a,
h3,
.title,
blockquote {
color: $bright-blue;
// color: $bright-blue;
color: $dark-blue;

&.button {
color: $white;
// color: $white;
color: $dark-blue;
}
}

Expand Down
6 changes: 6 additions & 0 deletions assets/scss/palette-yellow-brown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
background-color: $dirty-brown;
}

.more {
&::after {
color: $dark-yellow;
}
}

a,
h3,
.title,
Expand Down
2 changes: 1 addition & 1 deletion cms/templates/cms/includes/work_index_page_children.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h3 class="post-title">
{% if page.feed_image %}
<div class="small-4 columns">
{% image page.feed_image max-300x300 as tmp_image %}
<a href="{% pageurl page %}">
<a href="{% pageurl page %}" class="post-thumb">
<img src="{{ tmp_image.url }}" width="100%" alt="{{ tmp_image.alt }}">
</a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="row collapse expanded clearfix">
<div class="small-12 columns">
<div class="kdl-heading">
<span class="show-for-large"><a href="//kdl.kcl.ac.uk/" aria-label="link to King's Digital Lab"><img src="{% static 'images/kdl-heading.svg' %}" alt="King's Digital Lab"></a></span><span class="hide-for-large"><a href="/"><img src="{% static 'images/kdl-heading-mob.svg' %}" alt="King's Digital Lab"></a></span>
<span class="show-for-large"><a href="/" aria-label="link to King's Digital Lab"><img src="{% static 'images/kdl-heading.svg' %}" alt="King's Digital Lab"></a></span><span class="hide-for-large"><a href="/"><img src="{% static 'images/kdl-heading-mob.svg' %}" alt="King's Digital Lab"></a></span>
</div>

<div class="float-right block-right">
Expand Down

0 comments on commit f5a5365

Please sign in to comment.