Skip to content

Commit

Permalink
About organizer block (#315)
Browse files Browse the repository at this point in the history
* Initial commit for about organizer block

* Add initial photo grid to about organizers block

* Update about organizer block

* Fix mobile view
  • Loading branch information
ozasadnyy authored Sep 10, 2017
1 parent 0fa4c09 commit fa7d0f7
Show file tree
Hide file tree
Showing 10 changed files with 150 additions and 685 deletions.
21 changes: 21 additions & 0 deletions data/resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -207,5 +207,26 @@
},
"speakerDetails": {
"sessions": "Sessions"
},
"aboutOrganizerBlock": {
"blocks": [
{
"title": "Organizer",
"description": "<a href='http://lviv.gdg.org.ua' target='_blank'>GDG Lviv</a> 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
}
}
]
}
}
1 change: 0 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@
font-size: 16px;
line-height: 1.5;
min-height: 100vh;
background-color: #FAFAFA;
}
/* styling for render while resources are loading */

Expand Down
87 changes: 87 additions & 0 deletions src/elements/about-organizer-block.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<link rel="import" href="../../bower_components/polymer/polymer-element.html">

<link rel="import" href="../../bower_components/iron-icon/iron-icon.html">
<link rel="import" href="../../bower_components/paper-button/paper-button.html">
<link rel="import" href="../../bower_components/marked-element/marked-element.html">

<link rel="import" href="../mixins/redux-mixin.html">
<link rel="import" href="hoverboard-icons.html">

<dom-module id="about-organizer-block">
<template>
<style is="custom-style" include="shared-styles flex flex-alignment positioning"></style>

<style>
:host {
display: block;
}

.block:not(:last-of-type) {
margin-bottom: 32px;
}

.team-icon {
--iron-icon-height: 160px;
--iron-icon-width: 160px;
--iron-icon-fill-color: var(--default-primary-color);
max-width: 50%;
}

.description {
color: var(--secondary-text-color);
}

paper-button {
margin: 0;
}
</style>

<div class="container" layout horizontal>
<div layout horizontal center-center flex hidden$="[[viewport.isPhone]]">
<iron-icon class="team-icon" icon="hoverboard:team"></iron-icon>
</div>

<div class="description-block" flex>
{% for block in aboutOrganizerBlock.blocks %}
<div class="block">
<h2>{$ block.title $}</h2>
<marked-element class="description" markdown="{$ block.description $}">
<div slot="markdown-html"></div>
</marked-element>
<a
href="{$ block.callToAction.link $}"
{% if block.callToAction.newTab %}
target="_blank" rel="noopener noreferrer"
{% endif %}
>
<paper-button class="cta-button animated icon-right">
<span>{$ block.callToAction.label $}</span>
<iron-icon icon="hoverboard:arrow-right-circle"></iron-icon>
</paper-button>
</a>
</div>
{% endfor %}
</div>
</div>
</template>

<script>
class AboutOrganizerBlock extends ReduxMixin(Polymer.Element) {

static get is() {
return 'about-organizer-block'
}

static get properties() {
return {
viewport: {
type: Object,
statePath: 'ui.viewport'
}
}
}
}

