Skip to content

Commit bacbc02

Browse files
electricgelectricg
committed
Content page
1 parent feab4eb commit bacbc02

33 files changed

+374
-148
lines changed

Diff for: ‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ results
1414
npm-debug.log
1515
www/
1616
node_modules/
17-
.DS_Store
17+
.DS_Store
18+
proximanova/

Diff for: ‎public/_data.json

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
2-
"locations": [{
3-
"type": "Venues",
2+
"locations": [
3+
{
4+
"type": "Venues",
5+
"icon": "location",
46
"location": [
57
{
68
"name": "Duke of Yorks",
@@ -26,6 +28,7 @@
2628
},
2729
{
2830
"type": "Hotels",
31+
"icon": "home",
2932
"location": [
3033
{
3134
"name": "Jury's Inn",
@@ -55,6 +58,7 @@
5558
},
5659
{
5760
"type": "Food & Drink",
61+
"icon": "beer",
5862
"location": [
5963
{"name": "Bardsley's", "detail": "fish 'n chips", "url": "http://www.bardsleys-fishandchips.co.uk/map "},
6064
{"name": "The Open House", "detail": "good pub food", "url": "http://goo.gl/csghA"},
@@ -72,7 +76,7 @@
7276
},
7377
{
7478
"url": "http://www.adobe.com/products/creativecloud.html",
75-
"img": "adobe.gif",
79+
"img": "adobe.png",
7680
"blurb": "Discover new ways to work with Adobe Creative Cloud. All the tools you love, totally reimagined. Plus, new apps and more connected tools and services. Get started with a free [Creative Cloud Membership](http://www.adobe.com/products/creativecloud.html)."
7781
}
7882
],

Diff for: ‎public/_partials/footer.jade

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
footer
2-
a.twitter(href='https://twitter.com/fullfrontalconf')
2+
a.twitter.icon-social-twitter(href='https://twitter.com/fullfrontalconf')
33
span.at @
44
| fullfrontalconf
55

6-
p.previously
6+
ul.previously
77
each year in [2013, 2012, 2011, 2010, 2009]
8-
a(href='http://' + year + '.full-frontal.org')=year
9-
= "\n"
8+
li
9+
a(href='http://' + year + '.full-frontal.org')=year
1010

1111
p.blurb.
1212
Full Frontal is run by Left Logic, a small team of developers based in Brighton (UK), specialising in Node based applications and bleeding edge front end technology.

Diff for: ‎public/_partials/header.jade

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ html#fullfrontal-2014
6060

6161
- var line = 'Tickets will be sold on the\n9th July and 16th July.'
6262
- var button = 'More Info'
63-
- var buy = false
63+
- var buy = true
6464
- var classes = ['screen-button']
6565
if config.onsale
6666
if config.phase == 1

Diff for: ‎public/_partials/library.jade

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
div
2+
a(href='#') This is a link
3+
4+
h2.section-title.icon-microphone Schedule
5+
6+
h3.session-title ES6 Uncensored
7+
8+
h3.schedule-title Opening Remarks
9+
10+
ul.session-list
11+
li PhoneGap APIs
12+
li Topcoat
13+
li The Single Page Architecture
14+
15+
div.session-content.
16+
The latest JavaScript standard is just around the corner and language enthusiasts are already salivating over all the new toys coming their way. But, be warned, there are best practice zealots waiting in the wings, ready to re-label the fun parts as The Bad Parts and ruin the party. This time let's get a head start on them.
17+
18+
div.schedule-title.tbc TBC

Diff for: ‎public/_partials/locations.jade

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
section.locations.region(role='region', aria-labelledby='locations')
2-
h2#locations.sectio-heading(role='heading', aria-level='2') Locations
3-
ul
1+
section(role='region', aria-labelledby='locations')
2+
ul#locations
43
each locations in public._data.locations
5-
li.location-category
6-
h3.type(role='heading', aria-level='3')=locations.type
7-
ul.locations-list
4+
li
5+
h2.section-title(role='heading', aria-level='2' class='icon-' + locations.icon)=locations.type
6+
ul
87
each location in locations.location
98
li.vcard.location
109
a.name.url.org.fn(href=location.url)=location.name
11-
div.note
10+
div
1211
p.detail=location.detail
1312
if location.extra-discount
1413
p.extra-discount=location.extra-discount

Diff for: ‎public/_partials/sessions.jade

+17-16
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
1-
section.sessions.region(class='session-style-' + config.mode, role='region', aria-labelledby='sessions')
2-
h2#sessions.section-heading(role='heading', aria-level='2') Schedule
1+
section(class='session-style-' + config.mode, role='region', aria-labelledby='sessions')
2+
h2#sessions.section-title.icon-microphone(role='heading', aria-level='2') Schedule
33
ol
44
each session in public._data.sessions.sessions
5-
li.session#slug
6-
div.session-wrapper
5+
li#slug
6+
div
77
if session.break
88
header.break
9-
div.time Start — End
10-
h3.title(role='heading', aria-level='3')= session.title
9+
div Start — End
10+
h3.schedule-title(role='heading', aria-level='3')= session.title
1111
else
12-
header.session-header
13-
div.time Start — End
14-
div.title-wrapper
15-
h3.title(role='heading', aria-level='3')= session.title
12+
header
13+
div Start — End
14+
div
15+
h3.session-title(role='heading', aria-level='3')= session.title
1616
if session.speaker.name
17-
div.speaker= session.speaker.name
18-
div.session-body
19-
div.veil
20-
div.description-wrapper
17+
div
18+
a(href='#')= session.speaker.name
19+
div
20+
div
21+
div.session-content
2122
if session.description
2223
:markdown= session.description
2324
if session.bio
24-
div.bio
25+
div
2526
:markdown= session.bio
2627
if session.speaker.photo
27-
div.mugshot(alt=session.speaker.alt?session.speaker.alt:null)
28+
div(alt=session.speaker.alt?session.speaker.alt:null)
2829
img(src='/images/speakers/' + session.speaker.photo)

Diff for: ‎public/_partials/sponsors.jade

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
section.sponsors.region.alt(role='region', aria-labelledby='sponsors')
2-
h2#sponsors.sponsors-heading(role='heading', aria-level='2') Sponsors
1+
section(role='region', aria-labelledby='sponsors')
2+
h2#sponsors.section-title.icon-thumbs-up(role='heading', aria-level='2') Sponsors
33

44
if public._data.sponsors.available
55
a(href='/sponsorship') Become a sponsor
66

77
each cat, key in public._data.sponsors
88
if cat.length
99
section.monty(class=key + '-monty')
10-
h3.type(role='heading', aria-level='3')= capitalize(key) + ' Monty Sponsors'
10+
h3.sponsor-title(role='heading', aria-level='3')= capitalize(key) + ' Monty Sponsors'
1111

1212
each sponsor in cat
1313
div.sponsors-wrapper

Diff for: ‎public/_partials/workshops.jade

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
1-
section.workshops.region.alt(role='region', aria-labelledby='workshops')
1+
section(role='region', aria-labelledby='workshops')
22
each workshop, index in public._data.workshops
3-
h2#workshops.section-heading(role='heading', aria-level='2') Workshop #{index+1}
3+
h2#workshops.section-title.icon-spanner(role='heading', aria-level='2') Workshop #{index+1}
44
if config.onsale
55
if config.soldout[workshop.slug]
66
a.button.sold-out(href='/workshop/' + workshop.slug) Sold Out
77
else
88
a.button.buy(href='/workshop/' + workshop.slug) Buy Tickets
99
else
1010
a.button.buy(href='/workshop/' + workshop.slug) Find More
11-
div.workshop-wrapper
12-
section.workshop(id=workshop.slug)
11+
div
12+
section(id=workshop.slug)
1313
header
14-
h3.title(role='heading', aria-level='3')=workshop.title
15-
div.speaker=workshop.speaker.name
16-
p.description=workshop.description
14+
h3.session-title(role='heading', aria-level='3')=workshop.title
15+
div
16+
a(href='#')= workshop.speaker.name
17+
div.time= workshop.details.date + ', ' + workshop.details.time
18+
p.session-content= workshop.description
1719
if workshop.topics
18-
ul.topics
20+
ul.session-list
1921
each topic in workshop.topics
2022
li=topic.title
2123
if topic.description

Diff for: ‎public/css/_mq.scss

+118
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
/* 300
2+
========================================================================== */
3+
@media (min-width: 300px) {
4+
.case {
5+
display: table;
6+
height: 93px;
7+
padding-bottom: 0;
8+
padding-top: 0;
9+
width: 100%;
10+
}
11+
.mother,
12+
.case-button-wrapper {
13+
display: table-cell;
14+
vertical-align: middle;
15+
width: 135px;
16+
}
17+
.mother {
18+
margin-bottom: 0;
19+
text-align: left;
20+
width: auto;
21+
}
22+
.twitter {
23+
font-size: 18px;
24+
}
25+
}
26+
27+
/* 480
28+
========================================================================== */
29+
@media (min-width: 480px) {
30+
#left-logic {
31+
background-size: 100%;
32+
height: 47px;
33+
width: 226px;
34+
}
35+
}
36+
37+
/* 640
38+
========================================================================== */
39+
@media (min-width: 640px) {
40+
.twtter {
41+
font-size: 40px;
42+
}
43+
.previously {
44+
a {
45+
font-size: 28px;
46+
}
47+
}
48+
}
49+
50+
/* 768
51+
========================================================================== */
52+
@media (min-width: 768px) {
53+
.nav-main {
54+
display: none;
55+
}
56+
.screen-wrapper {
57+
padding-bottom: 40px;
58+
59+
&:after {
60+
height: 40px;
61+
}
62+
}
63+
.screen {
64+
padding: 20px 20px 0;
65+
}
66+
.screen-date {
67+
font-size: 21px;
68+
}
69+
.screen-button {
70+
margin: 80px auto;
71+
padding-left: 40px;
72+
padding-right: 40px;
73+
}
74+
.details-tickets-wrapper {
75+
font-size: 48px;
76+
}
77+
.tickets-line {
78+
display: block;
79+
}
80+
.screen-shadow {
81+
&:after {
82+
border-radius: 100px;
83+
}
84+
}
85+
86+
.case {
87+
height: 133px;
88+
padding: 0 20px;
89+
}
90+
.vents {
91+
height: 167px;
92+
93+
&:after {
94+
background-image: url(../images/vents-big.png);
95+
height: 170px;
96+
}
97+
// led gradient
98+
&:before {
99+
box-shadow: 0 0 120px 120px $c-led-red;
100+
right: 151px;
101+
top: -66px;
102+
}
103+
}
104+
.vents-on {
105+
&:before {
106+
box-shadow: 0 0 120px 120px $c-led-blue;
107+
}
108+
}
109+
110+
.twitter {
111+
font-size: 60px;
112+
}
113+
.previously {
114+
a {
115+
font-size: 28px;
116+
}
117+
}
118+
}

Diff for: ‎public/css/_typicon.scss

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
@include font-face('typicon', '../fonts/typicon');
2+
3+
[class^="icon-"]:before, [class*=" icon-"]:before {
4+
font-family: 'typicon';
5+
speak: none;
6+
font-style: normal;
7+
font-weight: normal;
8+
font-variant: normal;
9+
text-transform: none;
10+
line-height: 1;
11+
12+
/* Better Font Rendering =========== */
13+
-webkit-font-smoothing: antialiased;
14+
-moz-osx-font-smoothing: grayscale;
15+
}
16+
17+
.icon-home:before {
18+
content: "\e600";
19+
}
20+
.icon-location:before {
21+
content: "\e601";
22+
}
23+
.icon-video:before {
24+
content: "\e602";
25+
}
26+
.icon-notes:before {
27+
content: "\e603";
28+
}
29+
.icon-spanner:before {
30+
content: "\e604";
31+
}
32+
.icon-microphone:before {
33+
content: "\e605";
34+
}
35+
.icon-social-twitter:before {
36+
content: "\e606";
37+
}
38+
.icon-thumbs-up:before {
39+
content: "\e607";
40+
}
41+
.icon-document-text:before {
42+
content: "\e608";
43+
}
44+
.icon-beer:before {
45+
content: "\e609";
46+
}

0 commit comments

Comments
 (0)