Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(links): fix link colours - INNO-866 #557

Merged
merged 11 commits into from
Feb 6, 2018
3 changes: 2 additions & 1 deletion framework/base/variables/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ $ecl-colors: (
grey-25: #cfcfcf,
grey-15: #e3e3e3,
grey-10: #ebebeb,
grey-5: #f5f5f5
grey-5: #f5f5f5,
purple-100: #550745
)
!default;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ module.exports = {
src: '../../assets/demo_images/technics-demo-1.jpg',
alt: 'Technic picture',
},
link: {
href: '#featured-item-1',
label: 'See more',
},
metas: ['announcement', '21 December 2016'],
title: 'Energy Union tour',
},
Expand All @@ -38,7 +42,7 @@ module.exports = {
metas: ['announcement', '21 December 2016'],
title: 'Energy Union tour',
link: {
href: '#',
href: '#featured-item-2',
label: 'See more',
},
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion framework/components/ecl-links/_links-mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@

&:hover,
&:focus {
color: $ecl-color-shade;
color: #000;
}
&:visited {
color: map-get($ecl-colors, 'purple-100');
}
}

Expand Down
5 changes: 3 additions & 2 deletions framework/components/ecl-links/_links.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@
color: #fff;

&:hover,
&:focus {
color: map-get($ecl-colors, 'grey-25');
&:focus,
&:visited {
color: #fff;
}
}

