Skip to content

Commit

Permalink
Merge pull request #11 from ASKnetCommunity/177-change-website-colors…
Browse files Browse the repository at this point in the history
…-to-new-asknet-color-scheme

changed, adapted colors and background images #177
  • Loading branch information
MartinSchott authored Nov 28, 2023
2 parents 4358789 + 1cd87d2 commit 574df01
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 29 deletions.
Binary file added assets/img/tile-light-ochre2.jpg
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 assets/img/tile-light-purple2.jpg
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 assets/img/tile-ochre2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 7 additions & 12 deletions assets/scss/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
font-size: 22px;
font-family: $primary-font;
color: $white !important;
background-image: linear-gradient(160deg, rgba($white, 0.4), rgba($white, 0));
background-image: linear-gradient(160deg, rgba($white, 0.25), rgba($white, 0));
text-transform: capitalize;
padding: 16px 44px;
margin-top: 15px;
Expand Down Expand Up @@ -32,17 +32,6 @@
padding: 5px 10px;
font-size: 15px;
}

// ::after {
// background: linear-gradient(160deg, rgba($white, 0.4), rgba($white, 0));
// content: "";
// position: absolute;
// z-index: -1;
// top: 0;
// left: 0;
// right: 0;
// bottom: 0;
// }
}

.btn-primary {
Expand All @@ -64,6 +53,12 @@
}
}

.hero-area, .contact-section {
.btn-primary {
border: 1px solid rgba($secondary-color, 0.5);
}
}


.btn-transparent {
background-color: transparent;
Expand Down
6 changes: 3 additions & 3 deletions assets/scss/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ a.text-dark{
}

.bg-dark{
background-color: #222222 !important;
background-color: $primary-color !important;
}

/* icon */
Expand Down Expand Up @@ -313,7 +313,7 @@ textarea.form-control{
/* card */
.card{
// border: 1px;
background-color: rgba($primary-color, 0.4);
background-color: $secondary-color;
&-header{
border: 0;
}
Expand All @@ -337,7 +337,7 @@ textarea.form-control{
}

.page-layout { //set background for body tag only on "layout: page" (like imprint etc.)
background: url(../../assets/img/tile-light-purple.jpg);
background: url(../../assets/img/tile-light-ochre2.jpg);
h2 { //set margin for h2 headings back to bootstrap standard (on front page the h2 margin needs to be bigger)
margin-bottom: .5rem;
}
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Color Variables
$primary-color: #30002A; // #DFAF5F;
$secondary-color: #8F747F; // #212529;
$secondary-color: #efe2f3; // #8F747F; "old" purple
$third-color: #EEE7D4;
$fourth-color: #C5A14B;
$link-color: $fourth-color; // #A46131;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/templates/_hubs.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
section#hubs-section {
background: url(../../assets/img/tile-light-purple.jpg);
background: url(../../assets/img/tile-light-ochre2.jpg);
}

.filter-controls {
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/templates/_lead.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
section#lead-section {
background: url(../../assets/img/tile-purple.jpg);
background: url(../../assets/img/tile-ochre2.jpg);
}

#lead-section p {
Expand Down
10 changes: 0 additions & 10 deletions assets/scss/templates/_media-page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,6 @@
font-weight: 400;
width: 100%;
max-width: 400px;
// ::before {
// background: linear-gradient(160deg, rgba($white, 0.4), rgba($white, 0));
// content: "";
// position: absolute;
// z-index: -1;
// top: 0;
// left: 0;
// right: 0;
// bottom: 0;
// }
}
// ol, ul {
// list-style-type: initial;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/templates/_timeline.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
section#timeline-section {
background: url(../../assets/img/tile-light-purple.jpg);
background: url(../../assets/img/tile-light-ochre2.jpg);
}

// Styling for the timeline section
Expand Down

0 comments on commit 574df01

Please sign in to comment.