From fa7d0f7da36b124ff7dc2585f3a76cc20446efbf Mon Sep 17 00:00:00 2001 From: Oleh Zasadnyy Date: Sun, 10 Sep 2017 11:52:35 +0200 Subject: [PATCH] About organizer block (#315) * Initial commit for about organizer block * Add initial photo grid to about organizers block * Update about organizer block * Fix mobile view --- data/resources.json | 21 + index.html | 1 - src/elements/about-organizer-block.html | 87 +++ src/elements/dialogs/session-details.html | 2 +- src/elements/dialogs/speaker-details.html | 2 +- src/elements/hoverboard-icons.html | 14 + src/elements/shared-styles.html | 20 +- src/pages/home-page.html | 2 + src/pages/post-page.html | 19 +- yarn.lock | 667 +--------------------- 10 files changed, 150 insertions(+), 685 deletions(-) create mode 100644 src/elements/about-organizer-block.html diff --git a/data/resources.json b/data/resources.json index 1fabdb0..a2addb8 100644 --- a/data/resources.json +++ b/data/resources.json @@ -207,5 +207,26 @@ }, "speakerDetails": { "sessions": "Sessions" + }, + "aboutOrganizerBlock": { + "blocks": [ + { + "title": "Organizer", + "description": "GDG Lviv with support of 10 GDGs from all around Ukraine is proud organizer of DevFest Ukraine", + "callToAction": { + "label": "Open team page", + "link": "/team" + } + }, + { + "title": "What is GDG?", + "description": "Google Developers Group (GDG) - is open and volunteer geek community who create exciting projects and share experience about Google technologies with a passion", + "callToAction": { + "label": "Read more", + "link": "https://developers.google.com/groups/", + "newTab": true + } + } + ] } } diff --git a/index.html b/index.html index b1bfe34..c2c9050 100644 --- a/index.html +++ b/index.html @@ -120,7 +120,6 @@ font-size: 16px; line-height: 1.5; min-height: 100vh; - background-color: #FAFAFA; } /* styling for render while resources are loading */ diff --git a/src/elements/about-organizer-block.html b/src/elements/about-organizer-block.html new file mode 100644 index 0000000..e683355 --- /dev/null +++ b/src/elements/about-organizer-block.html @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + diff --git a/src/elements/dialogs/session-details.html b/src/elements/dialogs/session-details.html index c5bae29..0976bac 100644 --- a/src/elements/dialogs/session-details.html +++ b/src/elements/dialogs/session-details.html @@ -61,7 +61,7 @@

{$ sessionDetails.conten [[session.complexity]]

-
+
diff --git a/src/elements/dialogs/speaker-details.html b/src/elements/dialogs/speaker-details.html index f92bf1c..b9f3aa1 100644 --- a/src/elements/dialogs/speaker-details.html +++ b/src/elements/dialogs/speaker-details.html @@ -80,7 +80,7 @@

-
+
diff --git a/src/elements/hoverboard-icons.html b/src/elements/hoverboard-icons.html index 976f655..e90eaa8 100644 --- a/src/elements/hoverboard-icons.html +++ b/src/elements/hoverboard-icons.html @@ -235,6 +235,20 @@ + + + + + + + + + + + + + + diff --git a/src/elements/shared-styles.html b/src/elements/shared-styles.html index 0ecb395..ad034b9 100644 --- a/src/elements/shared-styles.html +++ b/src/elements/shared-styles.html @@ -26,7 +26,7 @@ --error-color: #e64a19; /* Custom */ - --default-background-color: #FAFAFA; + --default-background-color: #FFFFFF; --secondary-background-color: #F5F5F5; --additional-background-color: #f7f7f7; --contrast-additional-background-color: #e8e8e8; @@ -89,7 +89,6 @@ body { font-family: var(--font-family); text-rendering: optimizeLegibility; - background-color: #fafafa; color: var(--primary-text-color); } @@ -146,23 +145,6 @@ --iron-icon-width: 48px; } - [slot="markdown-html"] { - font-size: 18px; - line-height: 1.8; - color: var(--primary-text-color); - } - - [slot="markdown-html"] h1, - [slot="markdown-html"] h2, - [slot="markdown-html"] h3 { - margin: 48px 0 16px; - } - - [slot="markdown-html"] p { - margin-top: 0; - margin-bottom: 24px; - } - .gde-b { background-color: var(--gde); } diff --git a/src/pages/home-page.html b/src/pages/home-page.html index cb8327e..af5344d 100644 --- a/src/pages/home-page.html +++ b/src/pages/home-page.html @@ -8,6 +8,7 @@ +