customElements.define(AboutOrganizerBlock.is, AboutOrganizerBlock);
</script>
</dom-module>
2 changes: 1 addition & 1 deletion src/elements/dialogs/session-details.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ <h3 class="meta-info" hidden$="[[!session.complexity]]">{$ sessionDetails.conten
[[session.complexity]]</h3>

<marked-element class="description" markdown="[[session.description]]">
<div class="markdown-html"></div>
<div slot="markdown-html"></div>
</marked-element>

<div class="actions" layout horizontal>
Expand Down
2 changes: 1 addition & 1 deletion src/elements/dialogs/speaker-details.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ <h3 class="meta-info" hidden$="[[isEmpty(speaker.badges)]]">
</h3>

<marked-element class="description" markdown="[[speaker.bio]]">
<div class="markdown-html"></div>
<div slot="markdown-html"></div>
</marked-element>

<div class="actions" layout horizontal>
Expand Down
14 changes: 14 additions & 0 deletions src/elements/hoverboard-icons.html
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,20 @@
<path
d="M20.298 3.064h-1.233l-0.693-2.774c-0.043-0.171-0.196-0.29-0.372-0.29h-12c-0.176 0-0.329 0.12-0.372 0.29l-0.693 2.774h-1.233c-0.212 0-0.383 0.171-0.383 0.383v2.043c0 0.212 0.171 0.383 0.383 0.383h0.414l0.672 7.95c0.017 0.2 0.184 0.351 0.381 0.351 0.011 0 0.022-0 0.033-0.001 0.211-0.018 0.367-0.203 0.349-0.414l-0.386-4.566h13.669l-0.906 10.723h-11.857l-0.391-4.631c-0.018-0.211-0.203-0.368-0.414-0.349s-0.367 0.203-0.349 0.414l0.701 8.301c0.017 0.198 0.183 0.351 0.382 0.351h12c0.199 0 0.365-0.152 0.382-0.351l1.502-17.777h0.414c0.212 0 0.383-0.171 0.383-0.383v-2.043c0-0.212-0.171-0.383-0.383-0.383zM6.352 23.234l-0.216-2.553h11.728l-0.216 2.553h-11.296zM18.899 8.426h-13.799l-0.216-2.553h14.23l-0.216 2.553zM19.915 5.106h-0.39c-0 0-15.44 0-15.44 0v-1.277h1.141c0.005 0 0.011 0 0.017 0h11.991c0.212 0 0.383-0.171 0.383-0.383s-0.171-0.383-0.383-0.383h-11.51l0.574-2.298h11.402l0.693 2.774c0.043 0.171 0.196 0.29 0.372 0.29h1.149v1.277z"></path>
</g>
<g id="team">
<path d="M5.005 20.75h0.692v0.794h-0.692v-0.794z"></path>
<path d="M20.321 15.188c1.096-0.596 1.841-1.757 1.841-3.090 0-1.169-0.574-2.206-1.455-2.845-0.638-1.243-1.748-2.205-3.092-2.648 1.096-0.596 1.842-1.757 1.842-3.090 0-1.938-1.576-3.514-3.514-3.514s-3.514 1.576-3.514 3.514c0 0.402 0.069 0.788 0.194 1.149-0.203-0.032-0.411-0.050-0.623-0.050s-0.42 0.017-0.623 0.050c0.125-0.36 0.194-0.747 0.194-1.149 0-1.938-1.576-3.514-3.514-3.514s-3.514 1.576-3.514 3.514c0 1.333 0.746 2.494 1.842 3.090-1.344 0.443-2.454 1.405-3.092 2.648-0.881 0.639-1.455 1.676-1.455 2.845 0 0.883 0.328 1.691 0.868 2.309v0.052h0.045c0.265 0.292 0.579 0.539 0.928 0.729-2.134 0.704-3.679 2.717-3.679 5.083v3.728h10.703v-2.11h2.595v2.11h10.703v-3.728c0-2.367-1.544-4.379-3.679-5.083zM18.649 14.92c-0.655 0-1.259-0.225-1.738-0.601-0.219-0.313-0.466-0.605-0.739-0.871-0.139-0.253-0.239-0.53-0.295-0.823 0.818-0.281 1.399-0.667 1.797-1.022 0.513 0.365 1.722 1.040 3.726 1.122-0.286 1.255-1.41 2.195-2.751 2.195zM19.885 15.779l-1.236 1.417-0.863-0.989c-0.043-0.164-0.094-0.325-0.15-0.484 0.326-0.073 0.665-0.111 1.013-0.111 0.428-0 0.842 0.058 1.236 0.167zM21.469 12.035c-1.751-0.065-2.833-0.624-3.312-0.942 0.18-0.228 0.26-0.389 0.269-0.408l-0.623-0.302c-0.005 0.010-0.477 0.95-1.97 1.522 0.1-1.466 1.324-2.629 2.815-2.629 1.535 0 2.787 1.232 2.821 2.759zM15.62 7.040c0.107-0.007 0.215-0.011 0.323-0.011 0.428 0 0.842 0.058 1.236 0.167l-1.236 1.417-0.030-0.034c0-0.017 0.001-0.033 0.001-0.050 0-0.527-0.105-1.029-0.294-1.488zM17.877 7.45c0.632 0.289 1.188 0.716 1.63 1.241-0.275-0.069-0.562-0.107-0.858-0.107-0.907 0-1.735 0.346-2.359 0.912v-0.227l1.587-1.819zM15.944 6.337c-0.271 0-0.532-0.039-0.78-0.11-0.423-0.58-1-1.039-1.672-1.317-0.152-0.265-0.261-0.558-0.32-0.868 0.818-0.281 1.399-0.667 1.797-1.022 0.513 0.365 1.722 1.040 3.726 1.122-0.286 1.255-1.41 2.195-2.751 2.195zM15.182 12.668c-0.436-0.275-0.909-0.495-1.411-0.65 0.814-0.414 1.464-1.104 1.827-1.946v0.287c-0.294 0.513-0.463 1.107-0.463 1.74-0 0.194 0.017 0.384 0.047 0.57zM12 11.75c-1.584 0-2.904-1.15-3.172-2.658 0.953-0.321 1.621-0.77 2.071-1.178 0.56 0.406 1.936 1.196 4.253 1.279-0.307 1.459-1.604 2.557-3.153 2.557zM13.471 12.651l-1.471 1.686-1.471-1.686c0.467-0.135 0.961-0.208 1.471-0.208s1.004 0.073 1.471 0.208zM8.403 10.358v-0.287c0.363 0.842 1.013 1.532 1.827 1.946-0.502 0.156-0.975 0.376-1.411 0.65 0.031-0.186 0.047-0.376 0.047-0.57 0-0.633-0.169-1.226-0.463-1.74zM15.944 0.693c1.535 0 2.787 1.232 2.821 2.759-1.751-0.065-2.833-0.624-3.312-0.942 0.18-0.228 0.26-0.389 0.269-0.408l-0.622-0.304c-0.021 0.042-0.497 0.961-1.971 1.524 0.1-1.466 1.324-2.629 2.815-2.629zM12 5.306c1.768 0 3.208 1.432 3.222 3.197-2.058-0.067-3.31-0.737-3.838-1.097 0.22-0.273 0.317-0.466 0.327-0.488l-0.623-0.302c-0.006 0.012-0.559 1.112-2.306 1.759 0.080-1.706 1.493-3.069 3.218-3.069zM8.057 0.693c1.535 0 2.787 1.232 2.821 2.759-1.751-0.065-2.833-0.624-3.312-0.942 0.18-0.228 0.26-0.389 0.269-0.408l-0.622-0.304c-0.021 0.042-0.497 0.961-1.971 1.524 0.1-1.466 1.324-2.629 2.815-2.629zM5.285 4.042c0.818-0.281 1.399-0.667 1.797-1.022 0.513 0.365 1.722 1.040 3.726 1.122-0.062 0.273-0.164 0.531-0.299 0.768-0.671 0.278-1.249 0.737-1.672 1.317-0.248 0.071-0.509 0.11-0.78 0.11-1.376 0-2.524-0.99-2.772-2.295zM8.087 8.578l-0.030 0.034-1.236-1.417c0.394-0.109 0.808-0.167 1.236-0.167 0.109 0 0.216 0.004 0.323 0.011-0.189 0.459-0.294 0.961-0.294 1.488 0 0.017 0.001 0.033 0.001 0.050zM6.124 7.45l1.587 1.819v0.227c-0.624-0.566-1.452-0.912-2.359-0.912-0.296 0-0.583 0.037-0.858 0.107 0.442-0.525 0.999-0.952 1.63-1.241zM5.352 9.276c1.535 0 2.787 1.232 2.821 2.759-1.751-0.065-2.833-0.624-3.312-0.942 0.18-0.228 0.26-0.389 0.269-0.408l-0.623-0.302c-0.005 0.010-0.477 0.95-1.97 1.522 0.1-1.466 1.324-2.629 2.815-2.629zM2.58 12.625c0.818-0.281 1.399-0.667 1.797-1.022 0.513 0.365 1.722 1.040 3.726 1.122-0.058 0.256-0.151 0.499-0.274 0.723-0.273 0.266-0.521 0.557-0.739 0.871-0.48 0.376-1.083 0.601-1.738 0.601-1.376-0-2.524-0.99-2.772-2.295zM6.364 15.724c-0.057 0.158-0.107 0.32-0.15 0.484l-0.863 0.989-1.236-1.417c0.394-0.109 0.808-0.167 1.236-0.167 0.348 0 0.686 0.039 1.013 0.111zM7.792 23.307v0h-4.881v-2.877h-0.692v2.877h-1.526v-3.036c0-1.88 1.119-3.503 2.726-4.238l1.587 1.819v2.225h0.692v-2.225l0.325-0.372c-0.004 0.084-0.006 0.169-0.006 0.253v4.156h1.775v1.418zM10.010 23.307h-1.526v-1.418h1.526v1.418zM9.208 21.197v-3.284h-0.692v3.284h-1.806v-3.463c0-2.146 1.285-3.998 3.125-4.827l1.82 2.086v2.522h0.692v-2.522l1.82-2.086c1.841 0.829 3.125 2.681 3.125 4.827v3.463h-1.806v-3.284h-0.692v3.284h-5.585zM13.99 23.307v-1.418h1.526v1.418h-1.526zM23.308 23.307h-1.526v-2.877h-0.692v2.877h-4.881v-1.418h1.775v-4.156c0-0.085-0.002-0.17-0.006-0.253l0.325 0.372v2.225h0.692v-2.225l1.587-1.819c1.607 0.736 2.726 2.359 2.726 4.238v3.036z"></path>
<path d="M18.303 20.75h0.692v0.794h-0.692v-0.794z"></path>
<path d="M11.654 18.273h0.692v0.894h-0.692v-0.894z"></path>
<path d="M22.215 7.426h0.692v0.769h-0.692v-0.769z"></path>
<path d="M20.602 4.793h0.692v0.769h-0.692v-0.769z"></path>
<path d="M23.308 1.951h0.692v0.77h-0.692v-0.77z"></path>
<path d="M20.602 0.472h0.692v0.77h-0.692v-0.77z"></path>
<path d="M1.093 7.426h0.692v0.769h-0.692v-0.769z"></path>
<path d="M2.706 4.793h0.692v0.769h-0.692v-0.769z"></path>
<path d="M0 1.951h0.692v0.77h-0.692v-0.77z"></path>
<path d="M2.706 0.472h0.692v0.77h-0.692v-0.77z"></path>
</g>
<g id="checked">
<path d="M10,17L5,12L6.41,10.58L10,14.17L17.59,6.58L19,8M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
</g>
Expand Down
20 changes: 1 addition & 19 deletions src/elements/shared-styles.html
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -89,7 +89,6 @@
body {
font-family: var(--font-family);
text-rendering: optimizeLegibility;
background-color: #fafafa;
color: var(--primary-text-color);
}

Expand Down Expand Up @@ -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);
}
Expand Down
2 changes: 2 additions & 0 deletions src/pages/home-page.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<link rel="import" href="../elements/subscribe-block.html">
<link rel="import" href="../elements/gallery-block.html">
<link rel="import" href="../elements/map-block.html">
<link rel="import" href="../elements/about-organizer-block.html">

<dom-module id="home-page">
<template>
Expand All @@ -25,6 +26,7 @@
<speakers-block></speakers-block>
<subscribe-block></subscribe-block>
<featured-videos></featured-videos>
<about-organizer-block></about-organizer-block>
<latest-posts-block></latest-posts-block>
<gallery-block></gallery-block>
<tickets-block></tickets-block>
Expand Down
19 changes: 18 additions & 1 deletion src/pages/post-page.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,24 @@
background-color: var(--primary-background-color);
}

[slot="markdown-html"] plastic-image {
[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;
}

[slot="markdown-html"] plastic-image {
margin: 32px 0 8px -16px;
--iron-image-width: calc(100% + 32px);
width: calc(100% + 32px);
Expand Down
Loading

0 comments on commit fa7d0f7

Please sign in to comment.