Expand Down
4 changes: 4 additions & 0 deletions framework/components/ecl-list-items/ecl-list-items.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ module.exports = {
name: 'default',
label: 'Default list item',
context: {
href: '#list-item-1',
metas: ['Service department', 'PMO'],
title: 'Administration and Payment of Individual Entitlements',
},
Expand All @@ -32,6 +33,7 @@ module.exports = {
day: '07',
month: 'Sep',
},
href: '#list-item-2',
title:
"Citizens' Dialogue in Kraków with Commissioner Elżbieta Bieńkowska",
detail:
Expand All @@ -44,6 +46,7 @@ module.exports = {
context: {
metas: ['Director-General'],
title: 'John Doe',
href: '#list-item-3',
primary_image: {
src: '../../assets/demo_images/default_profile_image.png',
alt: 'Director-General John Doe',
Expand All @@ -56,6 +59,7 @@ module.exports = {
context: {
variant: 'highlight',
title: 'State of European Union 2017',
href: '#list-item-4',
primary_image: {
src: '../../assets/demo_images/nature-demo-1.jpg',
alt: 'Highlighted image',
Expand Down
12 changes: 12 additions & 0 deletions framework/components/ecl-listings/ecl-listings.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const itemsDate = [
day: '07',
month: 'Sep',
},
href: '#listing-date-1',
screen_reader: 'Event 07/09, Bucharest, Romania',
title:
"Citizens' Dialogue in Bucharest with Commissioner Corina Crețu and the President of the European Committee of the Regions Karl-Heinz Lambertz",
Expand All @@ -19,6 +20,7 @@ const itemsDate = [
day: '08',
month: 'Sep',
},
href: '#listing-date-2',
screen_reader: 'Event 08/09, Kraków, Poland',
title: "Citizens' Dialogue in Kraków with Commissioner Elżbieta Bieńkowska",
detail:
Expand All @@ -31,6 +33,7 @@ const itemsDate = [
day: '14',
month: 'Sep',
},
href: '#listing-date-3',
screen_reader: 'Event 14/09, Tallin, Estonia',
title: "Citizens' Dialogue in Tallin with Vice-President Jyrki Katainen",
detail:
Expand All @@ -42,34 +45,40 @@ const itemsDefault = [
{
screen_reader: 'List item: Business, Economy, Euro',
title: 'Business, Economy, Euro',
href: '#listing-three-columns-1',
detail:
'EU economy, the euro, and practical information for EU businesses and entrepreneurs.',
},
{
screen_reader: 'List item: About the European Union',
title: 'About the European Union',
href: '#listing-three-columns-2',
detail: 'The EU and its institutions, how to visit and work at the EU.',
},
{
screen_reader: 'List item: Live, Work, Travel in EU',
title: 'Live, Work, Travel in EU',
href: '#listing-three-columns-3',
detail:
'Advice on living, working or travelling in the EU, on visas and immigration for non-EU citizens, European culture.',
},
{
screen_reader: 'List item: Funding, Tenders',
title: 'Funding, Tenders',
href: '#listing-three-columns-4',
detail: 'EU funding, grants, tenders, and how to apply.',
},
{
screen_reader: 'List item: Law',
title: 'Law',
href: '#listing-three-columns-5',
detail:
'EU law and judgments, how EU law is applied, public consultations, data protection, infringements, fraud, serious crime.',
},
{
screen_reader: 'List item: Research and innovation',
title: 'Research and innovation',
href: '#listing-three-columns-6',
detail:
'Research funding, partners, results, and EU action to promote innovation.',
},
Expand Down Expand Up @@ -108,6 +117,7 @@ const itemsThumbnails = [
metas: ['Director-General'],
screen_reader: 'List item: Director-General John Doe',
title: 'John Doe',
href: '#listing-thumb-1',
primary_image: {
src: '../../assets/demo_images/default_profile_image.png',
alt: 'Director-General John Doe',
Expand All @@ -117,6 +127,7 @@ const itemsThumbnails = [
metas: ['Deputy Director-General'],
screen_reader: 'List item: Deputy Director-General Jane Doe',
title: 'Jane Doe',
href: '#listing-thumb-2',
primary_image: {
src: '../../assets/demo_images/default_profile_image.png',
alt: 'Deputy Director-General Jane Doe',
Expand All @@ -126,6 +137,7 @@ const itemsThumbnails = [
metas: ['Acting Deputy Director-General'],
screen_reader: 'List item: Acting Deputy Director-General Jack Doe',
title: 'Jack Doe',
href: '#listing-thumb-3',
primary_image: {
src: '../../assets/demo_images/default_profile_image.png',
alt: 'Acting Deputy Director-General Jack Doe',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,22 @@
items: [
{
metas: ['Service department', 'PMO'],
href: '#listing-default-1',
title: 'Administration and Payment of Individual Entitlements',
},
{
metas: ['Directorate-General', 'AGRI'],
href: '#listing-default-2',
title: 'Agriculture and Rural Development',
},
{
metas: ['Directorate-General', 'BUDG'],
href: '#listing-default-3',
title: 'Budget',
},
{
metas: ['Directorate-General', 'CLIMA'],
href: '#listing-default-4',
title: 'Climate Action',
},
]
Expand All @@ -64,26 +68,32 @@
items: [
{
title: 'Business, Economy, Euro',
href: '#listing-default-two-1',
detail: 'EU economy, the euro, and practical information for EU businesses and entrepreneurs.'
},
{
title: 'About the European Union',
href: '#listing-default-two-2',
detail: 'The EU and its institutions, how to visit and work at the EU.'
},
{
title: 'Live, Work, Travel in EU',
href: '#listing-default-two-3',
detail: 'Advice on living, working or travelling in the EU, on visas and immigration for non-EU citizens, European culture.'
},
{
title: 'Funding, Tenders',
href: '#listing-default-two-4',
detail: 'EU funding, grants, tenders, and how to apply.'
},
{
title: 'Law',
href: '#listing-default-two-5',
detail: 'EU law and judgments, how EU law is applied, public consultations, data protection, infringements, fraud, serious crime.'
},
{
title: 'Research and innovation',
href: '#listing-default-two-6',
detail: 'Research funding, partners, results, and EU action to promote innovation.'
},
]
Expand All @@ -96,26 +106,32 @@
items: [
{
title: 'Business, Economy, Euro',
href: '#listing-default-three-1',
detail: 'EU economy, the euro, and practical information for EU businesses and entrepreneurs.'
},
{
title: 'About the European Union',
href: '#listing-default-three-2',
detail: 'The EU and its institutions, how to visit and work at the EU.'
},
{
title: 'Live, Work, Travel in EU',
href: '#listing-default-three-3',
detail: 'Advice on living, working or travelling in the EU, on visas and immigration for non-EU citizens, European culture.'
},
{
title: 'Funding, Tenders',
href: '#listing-default-three-4',
detail: 'EU funding, grants, tenders, and how to apply.'
},
{
title: 'Law',
href: '#listing-default-three-5',
detail: 'EU law and judgments, how EU law is applied, public consultations, data protection, infringements, fraud, serious crime.'
},
{
title: 'Research and innovation',
href: '#listing-default-three-6',
detail: 'Research funding, partners, results, and EU action to promote innovation.'
},
]
Expand All @@ -132,6 +148,7 @@
day: '07',
month: 'Sep',
},
href: '#listing-date-1',
title:
"Citizens' Dialogue in Bucharest with Commissioner Corina Crețu and the President of the European Committee of the Regions Karl-Heinz Lambertz",
detail:
Expand All @@ -144,6 +161,7 @@
day: '08',
month: 'Sep',
},
href: '#listing-date-2',
title: "Citizens' Dialogue in Kraków with Commissioner Elżbieta Bieńkowska",
detail:
'<small><span class="ecl-icon ecl-icon--location">Kraków, Poland</span> <span class="ecl-icon ecl-icon--livestreaming ecl-u-ml-s">live streaming available</span></small>',
Expand All @@ -155,6 +173,7 @@
day: '14',
month: 'Sep',
},
href: '#listing-date-3',
title:
"Citizens' Dialogue in Tallin with Vice-President Jyrki Katainen",
detail:
Expand All @@ -167,6 +186,7 @@
day: '19',
month: 'Sep',
},
href: '#listing-date-4',
title: "Citizens' Dialogue in Kaunas with Commissioner Vytenis Andriukaitis",
detail:
'<small><span class="ecl-icon ecl-icon--location">Kaunas, Lithuania</span> <span class="ecl-icon ecl-icon--livestreaming ecl-u-ml-s">live streaming available</span></small>',
Expand All @@ -186,6 +206,7 @@
day: '07',
month: 'Sep',
},
href: '#listing-date-two-1',
title:
"Citizens' Dialogue in Bucharest with Commissioner Corina Crețu and the President of the European Committee of the Regions Karl-Heinz Lambertz",
detail:
Expand All @@ -198,6 +219,7 @@
day: '08',
month: 'Sep',
},
href: '#listing-date-two-2',
title: "Citizens' Dialogue in Kraków with Commissioner Elżbieta Bieńkowska",
detail:
'<small><span class="ecl-icon ecl-icon--location">Kraków, Poland</span> <span class="ecl-icon ecl-icon--livestreaming ecl-u-ml-s">live streaming available</span></small>',
Expand All @@ -209,6 +231,7 @@
day: '14',
month: 'Sep',
},
href: '#listing-date-two-3',
title:
"Citizens' Dialogue in Tallin with Vice-President Jyrki Katainen",
detail:
Expand All @@ -221,6 +244,7 @@
day: '19',
month: 'Sep',
},
href: '#listing-date-two-4',
title: "Citizens' Dialogue in Kaunas with Commissioner Vytenis Andriukaitis",
detail:
'<small><span class="ecl-icon ecl-icon--location">Kaunas, Lithuania</span> <span class="ecl-icon ecl-icon--livestreaming ecl-u-ml-s">live streaming available</span></small>',
Expand All @@ -235,6 +259,7 @@
{
metas: ['Director-General'],
title: 'John Doe',
href: '#listing-thumbnail-one-1',
primary_image: {
src: '../../assets/demo_images/default_profile_image.png',
alt: 'Director-General John Doe',
Expand All @@ -243,6 +268,7 @@
{
metas: ['Deputy Director-General'],
title: 'Jane Doe',
href: '#listing-thumbnail-one-2',
primary_image: {
src: '../../assets/demo_images/default_profile_image.png',
alt: 'Deputy Director-General Jane Doe',
Expand All @@ -251,6 +277,7 @@
{
metas: ['Acting Deputy Director-General'],
title: 'Jack Doe',
href: '#listing-thumbnail-one-3',
primary_image: {
src: '../../assets/demo_images/default_profile_image.png',
alt: 'Acting Deputy Director-General Jack Doe',
Expand All @@ -267,6 +294,7 @@
{
metas: ['Director-General'],
title: 'John Doe',
href: '#listing-thumbnail-two-1',
primary_image: {
src: '../../assets/demo_images/default_profile_image.png',
alt: 'Director-General John Doe',
Expand All @@ -275,6 +303,7 @@
{
metas: ['Deputy Director-General'],
title: 'Jane Doe',
href: '#listing-thumbnail-two-2',
primary_image: {
src: '../../assets/demo_images/default_profile_image.png',
alt: 'Deputy Director-General Jane Doe',
Expand All @@ -283,6 +312,7 @@
{
metas: ['Acting Deputy Director-General'],
title: 'Jack Doe',
href: '#listing-thumbnail-two-3',
primary_image: {
src: '../../assets/demo_images/default_profile_image.png',
alt: 'Acting Deputy Director-General Jack Doe',
Expand Down Expand Up @@ -474,15 +504,15 @@
{
classes: 'ecl-footer__menu-item',
link: {
target: '#',
target: '#eu-institutions',
classes: 'ecl-link ecl-footer__link ecl-link--external',
title: 'EU institutions',
},
},
{
classes: 'ecl-footer__menu-item',
link: {
target: '#',
target: '#european-union',
classes: 'ecl-link ecl-footer__link ecl-link--external',
title: 'European Union',
},
Expand Down
Loading