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

#15 updated program. Updated date of event in JS. #21

Merged
merged 3 commits into from
Oct 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions public/_data.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"image": "alberto_leal.jpg",
"company": "CODERY OS",
"companyUrl": "http://www.codery.es/",
"presentationTitle": "To be defined",
"presentationTitle": "Cultural Heritage & Drupal",
"presentationVideo": "To be defined",
"presentationUrl": "To be defined"
},
Expand All @@ -24,20 +24,30 @@
},
"hernani": {
"name": "Hernâni Borges de Freitas",
"drupal": "https://www.drupal.org/user/448086",
"drupal": "https://www.drupal.org/u/hernani",
"image": "hernani.png",
"company": "Freelance Consultant",
"companyUrl": "http://hernani.pt/",
"presentationTitle": "To be defined",
"presentationTitle": "Upgrade para Drupal 8 - Serbenfiquista.com case study",
"presentationVideo": "To be defined",
"presentationUrl": "To be defined"
},
"joao": {
"name": "João Belchior",
"drupal": "https://www.drupal.org/user/347132",
"drupal": "https://www.drupal.org/u/Jolidog",
"image": "joaobelchior.jpg",
"company": "Marzee Labs",
"companyUrl": "https://marzeelabs.org/",
"presentationTitle": "Drupal Decoupled on ARTE",
"presentationVideo": "To be defined",
"presentationUrl": "To be defined"
},
"luissantos": {
"name": "Luis Santos",
"drupal": "https://www.drupal.org/u/fall_0ut",
"image": "luissantos.png",
"company": "Open Quest",
"companyUrl": "https://www.openquest.pt/",
"presentationTitle": "To be defined",
"presentationVideo": "To be defined",
"presentationUrl": "To be defined"
Expand All @@ -54,7 +64,7 @@
},
"ricardoa": {
"name": "Ricardo Amaro",
"drupal": "https://www.drupal.org/user/666176",
"drupal": "https://www.drupal.org/u/ricardoamaro",
"image": "ricardoa.jpg",
"company": "Acquia",
"companyUrl": "https://www.acquia.com/",
Expand All @@ -64,21 +74,21 @@
},
"ricardom": {
"name": "Ricardo Marcelino",
"drupal": "https://www.drupal.org/user/2476918",
"drupal": "https://www.drupal.org/u/rfmarcelino",
"image": "ricardom.jpg",
"company": "Omibee",
"companyUrl": "https://omibee.com/",
"presentationTitle": "To be defined",
"presentationTitle": "Manual de sobrevivência do desenvolvimento web",
"presentationVideo": "To be defined",
"presentationUrl": "To be defined"
},
"ruifig": {
"name": "Rui Figueiredo",
"drupal": "https://www.drupal.org/user/796892",
"drupal": "https://www.drupal.org/u/ruifigueiredo",
"image": "ruifig.png",
"company": "EDGE",
"companyUrl": "http://www.edge.pt/",
"presentationTitle": "To be defined",
"presentationTitle": "Drupal 8 - Internet of things",
"presentationVideo": "To be defined",
"presentationUrl": "To be defined"
}
Expand Down
4 changes: 2 additions & 2 deletions public/_partials/_header.jade
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ section#pagetop-section
li.navigation__menu__item
a(href='/#speakers') Oradores

//- li.navigation__menu__item
//- a(href='/#schedule') Programa
li.navigation__menu__item
a(href='/#schedule') Programa

//- li.navigation__menu__item
//- a(href='/#proposals') Propostas
Expand Down
69 changes: 27 additions & 42 deletions public/_partials/_schedule-section.jade
Original file line number Diff line number Diff line change
@@ -1,84 +1,69 @@
section#schedule-section.schedule-section

h4.section-titles Programa

.section-titles__underlines

.schedule

.schedule__line
.schedule__line__inner
.schedule__line-hour
.schedule__line-speaker SPEAKERS
.schedule__title
<h5> Sessões</h5>


.schedule__line.schedule__line--break
.schedule__line__inner
.schedule__line-hour 10h00 • 10h15
.schedule__line-speaker Receção e Boas-vindas
.schedule__line-hour 10h00 • 10h15
.schedule__line-speaker Receção e Boas-vindas


.schedule__line
.schedule__line__inner
.schedule__line-hour 10h20 • 10h50
.schedule__line-speaker <strong>Drupal numa perspectiva de negócio</strong><br>Ricardo Marcelino
.schedule__line-hour 10h20 • 10h50
.schedule__line-speaker <strong>Manual de sobrevivência do desenvolvimento web</strong><br>Ricardo Marcelino


.schedule__line
.schedule__line__inner
.schedule__line-hour 10h55 • 11h25
.schedule__line-speaker <strong>Como contribuir para a Comunidade Drupal</strong><br>Francisco Almeida
.schedule__line-hour 10h55 • 11h25
.schedule__line-speaker <strong>D8 - Business Applications</strong><br>Francisco Almeida


.schedule__line.schedule__line--break
.schedule__line__inner
.schedule__line-hour 11h25 • 11h45
.schedule__line-speaker Coffee Break
.schedule__line-hour 11h25 • 11h45
.schedule__line-speaker Coffee Break


.schedule__line
.schedule__line__inner
.schedule__line-hour 11h50 • 12h20
.schedule__line-speaker <strong>Welcome to Drupal</strong><br>Hernâni Borges de Freitas
.schedule__line-hour 11h50 • 12h20
.schedule__line-speaker <strong>Upgrade para Drupal 8 - Serbenfiquista.com case study</strong><br>Hernâni Borges de Freitas


