Skip to content

Commit 8445bf9

Browse files
ROYA TOCCHINIROYA TOCCHINI
ROYA TOCCHINI
authored and
ROYA TOCCHINI
committed
added fluent conf video to homepage
1 parent 72b1fed commit 8445bf9

File tree

12 files changed

+924
-809
lines changed

12 files changed

+924
-809
lines changed

assets/images/fluent-video-cover.jpg

156 KB
Loading
156 KB
Loading

bower_components/gss/.bower.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,13 @@
3535
"index.html",
3636
".travis.yml"
3737
],
38-
"_release": "51d9f7ea9f",
38+
"_release": "a4d3b4eb01",
3939
"_resolution": {
4040
"type": "branch",
4141
"branch": "master",
42-
"commit": "51d9f7ea9f5eca3de2c877fd5c855f6101879fd3"
42+
"commit": "a4d3b4eb01a9c29b18fdfed2afba776de9a9ad64"
4343
},
4444
"_source": "git://github.com/the-gss/engine.git",
4545
"_target": "*",
46-
"_originalSource": "gss",
47-
"_direct": true
46+
"_originalSource": "git://github.com/the-gss/engine.git"
4847
}

bower_components/gss/CHANGES.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
GSS Engine ChangeLog
22
====================
33

4+
## 1.0.2-beta (April 14th 2014)
5+
6+
- VGL: `@grid-template` empty zones can be defined with `.`
7+
- VGL: added `in()` to `@grid-template`
8+
- VGL: added `h/v/top/right/bottom/left-gap()` to `@grid-template`
9+
10+
VGL is still undocumented & under heavy dev.
11+
412
## 1.0.1-beta (April 7th 2014)
513

614
- VFL: **Point** support

bower_components/gss/dist/gss.js

Lines changed: 830 additions & 785 deletions
Large diffs are not rendered by default.

bower_components/gss/dist/gss.min.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bower_components/gss/dist/worker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* gss-engine - version 1.0.1-beta (2014-04-07) - http://gridstylesheets.org */
1+
/* gss-engine - version 1.0.2-beta (2014-04-16) - http://gridstylesheets.org */
22
/**
33
* Parts Copyright (C) 2011-2012, Alex Russell (slightlyoff@chromium.org)
44
* Parts Copyright (C) Copyright (C) 1998-2000 Greg J. Badros

bower_components/gss/dist/worker.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.html

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@
1717
bottom: == ::parent[bottom] - [bottom-margin] !require;
1818
}
1919

20-
/* center the buttons */
21-
#top-button1[right] == ::window[center-x] - [baseline] / 2;
22-
23-
@horizontal [#top-button1]-[#top-button2]
24-
gap([baseline])
20+
@horizontal [#top-button1]-<::window[center-x]>-[#top-button2]
21+
gap([baseline] / 2)
2522
chain-top;
2623

2724
[top-image-gap] == [baseline];
@@ -132,6 +129,49 @@ <h1><a name="features">Features</a></h1>
132129
</div>
133130
</section>
134131

132+
133+
<section id="fluent-section" class="section color-a">
134+
135+
<style type="text/gss">
136+
137+
#fluent-section {
138+
height: <= ::window[height] - [top-margin];
139+
#fluent-img {
140+
height: == ::[width] * 9 / 16 !require;
141+
}
142+
[top-margin] <= ::[h-gap] <= 2 * [top-margin] !strong;
143+
[top-margin] * 1.5 <= ::[v-gap] <= 2 * [top-margin] !strong;
144+
@h |-[#fluent-img(>= [max-p-width] !strong, >= 600 !require)]-| in(::) gap(::[h-gap]) !strong;
145+
@v |-[#fluent-img]-| in(::) gap(::[v-gap]);
146+
147+
#fluent-play {
148+
padding: 0 !important;
149+
height: == 96;
150+
width: == ::[height] * 1.6;
151+
center-x: == #fluent-section[center-x];
152+
center-y: == #fluent-section[center-y];
153+
}
154+
155+
#fluent-play-tri {
156+
width: == 51;
157+
height: == 59;
158+
center-x: == #fluent-section[center-x] + 5;
159+
center-y: == #fluent-section[center-y] - 5;
160+
}
161+
}
162+
</style>
163+
164+
<a href="http://vimeo.com/91393694" target="_blank">
165+
<img id="fluent-img" src="assets/images/fluent-video-cover.jpg" alt="Kid">
166+
<button id="fluent-play" class="button-play">
167+
<svg class="icon" id="fluent-play-tri" width="51px" height="59px" version="1.1" xmlns="http://www.w3.org/2000/svg" baseProfile="full" >
168+
<path d="M51,29.5L0,59V0L51,29.5z"/>
169+
</svg>
170+
</button>
171+
</a>
172+
173+
</section>
174+
135175
{% for post in site.categories.home %}
136176
<section class="section color-{{post.color}}" id="{{ post.uid }}">
137177
{% if post.title %}

js/script.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
GSS.once "display", ->
1313
console?.timeEnd? "display"
14-
setupWayPoints()
14+
#setupWayPoints()
1515
app.menu.init()
1616

1717

js/script.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
console.timeEnd("display");
1414
}
1515
}
16-
setupWayPoints();
1716
return app.menu.init();
1817
});
1918
app.mobilecheck = mobilecheck = function() {

style/styles.css

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,10 @@ button {
182182
button.transparent {
183183
background-color: transparent;
184184
}
185-
button:hover, button.transparent:hover, .button:hover {
185+
button:hover, a:hover button,
186+
.button:hover, a:hover .button,
187+
button.transparent:hover
188+
{
186189
border-color: hsl(282, 99%, 31%);
187190
background-color: hsl(282, 99%, 31%) !important;
188191
color: hsl(58, 100%, 84%);
@@ -199,6 +202,24 @@ button.inverse:hover {
199202
background-color: hsl(58, 100%, 84%) !important;
200203
}
201204

205+
.button-play {
206+
opacity: .7;
207+
background-color: transparent;
208+
}
209+
.button-play .icon {
210+
fill: hsl(282, 99%, 31%);
211+
}
212+
.button-play:hover .icon {
213+
opacity: 1;
214+
fill: hsl(58, 100%, 84%);
215+
}
216+
217+
a:hover .button-play .icon {
218+
opacity: 1;
219+
fill: hsl(58, 100%, 84%);
220+
}
221+
222+
202223
.badge g {
203224
fill: #6f019e;
204225
}
@@ -246,9 +267,12 @@ hr {
246267
.color-c {
247268
background-color: #d692f3;
248269
color: black;
249-
} .color-c
270+
} .color-c blockquote {
271+
color: white;
272+
}
250273

251-
blockquote {
274+
.color-d {
275+
background-color: hsl(282, 99%, 31%);
252276
color: white;
253277
}
254278

0 commit comments

Comments
 (0)