Skip to content

Commit

Permalink
Merge pull request #76 from eea/develop
Browse files Browse the repository at this point in the history
New theme colors and logo
  • Loading branch information
claudiaifrim authored Jan 31, 2023
2 parents 075f406 + 17e4fc2 commit db93d63
Show file tree
Hide file tree
Showing 9 changed files with 258 additions and 13 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

### [2.0.3](https://github.com/eea/volto-bise/compare/2.0.2...2.0.3) - 7 December 2022
### [2.0.4](https://github.com/eea/volto-bise/compare/2.0.3...2.0.4) - 31 January 2023

#### :hammer_and_wrench: Others

- Add advanced link for volto-slate [Miu Razvan - [`98eff6a`](https://github.com/eea/volto-bise/commit/98eff6a06e0276b073d0212aeeb99ae0dbd3392e)]
- New theme colors and logo [Miu Razvan - [`0108ed1`](https://github.com/eea/volto-bise/commit/0108ed1ad22c2ea5351e1e96d5a1877d542e8816)]
### [2.0.3](https://github.com/eea/volto-bise/compare/2.0.2...2.0.3) - 8 December 2022

### [2.0.2](https://github.com/eea/volto-bise/compare/2.0.1...2.0.2) - 4 November 2022

### [2.0.1](https://github.com/eea/volto-bise/compare/2.0.0...2.0.1) - 2 November 2022
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eeacms/volto-bise",
"version": "2.0.3",
"version": "2.0.4",
"description": "Volto theme and integration for BISE",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@lightGreenColor: #3c8000;
@lightGreenColor: #005248;

.block-image.wrapper {
.title {
Expand Down
133 changes: 132 additions & 1 deletion src/customizations/volto/components/theme/Logo/Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
102 changes: 102 additions & 0 deletions src/customizations/volto/components/theme/Logo/_Logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ const installStyles = (config) => {
config.blocks.blocksConfig.columnsBlock || {};
config.blocks.blocksConfig.columnsBlock.available_colors = [
'#3c8000',
'005248',
'#f4cf01',
'#ffffff',
'#f7f7f7',
Expand All @@ -61,6 +62,7 @@ const installStyles = (config) => {
config.settings.available_colors = [
'#1f6237',
'#3c8000',
'005248',
'#3B7F02',
'#7AC943',
'#88c24f',
Expand Down
16 changes: 12 additions & 4 deletions theme/site/collections/menu.overrides
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,15 @@

.firstLevel {
padding: 1em 1.2em !important;
color: @lightGreenColor;
color: @darkGreenColor;
font-size: 17px;
font-weight: 700 !important;
line-height: 1;

a {
color: @darkGreenColor;
}

@media (max-width: 848px) {
border-color: transparent !important;
border-radius: 0 !important;
Expand All @@ -73,12 +77,16 @@
}

&:hover > a {
color: @darkGreenColor!important;
color: @lightGreenColor!important;
}
}

.menuActive.firstLevel {
color: @darkGreenColor;
color: @lightGreenColor;

a {
color: @lightGreenColor;
}
}

div.item.firstLevel {
Expand Down Expand Up @@ -399,7 +407,7 @@

.secondLevel:hover {
background-color: transparent !important;
color: #3c8000;
color: #005248;
}

.secondLevel,
Expand Down
4 changes: 2 additions & 2 deletions theme/site/globals/site.overrides
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ p > span:empty {
border-left: 1px solid #b8c6c8;
background-color: transparent !important;
border-radius: 0 0 0 0;
color: #3c8000 !important;
color: #005248 !important;
transform: scale(1.25);

svg {
Expand Down Expand Up @@ -343,7 +343,7 @@ p > span:empty {

button {
border: 0;
background-color: #3c8000;
background-color: #005248;
color: white;

&:hover {
Expand Down
4 changes: 2 additions & 2 deletions theme/site/globals/site.variables
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@

/*--- Theme colors ---*/

@lightGreenColor : #3c8000;
@darkGreenColor : #003300;
@lightGreenColor : #00A390;
@darkGreenColor : #005248;

/*-------------------
Brand Colors
Expand Down

0 comments on commit db93d63

Please sign in to comment.