MaDgIK
/
open-science-observatory-ui
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted the color palette and fixed a margin in the mobile menu

This commit is contained in:
Stefania Martziou 2021-04-13 12:32:15 +00:00
parent 8527ca8568
commit f8c0e7d96a
7 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/app/chart-palettes.ts
View File

@ -1,11 +1,12 @@
// export const publicationColor = '#F181AE';
// export const publicationTooltipColor = '#a52e5d';
export const publicationColor = '#263C7E';
export const publicationTooltipColor = '#1c2d5e';
export const publicationBackgroundColor = '#8197D9';
export const publicationColor = '#F181AE';
export const publicationTooltipColor = '#a52e5d';
export const publicationBackgroundColor = '#f8d5e3';
// export const publicationColor = '#263C7E';
// export const publicationTooltipColor = '#1c2d5e';
// export const publicationBackgroundColor = '#8197D9';
// export const datasetColor = '#A98BD4';
export const datasetColor = '#916AC8';
export const datasetColor = '#A98BD4';
// export const datasetColor = '#916AC8';
export const datasetTooltipColor = '#7658a1';
export const datasetBackgroundColor = '#e2daf0';
@ -23,11 +24,11 @@ export const journalsBackgroundColor = '#FBE8B1';
export const policiesColor = '#639C66';
export const policiesTooltipColor = '#306933';
// export const softwareColor = '#C2155A';
export const softwareColor = '#9C0D38';
export const softwareColor = '#C2155A';
// export const softwareColor = '#9C0D38';
// export const otherResearchProductsColor = '#00CCCC';
export const otherResearchProductsColor = '#17BEBB';
export const otherResearchProductsColor = '#00CCCC';
// export const otherResearchProductsColor = '#17BEBB';
export const nonOAColor = '#787878';

6
src/app/shared/topmenu/top-menu.component.html
View File

@ -122,9 +122,9 @@
<button class="uk-offcanvas-close" type="button" uk-close></button>
<ul class="uk-nav uk-nav-default">
<li [routerLinkActive]="['uk-active']"><a routerLink="/home" [routerLinkActive]="['uk-active']" class="uk-offcanvas-close custom-offcanvas-close">Home</a></li>
<li [routerLinkActive]="['uk-active']"><a [routerLink]="['/overview', 'europe']" [routerLinkActive]="['uk-active']" class="uk-offcanvas-close custom-offcanvas-close">OA in Europe</a></li>
<li class="uk-parent" [routerLinkActive]="['uk-active']">
<li [routerLinkActive]="['uk-active']" class="uk-margin-top"><a routerLink="/home" [routerLinkActive]="['uk-active']" class="uk-offcanvas-close custom-offcanvas-close">Home</a></li>
<li [routerLinkActive]="['uk-active']" class="uk-margin-top"><a [routerLink]="['/overview', 'europe']" [routerLinkActive]="['uk-active']" class="uk-offcanvas-close custom-offcanvas-close">OA in Europe</a></li>
<li class="uk-parent uk-margin-top" [routerLinkActive]="['uk-active']">
<a href="#">Methodology</a>
<ul class="uk-nav-sub">
<li><a routerLink="/methodology" routerLinkActive="uk-active" class="uk-offcanvas-close custom-offcanvas-close">Overview</a></li>

33
src/assets/css/os-observatory-custom.css
View File