.schedule__line
.schedule__line__inner
.schedule__line-hour 12h25 • 12h55
.schedule__line-speaker <strong>Decoupled: D8 como backend para websites e mobile Apps</strong><br>Bruno Mateus
.schedule__line-hour 12h25 • 12h55
.schedule__line-speaker <strong>Drupal Decoupled on ARTE</strong><br>João Belchior


.schedule__line.schedule__line--break
.schedule__line__inner
.schedule__line-hour 13h00 • 15h00
.schedule__line-speaker Almoço
.schedule__line-hour 13h00 • 15h00
.schedule__line-speaker Almoço


.schedule__line
.schedule__line__inner
.schedule__line-hour 15h00 • 15h30
.schedule__line-speaker <strong>Profiles in Drupal</strong><br>Luis Correia
.schedule__line-hour 15h00 • 15h30
.schedule__line-speaker <strong>Software Livre em Portugal</strong><br>Marcos Marado


.schedule__line
.schedule__line__inner
.schedule__line-hour 15h35 • 16h05
.schedule__line-speaker <strong>Implementing Site Reliability Engineering @Acquia</strong><br>Ricardo Amaro
.schedule__line-hour 15h35 • 16h05
.schedule__line-speaker <strong>Cultural Heritage & Drupal </strong><br>Alberto Permury


.schedule__line
.schedule__line__inner
.schedule__line-hour 16h10 • 16h40
.schedule__line-speaker <strong>Drupal 8: Inside Out</strong><br>Catarina Clemente
.schedule__line-hour 16h10 • 16h40
.schedule__line-speaker <strong>Drupal 8 - Internet of things</strong><br>Rui Figueiredo


.schedule__line.schedule__line--break
.schedule__line__inner
.schedule__line-hour 16h45 • 17h00
.schedule__line-speaker Encerramento
.schedule__line-hour 16h45 • 17h00
.schedule__line-speaker Encerramento e networking


.schedule__line
.schedule__line__inner
.schedule__line-hour 17h30
.schedule__line-speaker <a class="schedule__line-logo" href="http://www.caledooiro.com/" target="_blank"><img src="/images/home/logo_caledooiro.png" title="Cale do Oiro" /></a> Passeio de moliceiro (lotado)<br>Com apoio de <a href="http://www.caledooiro.com/" target="_blank">Cale do Oiro</a>
.schedule__title
<h5>Workshop</h5>
p O workshop decorrerá no Salão Nobre em simultâneo com as sessões do auditório, tendo início às 10h20. Terá os mesmos coffee breaks e intervalo para almoço de forma a possibilitar o networking entre os participantes.
2 changes: 1 addition & 1 deletion public/_scripts/site.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ $(function() {
//- function for countdown
function countdown() {

var endDate = "October 13, 2017 09:30:00";
var endDate = "October 14, 2017 09:30:00";

$('.apply-countdown').countdown({
date: endDate,
Expand Down
62 changes: 23 additions & 39 deletions public/css/components/_schedule-section.scss
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
.schedule-section {
@extend .section-commons;
background: palette(red);
background: palette(green);
color: palette(white);

.section-titles__underlines {
background: palette(red, dark);
background: palette(white);

&:after {
background: palette(red, dark);
background: palette(white);
}
}
}

.schedule {
@include container (800px);
text-align: left;
margin-top: ritmo(8);
margin-top: ritmo(10);
}

%schedule-center-text-vertically {
Expand All @@ -24,48 +24,46 @@
transform: translateY(-50%);
}

.schedule__title {
text-align: center;
margin: 30px auto;
}

.schedule__line {
width: 100%;
border-bottom: palette(red, dark) 2px solid;
@include ritmo-paddings(4);
border-bottom: rgba(palette(green, x-dark), .3) 2px solid;
@include clearfix();
position: relative;
display: flex;
padding: 20px;
align-items: center;
flex-wrap: wrap;


&:first-child {
text-transform: uppercase;
@include ritmo-font-size(20px);
@include mq($from: break-medium-small) {
flex-wrap: nowrap;
}
}

.schedule__line__inner {
position: relative;
float: left;
width: 100%;
transform: translateY(50%);
}

.schedule__line--break {
background: palette(red, dark);
background: rgba(palette(green, x-dark), .3);
border-bottom: 0;
}

.schedule__line-hour {
@include span(3 at 1);
padding-left: 20px;
@extend %schedule-center-text-vertically;
flex: 0 0 100%;

@include mq($from: break-medium-small) {
@include span(2 at 1);
flex: 0 0 auto;
padding-left: 35px;
}
}

.schedule__line-speaker {
@include span(3 at 4);
@extend %schedule-center-text-vertically;
flex: 0 0 100%;

@include mq($from: break-medium-small) {
@include span(4 at 3);
flex: 1 1 auto;
padding-left: 35px;
}

a {
Expand All @@ -79,17 +77,3 @@
}
}
}

.schedule__line-speaker--big-line {

@include mq($until: 575px) {
//height: ritmo(22);
}
}

.schedule__line-logo {
position: absolute;
right: 0;
top: 0;
width: 50px;
}
Binary file added public/images/speakers/luissantos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion public/index.jade
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include ./_partials/_about-section

include ./_partials/_speakers-section

//- include ./_partials/_schedule-section
include ./_partials/_schedule-section

//- include ./_partials/_proposals-section

Expand Down
2 changes: 1 addition & 1 deletion public/js/site.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion www/css/app.css

Large diffs are not rendered by default.

Binary file added www/images/speakers/luissantos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading