Skip to content

Commit 20c55c4

Browse files
author
carl@connectedbrains.com
committed
color ajustments + fix usage layout
1 parent da52429 commit 20c55c4

10 files changed

+37
-61
lines changed

_includes/home-demos.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@h |-(&)-| in(^) gap($col-size);
1313
font-size: == $title-font-size * 0.9;
1414
padding: == 0;
15-
color: hsl(282, 99%, 31%);
15+
color: #784e78;
1616
}
1717

1818
#demos-subtitle {

_includes/home-intro.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ <h1 id="top-title">Grid Style Sheets 2.0</h1>
6464
<h3 id="top-subtitle" class="large-font">GSS reimagines CSS layout & replaces the browser’s layout engine with one that
6565
harnesses the Cassowary Constraint Solver — the same algorithm Apple uses to compute native layout.</h3>
6666

67-
<a href="/usage" class="top-button button" id="top-button-install">Install</a>
67+
<a href="/usage/client-side" class="top-button button" id="top-button-install">Install</a>
6868
<a href="//github.com/gss/engine" class="top-button button" id="top-button-source">Source</a>
6969
<a href="/guides/ccss" class="top-button button" id="top-button-docs">Documentation</a>
7070

_includes/home-video-gss.html

+6-14
Original file line numberDiff line numberDiff line change
@@ -57,18 +57,12 @@
5757
p[center-x] == #fluent-img[center-x];
5858

5959
#fluent-play {
60-
padding: 0 !important;
61-
height: == 96;
62-
width: == &[height] * 1.6;
60+
padding: 10px !important;
61+
height: == &intrinsic-height;
62+
width: == &intrinsic-width;
6363
center-x: == ^[center-x];
6464
center-y: == ^[center-y];
65-
}
66-
67-
#fluent-play-tri {
68-
width: == 51;
69-
height: == 59;
70-
center-x: == ^[center-x] + 5;
71-
center-y: == ^[center-y] - 5;
65+
font-size: == $subtitle-font-size * 0.8;
7266
}
7367
}
7468
</style>
@@ -80,10 +74,8 @@ <h2>O'Reilly | Fluent Conf' 2014</h2>
8074

8175
<a href="http://vimeo.com/91393694" target="_blank">
8276
<img id="fluent-img" src="assets/images/oreilly-fluent-cover-purple.jpg" alt="Kid">
83-
<button id="fluent-play" class="button-play">
84-
<svg class="icon" id="fluent-play-tri" width="51px" height="59px" version="1.1" xmlns="http://www.w3.org/2000/svg" baseProfile="full" >
85-
<path d="M51,29.5L0,59V0L51,29.5z"/>
86-
</svg>
77+
<button id="fluent-play" class="button">
78+
Play video
8779
</button>
8880
</a>
8981

_includes/made-with-love.html

+18-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#grid-section {
55

6-
height: == #grid-section-content[height];
6+
height: >= #grid-section-content[height] + grid-section-astro[height];
77

88
.astro-person {
99
width: >= 200;
@@ -32,15 +32,24 @@
3232
}
3333
}
3434