@ -10,26 +10,31 @@
--link-color: #EC4386;
--link-hover-color: #CA4D9A;
/*--publication-color: #F17AA9;*/
--publication-color: #263C7E;
/*--publication-background-color: #f8d5e3;*/
--publication-background-color: #8197D9;
/*--dataset-color: #A98BD4;*/
--dataset-color: #916AC8;
--publication-color: #F17AA9;
/*--publication-color: #263C7E;*/
--publication-background-color: #f8d5e3;
/*--publication-background-color: #8197D9;*/
--dataset-color: #A98BD4;
/*--dataset-color: #916AC8;*/
--dataset-background-color: #e2daf0;
/*--software-color: #C2155A;*/
--software-color: #9C0D38;
--software-color: #C2155A;
/*--software-color: #9C0D38;*/
--software-background-color: #F2D0DE;
/*--other-color: #00CCCC;*/
--other-color: #17BEBB;
--other-color: #00CCCC;
/*--other-color: #17BEBB;*/
--other-background-color: #CCF4F4;
/*--repository-color: #708AA5;*/
/*--repository-background-color: #ADD3E0;*/
--repository-color: #639C66;
--repository-background-color: #D4ECD6;
--repository-color: #708AA5;
--repository-background-color: #ADD3E0;
/*--repository-color: #639C66;*/
/*--repository-background-color: #D4ECD6;*/
--journal-color: #FFCE4E;
--journal-background-color: #FBE8B1;
--policies-color: #639C66;
--policies-background-color: #D4ECD6;

