From 509d8e84d7e457ccaa49c28cf8b6f289d6282d81 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Thu, 16 Feb 2017 16:58:27 -0500 Subject: [PATCH] Add new icons and format accordingly --- src/views/conference/2017/index/index.jsx | 96 +++++++++---------- src/views/conference/2017/index/index.scss | 8 +- .../svgs/conference/index/audience-icon.svg | 39 +------- .../svgs/conference/index/calendar-icon.svg | 33 +------ .../svgs/conference/index/language-icon.svg | 29 +----- static/svgs/conference/index/map-icon.svg | 21 +--- static/svgs/conference/index/website-icon.svg | 21 +--- 7 files changed, 59 insertions(+), 188 deletions(-) diff --git a/src/views/conference/2017/index/index.jsx b/src/views/conference/2017/index/index.jsx index 0bd7667df..fcaf8461a 100644 --- a/src/views/conference/2017/index/index.jsx +++ b/src/views/conference/2017/index/index.jsx @@ -47,9 +47,9 @@ var ConferenceSplash = React.createClass({ - - - -
+ Calendar Icon @@ -72,9 +72,9 @@ var ConferenceSplash = React.createClass({
+ Map Icon @@ -83,9 +83,9 @@ var ConferenceSplash = React.createClass({ {'Bordeaux, France'}
+ Audience Icon @@ -94,9 +94,9 @@ var ConferenceSplash = React.createClass({
+ Language Icon @@ -127,9 +127,9 @@ var ConferenceSplash = React.createClass({ - - - -
+ Calendar Icon @@ -152,9 +152,9 @@ var ConferenceSplash = React.createClass({
+ Map Icon @@ -163,9 +163,9 @@ var ConferenceSplash = React.createClass({ {'São Paulo, Brasil'}
+ Audience Icon @@ -174,9 +174,9 @@ var ConferenceSplash = React.createClass({
+ Language Icon @@ -207,9 +207,9 @@ var ConferenceSplash = React.createClass({ - - - -
+ Calendar Icon @@ -232,9 +232,9 @@ var ConferenceSplash = React.createClass({
+ Map Icon @@ -243,9 +243,9 @@ var ConferenceSplash = React.createClass({ {'Budapest, Hungary'}
+ Audience Icon @@ -254,9 +254,9 @@ var ConferenceSplash = React.createClass({
+ Language Icon @@ -288,9 +288,9 @@ var ConferenceSplash = React.createClass({ - - - -
+ Calendar Icon @@ -313,9 +313,9 @@ var ConferenceSplash = React.createClass({
+ Map Icon @@ -324,9 +324,9 @@ var ConferenceSplash = React.createClass({ {'Santiago, Chile'}
+ Audience Icon @@ -335,9 +335,9 @@ var ConferenceSplash = React.createClass({
+ Language Icon @@ -369,9 +369,9 @@ var ConferenceSplash = React.createClass({ - - - -
+ Calendar Icon @@ -382,9 +382,9 @@ var ConferenceSplash = React.createClass({
+ Map Icon @@ -393,9 +393,9 @@ var ConferenceSplash = React.createClass({ {'Shanghai, China'}
+ Audience Icon @@ -404,9 +404,9 @@ var ConferenceSplash = React.createClass({
+ Language Icon @@ -438,9 +438,9 @@ var ConferenceSplash = React.createClass({ - - - -
+ Calendar Icon @@ -463,9 +463,9 @@ var ConferenceSplash = React.createClass({
+ Map Icon @@ -474,9 +474,9 @@ var ConferenceSplash = React.createClass({ {'San José, Costa Rica'}
+ Audience Icon @@ -485,9 +485,9 @@ var ConferenceSplash = React.createClass({
+ Language Icon diff --git a/src/views/conference/2017/index/index.scss b/src/views/conference/2017/index/index.scss index deda862ad..4ba07f27e 100644 --- a/src/views/conference/2017/index/index.scss +++ b/src/views/conference/2017/index/index.scss @@ -55,13 +55,17 @@ margin: 2rem 0; } -.conf2017-panel-row > td { +td { padding: .75rem 1.25rem; vertical-align: top; } .conf2017-panel-row-icon { - width: 1.25rem; + padding: .375rem 1.25rem; +} + +.conf2017-panel-row-icon-image { + width: 1.75rem; } .button.mod-2017-panel { diff --git a/static/svgs/conference/index/audience-icon.svg b/static/svgs/conference/index/audience-icon.svg index 91dfeb4b2..fa0def95f 100644 --- a/static/svgs/conference/index/audience-icon.svg +++ b/static/svgs/conference/index/audience-icon.svg @@ -1,38 +1 @@ - -AudienceIcon -Created using Figma - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +AudienceIcon \ No newline at end of file diff --git a/static/svgs/conference/index/calendar-icon.svg b/static/svgs/conference/index/calendar-icon.svg index 1a5fa5f3e..ca47b9aa7 100644 --- a/static/svgs/conference/index/calendar-icon.svg +++ b/static/svgs/conference/index/calendar-icon.svg @@ -1,32 +1 @@ - -CalendarIcon -Created using Figma - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +CalendarIcon \ No newline at end of file diff --git a/static/svgs/conference/index/language-icon.svg b/static/svgs/conference/index/language-icon.svg index 8a7217cd2..4bf56022f 100644 --- a/static/svgs/conference/index/language-icon.svg +++ b/static/svgs/conference/index/language-icon.svg @@ -1,28 +1 @@ - -LanguageIcon -Created using Figma - - - - - - - - - - - - - - - - - - - - - - - - - +LanguageIcon \ No newline at end of file diff --git a/static/svgs/conference/index/map-icon.svg b/static/svgs/conference/index/map-icon.svg index c1cd05462..b78fcd8ae 100644 --- a/static/svgs/conference/index/map-icon.svg +++ b/static/svgs/conference/index/map-icon.svg @@ -1,20 +1 @@ - -MapIcon -Created using Figma - - - - - - - - - - - - - - - - - +MapIcon \ No newline at end of file diff --git a/static/svgs/conference/index/website-icon.svg b/static/svgs/conference/index/website-icon.svg index 4e06c2ad9..0dc12b66f 100644 --- a/static/svgs/conference/index/website-icon.svg +++ b/static/svgs/conference/index/website-icon.svg @@ -1,20 +1 @@ - -WebsiteIcon -Created using Figma - - - - - - - - - - - - - - - - - +WebsiteIcon \ No newline at end of file