35-
@v |-(header)-(#grid-section-content)-| in(&) gap($baseline) outer-gap($v-outer-gap);
35+
@v |-(header)-(#grid-section-content)-(#grid-section-astro)-| in(&) gap($baseline) outer-gap($v-outer-gap);
3636

3737
astro-gap1 == $col-size;
3838
astro-gap0 == $col-size;
3939

40-
#grid-section-content {
41-
40+
.content {
4241
center-x: == ^center-x;
4342
width: == $max-p-width !require;
43+
}
44+
45+
#grid-section-content {
46+
height: == &intrinsic-height;
47+
p {
48+
size: == &intrinsic-size;
49+
}
50+
}
51+
52+
#grid-section-astro {
4453

4554
@if ::window[width] >= 720 {
4655

@@ -54,7 +63,7 @@
5463

5564
astro-gap2 == 40 !require;
5665

57-
@v |-(#astro-d4)-(#astro-yaroslaff)-(#astro-carl)-| in(&) gap(v-astro-gap) !strong;
66+
@v |(#astro-d4)-(#astro-yaroslaff)-(#astro-carl)-| in(&) gap(v-astro-gap) !strong;
5867

5968
astro-width == #astro-yaroslaff[width];
6069
top-row-1 == #astro-yaroslaff[top];
@@ -75,7 +84,8 @@
7584
@h |-(&)-| in(^) gap(astro-gap0);
7685
}
7786

78-
@v |-(#astro-greg)-(#astro-d4)-(#astro-alex)-(#astro-bergie)-(#astro-yaroslaff)-(#astro-paul)-(#astro-tom)-(#astro-carl)-|
87+
88+
@v |(#astro-greg)-(#astro-d4)-(#astro-alex)-(#astro-bergie)-(#astro-yaroslaff)-(#astro-paul)-(#astro-tom)-(#astro-carl)-|
7989
in(&)
8090
gap($baseline * 3)
8191
outer-gap($baseline * 5);
@@ -94,14 +104,14 @@ <h1>Made with ♥ by TheGrid</h1>
94104
<h2 class="subtitle">Open source b/c we believe</h2>
95105
</header>
96106
<div id="grid-section-content" class="content">
97-
98107
<p>
99108
GSS was created by <a data-person="d4" href="https://twitter.com/d4tocchini">Dan Tocchini</a>, leader of the stealth upstart, <a href="http://thegrid.io/">TheGrid</a>. GSS is an scrumptious piece of TheGrid's platform, hence the name <em>Grid</em> Style Sheets.
100109
</p>
101110
<p>
102111
GSS would not be possible without:
103112
</p>
104-
113+
</div>
114+
<div id="grid-section-astro" class="content">
105115

106116
<div id="astro-d4" class="astro-person link">
107117
<a href="https://twitter.com/d4tocchini">

_includes/navigation.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
bottom: == ::window[bottom] !require;
141141
overflow-y: auto;
142142
overflow-x: hidden;
143+
z-index: 1000;
143144

144145
ul {
145146
top: >=0 !require;
@@ -194,7 +195,7 @@
194195
</a>
195196
</li>
196197
<li>
197-
<a href="/usage/">Install</a>
198+
<a href="/usage/client-side">Install</a>
198199
</li>
199200
<li>
200201
<a href="/guides/ccss">CCSS</a>

_includes/tail.html

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
#count-me-in {
1111

12-
z-index: == -1;
13-
1412
@v |-(#gss_logo)-(#prefinery_iframe_inline)-(#pp-link)-| in(&) gap($baseline) outer-gap($v-outer-gap / 2) !strong;
1513

1614
#gss_logo {

_layouts/post.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
}
3636

3737
.content {
38-
bottom: <= ^[bottom] - $bottom-margin;
38+
bottom: <= ^[bottom] - $top-margin / 2;
3939

4040
font-size: == $content-font-size;
4141
line-height: == $baseline;

style/styles.css

+7-11
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,7 @@ ul.large-list a {
176176
color: hsl(58, 100%, 84%);
177177
}
178178

179-
button {
180-
/*color: hsl(282, 99%, 31%);*/
181-
/*background-color: hsl(58, 100%, 84%);*/
179+
/*button {
182180
color: #fdf9ad;
183181
border-color: #784e78;
184182
background-color: #2c182f;
@@ -190,13 +188,10 @@ button:hover, a:hover button,
190188
.button:hover, a:hover .button,
191189
button.transparent:hover
192190
{
193-
/*border-color: hsl(282, 99%, 31%);
194-
background-color: hsl(282, 99%, 31%);
195-
color: hsl(58, 100%, 84%);*/
196191
color: #2c182f;
197192
border-color: #784e78;
198193
background-color: #fdf9ad;
199-
}
194+
}*/
200195

201196
button.inverse {
202197
border-color: hsl(282, 99%, 31%);
@@ -291,12 +286,13 @@ hr {
291286
cover;
292287
}
293288

294-
#top-home-section .button {
289+
button, .button {
290+
background-color: #231028;
295291
color: #fdf9ad;
296292
border-color: #784e78;
297293
}
298294

299-
#top-home-section .button:hover {
295+
button:hover, .button:hover {
300296
background: #784e78 !important;
301297
}
302298

@@ -319,7 +315,7 @@ hr {
319315
}
320316

321317

322-
#home-demos .button {
318+
/*#home-demos .button {
323319
color: hsl(282, 99%, 31%);
324320
}
325321
@@ -328,7 +324,7 @@ hr {
328324
border-color: hsl(282, 99%, 31%);
329325
background-color: hsl(282, 99%, 31%);
330326
color: hsl(58, 100%, 84%);
331-
}
327+
}*/
332328

333329
#home-demos #demos-subtitle {
334330
text-align: center;

usage/_posts/2014-01-20-client-side.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
uid: client-use
33
title: Client-side
4-
layout: default
4+
layout: post
55
color: b
66
---
77

usage/index.html

-21
This file was deleted.

0 commit comments

Comments
 (0)