2
src/assets/img/icons/publications-icon-bak.svg → src/assets/img/icons/publications-icon-bak-blue.svg
View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="39.79" height="40" viewBox="0 0 39.79 40"><defs><style>.a{fill:#f8d5e3;}.b{fill:#f17aa9;}</style></defs><g transform="translate(0)"><path class="a" d="M6.033,0H27c5.2,0,6,4.213,6,9.41V23.595c0,5.2-.808,9.41-6,9.41H6.033C.836,33,0,28.792,0,23.595V9.41C0,4.213.836,0,6.033,0Z" transform="translate(0.601 6.207)"/><path class="b" d="M29.96,44.006H4.246A4.257,4.257,0,0,1,0,39.76V13.5A4.257,4.257,0,0,1,4.246,9.25H29.96A4.257,4.257,0,0,1,34.206,13.5V39.76a4.257,4.257,0,0,1-4.246,4.246ZM4.246,11.518A1.984,1.984,0,0,0,2.268,13.5V39.76a1.978,1.978,0,0,0,1.978,1.978H29.96a1.978,1.978,0,0,0,1.978-1.978h0V13.5a1.978,1.978,0,0,0-1.978-1.978Z" transform="translate(0 -4.006)"/><path class="b" d="M31.042,50.823H16.257A1.066,1.066,0,1,1,16.1,48.7a.692.692,0,0,1,.153,0H31.042a1.066,1.066,0,1,1,.153,2.126Z" transform="translate(-6.546 -21.089)"/><path class="b" d="M31.1,40.312H16.316a1.066,1.066,0,0,1,0-2.132H31.1a1.066,1.066,0,1,1,0,2.132Z" transform="translate(-6.605 -16.536)"/><path class="b" d="M31.042,29.793H16.257a1.066,1.066,0,1,1-.153-2.126.692.692,0,0,1,.153,0H31.042a1.066,1.066,0,1,1,.153,2.126Z" transform="translate(-6.546 -11.981)"/><path class="b" d="M44.157,33.141a1.134,1.134,0,0,1-1.134-1.134V4.229a1.99,1.99,0,0,0-1.978-1.961H13.834a1.134,1.134,0,0,1,0-2.268H41.045a4.257,4.257,0,0,1,4.246,4.246V32.024A1.134,1.134,0,0,1,44.157,33.141Z" transform="translate(-5.5)"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="39.79" height="40" viewBox="0 0 39.79 40"><defs><style>.a{fill:#8197D9;}.b{fill:#263C7E;}</style></defs><g transform="translate(0)"><path class="a" d="M6.033,0H27c5.2,0,6,4.213,6,9.41V23.595c0,5.2-.808,9.41-6,9.41H6.033C.836,33,0,28.792,0,23.595V9.41C0,4.213.836,0,6.033,0Z" transform="translate(0.601 6.207)"/><path class="b" d="M29.96,44.006H4.246A4.257,4.257,0,0,1,0,39.76V13.5A4.257,4.257,0,0,1,4.246,9.25H29.96A4.257,4.257,0,0,1,34.206,13.5V39.76a4.257,4.257,0,0,1-4.246,4.246ZM4.246,11.518A1.984,1.984,0,0,0,2.268,13.5V39.76a1.978,1.978,0,0,0,1.978,1.978H29.96a1.978,1.978,0,0,0,1.978-1.978h0V13.5a1.978,1.978,0,0,0-1.978-1.978Z" transform="translate(0 -4.006)"/><path class="b" d="M31.042,50.823H16.257A1.066,1.066,0,1,1,16.1,48.7a.692.692,0,0,1,.153,0H31.042a1.066,1.066,0,1,1,.153,2.126Z" transform="translate(-6.546 -21.089)"/><path class="b" d="M31.1,40.312H16.316a1.066,1.066,0,0,1,0-2.132H31.1a1.066,1.066,0,1,1,0,2.132Z" transform="translate(-6.605 -16.536)"/><path class="b" d="M31.042,29.793H16.257a1.066,1.066,0,1,1-.153-2.126.692.692,0,0,1,.153,0H31.042a1.066,1.066,0,1,1,.153,2.126Z" transform="translate(-6.546 -11.981)"/><path class="b" d="M44.157,33.141a1.134,1.134,0,0,1-1.134-1.134V4.229a1.99,1.99,0,0,0-1.978-1.961H13.834a1.134,1.134,0,0,1,0-2.268H41.045a4.257,4.257,0,0,1,4.246,4.246V32.024A1.134,1.134,0,0,1,44.157,33.141Z" transform="translate(-5.5)"/></g></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
src/assets/img/icons/publications-icon.svg
View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="39.79" height="40" viewBox="0 0 39.79 40"><defs><style>.a{fill:#8197D9;}.b{fill:#263C7E;}</style></defs><g transform="translate(0)"><path class="a" d="M6.033,0H27c5.2,0,6,4.213,6,9.41V23.595c0,5.2-.808,9.41-6,9.41H6.033C.836,33,0,28.792,0,23.595V9.41C0,4.213.836,0,6.033,0Z" transform="translate(0.601 6.207)"/><path class="b" d="M29.96,44.006H4.246A4.257,4.257,0,0,1,0,39.76V13.5A4.257,4.257,0,0,1,4.246,9.25H29.96A4.257,4.257,0,0,1,34.206,13.5V39.76a4.257,4.257,0,0,1-4.246,4.246ZM4.246,11.518A1.984,1.984,0,0,0,2.268,13.5V39.76a1.978,1.978,0,0,0,1.978,1.978H29.96a1.978,1.978,0,0,0,1.978-1.978h0V13.5a1.978,1.978,0,0,0-1.978-1.978Z" transform="translate(0 -4.006)"/><path class="b" d="M31.042,50.823H16.257A1.066,1.066,0,1,1,16.1,48.7a.692.692,0,0,1,.153,0H31.042a1.066,1.066,0,1,1,.153,2.126Z" transform="translate(-6.546 -21.089)"/><path class="b" d="M31.1,40.312H16.316a1.066,1.066,0,0,1,0-2.132H31.1a1.066,1.066,0,1,1,0,2.132Z" transform="translate(-6.605 -16.536)"/><path class="b" d="M31.042,29.793H16.257a1.066,1.066,0,1,1-.153-2.126.692.692,0,0,1,.153,0H31.042a1.066,1.066,0,1,1,.153,2.126Z" transform="translate(-6.546 -11.981)"/><path class="b" d="M44.157,33.141a1.134,1.134,0,0,1-1.134-1.134V4.229a1.99,1.99,0,0,0-1.978-1.961H13.834a1.134,1.134,0,0,1,0-2.268H41.045a4.257,4.257,0,0,1,4.246,4.246V32.024A1.134,1.134,0,0,1,44.157,33.141Z" transform="translate(-5.5)"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="39.79" height="40" viewBox="0 0 39.79 40"><defs><style>.a{fill:#f8d5e3;}.b{fill:#f17aa9;}</style></defs><g transform="translate(0)"><path class="a" d="M6.033,0H27c5.2,0,6,4.213,6,9.41V23.595c0,5.2-.808,9.41-6,9.41H6.033C.836,33,0,28.792,0,23.595V9.41C0,4.213.836,0,6.033,0Z" transform="translate(0.601 6.207)"/><path class="b" d="M29.96,44.006H4.246A4.257,4.257,0,0,1,0,39.76V13.5A4.257,4.257,0,0,1,4.246,9.25H29.96A4.257,4.257,0,0,1,34.206,13.5V39.76a4.257,4.257,0,0,1-4.246,4.246ZM4.246,11.518A1.984,1.984,0,0,0,2.268,13.5V39.76a1.978,1.978,0,0,0,1.978,1.978H29.96a1.978,1.978,0,0,0,1.978-1.978h0V13.5a1.978,1.978,0,0,0-1.978-1.978Z" transform="translate(0 -4.006)"/><path class="b" d="M31.042,50.823H16.257A1.066,1.066,0,1,1,16.1,48.7a.692.692,0,0,1,.153,0H31.042a1.066,1.066,0,1,1,.153,2.126Z" transform="translate(-6.546 -21.089)"/><path class="b" d="M31.1,40.312H16.316a1.066,1.066,0,0,1,0-2.132H31.1a1.066,1.066,0,1,1,0,2.132Z" transform="translate(-6.605 -16.536)"/><path class="b" d="M31.042,29.793H16.257a1.066,1.066,0,1,1-.153-2.126.692.692,0,0,1,.153,0H31.042a1.066,1.066,0,1,1,.153,2.126Z" transform="translate(-6.546 -11.981)"/><path class="b" d="M44.157,33.141a1.134,1.134,0,0,1-1.134-1.134V4.229a1.99,1.99,0,0,0-1.978-1.961H13.834a1.134,1.134,0,0,1,0-2.268H41.045a4.257,4.257,0,0,1,4.246,4.246V32.024A1.134,1.134,0,0,1,44.157,33.141Z" transform="translate(-5.5)"/></g></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

2
src/assets/img/icons/repositories-icon-bak.svg → src/assets/img/icons/repositories-icon-bak-green.svg
View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="43.077" height="40" viewBox="0 0 43.077 40"><defs><style>.a{fill:#c5e0e9;}.b{fill:#708aa5;}</style></defs><g transform="translate(0.024 0.006)"><g transform="translate(-0.024 -0.006)"><path class="a" d="M22.834,1.97l-19.5,9.123,7.146,4.494L2.79,19.808l7.419,4.744-6.9,3.813L22.791,39.891l19.919-9.26L34.992,25.92l7.718-3.911-7.446-5.354,7.446-3.633Z" transform="translate(-1.258 -0.894)"/><path class="b" d="M42.921,21.491a1.089,1.089,0,0,0-.447-1.482L35.7,16.289l6.721-3.045a1.089,1.089,0,0,0,.054-1.945L22.071.128A1.089,1.089,0,0,0,21.1.09L.632,9.35A1.089,1.089,0,0,0,.12,9.8a1.089,1.089,0,0,0,.414,1.476L7.332,15l-6.7,3.034a1.089,1.089,0,0,0-.1,1.95l6.792,3.726L.632,26.741a1.1,1.1,0,0,0-.1,1.95L8.78,33.223l12.228,6.634a1,1,0,0,0,.545.136,1.029,1.029,0,0,0,.425-.076l20.442-9.26a1.057,1.057,0,0,0,.5-.463,1.089,1.089,0,0,0-.447-1.482L35.7,25l6.716-3.045A1.089,1.089,0,0,0,42.921,21.491ZM9.794,13.843,3.53,10.412,21.5,2.3,39.571,12.16l-6.258,2.827L30.84,16.1,24.593,18.92l-2.478,1.122-.517.234-.61-.332-2.4-1.307-6.329-3.459-2.4-1.307Zm29.778,15.73L21.6,37.69l-11.8-6.433L3.53,27.825,9.739,25.02l11.27,6.133a1.051,1.051,0,0,0,.545.136,1.128,1.128,0,0,0,.425-.076l11.237-5.071Zm-6.253-5.883-2.473,1.089-9.26,4.178-9.33-5.071-2.4-1.313H9.815L3.53,19.121l6.215-2.783,6.346,3.448,2.4,1.307,2.522,1.373a1,1,0,0,0,.545.136,1.029,1.029,0,0,0,.425-.076L24.5,21.354l2.473-1.122,6.242-2.805,6.34,3.464Z" transform="translate(0.024 0.006)"/></g></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="43.077" height="40" viewBox="0 0 43.077 40"><defs><style>.a{fill:#D4ECD6;}.b{fill:#639C66;}</style></defs><g transform="translate(0.024 0.006)"><g transform="translate(-0.024 -0.006)"><path class="a" d="M22.834,1.97l-19.5,9.123,7.146,4.494L2.79,19.808l7.419,4.744-6.9,3.813L22.791,39.891l19.919-9.26L34.992,25.92l7.718-3.911-7.446-5.354,7.446-3.633Z" transform="translate(-1.258 -0.894)"/><path class="b" d="M42.921,21.491a1.089,1.089,0,0,0-.447-1.482L35.7,16.289l6.721-3.045a1.089,1.089,0,0,0,.054-1.945L22.071.128A1.089,1.089,0,0,0,21.1.09L.632,9.35A1.089,1.089,0,0,0,.12,9.8a1.089,1.089,0,0,0,.414,1.476L7.332,15l-6.7,3.034a1.089,1.089,0,0,0-.1,1.95l6.792,3.726L.632,26.741a1.1,1.1,0,0,0-.1,1.95L8.78,33.223l12.228,6.634a1,1,0,0,0,.545.136,1.029,1.029,0,0,0,.425-.076l20.442-9.26a1.057,1.057,0,0,0,.5-.463,1.089,1.089,0,0,0-.447-1.482L35.7,25l6.716-3.045A1.089,1.089,0,0,0,42.921,21.491ZM9.794,13.843,3.53,10.412,21.5,2.3,39.571,12.16l-6.258,2.827L30.84,16.1,24.593,18.92l-2.478,1.122-.517.234-.61-.332-2.4-1.307-6.329-3.459-2.4-1.307Zm29.778,15.73L21.6,37.69l-11.8-6.433L3.53,27.825,9.739,25.02l11.27,6.133a1.051,1.051,0,0,0,.545.136,1.128,1.128,0,0,0,.425-.076l11.237-5.071Zm-6.253-5.883-2.473,1.089-9.26,4.178-9.33-5.071-2.4-1.313H9.815L3.53,19.121l6.215-2.783,6.346,3.448,2.4,1.307,2.522,1.373a1,1,0,0,0,.545.136,1.029,1.029,0,0,0,.425-.076L24.5,21.354l2.473-1.122,6.242-2.805,6.34,3.464Z" transform="translate(0.024 0.006)"/></g></g></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

2
src/assets/img/icons/repositories-icon.svg
View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="43.077" height="40" viewBox="0 0 43.077 40"><defs><style>.a{fill:#D4ECD6;}.b{fill:#639C66;}</style></defs><g transform="translate(0.024 0.006)"><g transform="translate(-0.024 -0.006)"><path class="a" d="M22.834,1.97l-19.5,9.123,7.146,4.494L2.79,19.808l7.419,4.744-6.9,3.813L22.791,39.891l19.919-9.26L34.992,25.92l7.718-3.911-7.446-5.354,7.446-3.633Z" transform="translate(-1.258 -0.894)"/><path class="b" d="M42.921,21.491a1.089,1.089,0,0,0-.447-1.482L35.7,16.289l6.721-3.045a1.089,1.089,0,0,0,.054-1.945L22.071.128A1.089,1.089,0,0,0,21.1.09L.632,9.35A1.089,1.089,0,0,0,.12,9.8a1.089,1.089,0,0,0,.414,1.476L7.332,15l-6.7,3.034a1.089,1.089,0,0,0-.1,1.95l6.792,3.726L.632,26.741a1.1,1.1,0,0,0-.1,1.95L8.78,33.223l12.228,6.634a1,1,0,0,0,.545.136,1.029,1.029,0,0,0,.425-.076l20.442-9.26a1.057,1.057,0,0,0,.5-.463,1.089,1.089,0,0,0-.447-1.482L35.7,25l6.716-3.045A1.089,1.089,0,0,0,42.921,21.491ZM9.794,13.843,3.53,10.412,21.5,2.3,39.571,12.16l-6.258,2.827L30.84,16.1,24.593,18.92l-2.478,1.122-.517.234-.61-.332-2.4-1.307-6.329-3.459-2.4-1.307Zm29.778,15.73L21.6,37.69l-11.8-6.433L3.53,27.825,9.739,25.02l11.27,6.133a1.051,1.051,0,0,0,.545.136,1.128,1.128,0,0,0,.425-.076l11.237-5.071Zm-6.253-5.883-2.473,1.089-9.26,4.178-9.33-5.071-2.4-1.313H9.815L3.53,19.121l6.215-2.783,6.346,3.448,2.4,1.307,2.522,1.373a1,1,0,0,0,.545.136,1.029,1.029,0,0,0,.425-.076L24.5,21.354l2.473-1.122,6.242-2.805,6.34,3.464Z" transform="translate(0.024 0.006)"/></g></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="43.077" height="40" viewBox="0 0 43.077 40"><defs><style>.a{fill:#c5e0e9;}.b{fill:#708aa5;}</style></defs><g transform="translate(0.024 0.006)"><g transform="translate(-0.024 -0.006)"><path class="a" d="M22.834,1.97l-19.5,9.123,7.146,4.494L2.79,19.808l7.419,4.744-6.9,3.813L22.791,39.891l19.919-9.26L34.992,25.92l7.718-3.911-7.446-5.354,7.446-3.633Z" transform="translate(-1.258 -0.894)"/><path class="b" d="M42.921,21.491a1.089,1.089,0,0,0-.447-1.482L35.7,16.289l6.721-3.045a1.089,1.089,0,0,0,.054-1.945L22.071.128A1.089,1.089,0,0,0,21.1.09L.632,9.35A1.089,1.089,0,0,0,.12,9.8a1.089,1.089,0,0,0,.414,1.476L7.332,15l-6.7,3.034a1.089,1.089,0,0,0-.1,1.95l6.792,3.726L.632,26.741a1.1,1.1,0,0,0-.1,1.95L8.78,33.223l12.228,6.634a1,1,0,0,0,.545.136,1.029,1.029,0,0,0,.425-.076l20.442-9.26a1.057,1.057,0,0,0,.5-.463,1.089,1.089,0,0,0-.447-1.482L35.7,25l6.716-3.045A1.089,1.089,0,0,0,42.921,21.491ZM9.794,13.843,3.53,10.412,21.5,2.3,39.571,12.16l-6.258,2.827L30.84,16.1,24.593,18.92l-2.478,1.122-.517.234-.61-.332-2.4-1.307-6.329-3.459-2.4-1.307Zm29.778,15.73L21.6,37.69l-11.8-6.433L3.53,27.825,9.739,25.02l11.27,6.133a1.051,1.051,0,0,0,.545.136,1.128,1.128,0,0,0,.425-.076l11.237-5.071Zm-6.253-5.883-2.473,1.089-9.26,4.178-9.33-5.071-2.4-1.313H9.815L3.53,19.121l6.215-2.783,6.346,3.448,2.4,1.307,2.522,1.373a1,1,0,0,0,.545.136,1.029,1.029,0,0,0,.425-.076L24.5,21.354l2.473-1.122,6.242-2.805,6.34,3.464Z" transform="translate(0.024 0.006)"/></g></g></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB