Skip to content
This repository was archived by the owner on Mar 25, 2019. It is now read-only.

Commit 8068d05

Browse files
committed
Various updates
1 parent 3a87011 commit 8068d05

File tree

8 files changed

+188
-33
lines changed

8 files changed

+188
-33
lines changed

_default_settings.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ $select-focus-border-color: $color-success !default;
173173
// Breakpoints
174174

175175
$breakpoint-small: 32em !default;
176-
$breakpoint-medium: 50em !default;
176+
$breakpoint-medium: 48em !default;
177177
$breakpoint-large: 75em !default;
178178

179179

docs/css/docs.css

Lines changed: 65 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro);
21
html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
32
margin: 0;
43
padding: 0;
@@ -376,7 +375,7 @@ main address, main audio, main embed, main object, main map, main svg, main vide
376375
margin-bottom: 1.7em; }
377376

378377
.container {
379-
max-width: 50em;
378+
max-width: 48em;
380379
padding: 3.4em;
381380
margin-left: auto;
382381
margin-right: auto; }
@@ -416,7 +415,8 @@ pre {
416415
padding: 0.85em;
417416
white-space: pre-wrap;
418417
max-height: 80vh;
419-
overflow: scroll; }
418+
overflow-x: hidden;
419+
overflow-y: scroll; }
420420

421421
details {
422422
margin-bottom: 1.7em; }
@@ -476,30 +476,30 @@ math {
476476
.grid-module-container {
477477
padding: 1.7em 1.275em;
478478
margin: 0 auto;
479-
max-width: 52.55em; }
479+
max-width: 50.55em; }
480480
.grid-module-container:before, .grid-module-container:after {
481481
content: "";
482482
display: table; }
483483
.grid-module-container:after {
484484
clear: both; }
485-
@media screen and (min-width: 28.825em) {
485+
@media screen and (min-width: 27.825em) {
486486
.grid-module-container {
487-
max-width: 26.275em;
487+
max-width: 25.275em;
488488
padding: 3.4em 1.275em; }
489489
.grid-module-container .grid-module {
490-
width: 26.275em; } }
491-
@media screen and (min-width: 55.1em) {
490+
width: 25.275em; } }
491+
@media screen and (min-width: 53.1em) {
492492
.grid-module-container {
493-
max-width: 52.55em; } }
494-
@media screen and (min-width: 81.375em) {
493+
max-width: 50.55em; } }
494+
@media screen and (min-width: 78.375em) {
495495
.grid-module-container {
496-
max-width: 78.825em; } }
497-
@media screen and (min-width: 107.65em) {
496+
max-width: 75.825em; } }
497+
@media screen and (min-width: 103.65em) {
498498
.grid-module-container {
499-
max-width: 105.1em; } }
500-
@media screen and (min-width: 133.925em) {
499+
max-width: 101.1em; } }
500+
@media screen and (min-width: 128.925em) {
501501
.grid-module-container {
502-
max-width: 131.375em; } }
502+
max-width: 126.375em; } }
503503

504504
.absolute-top-left, .absolute-top-right, .fixed-top-left, .fixed-top-right {
505505
top: 0; }
@@ -842,13 +842,11 @@ select {
842842
select:hover {
843843
color: #5694bd;
844844
background-color: #d6e6ef;
845-
border-color: #5694bd;
846-
background-image: url("data:image/svg+xml;utf8, <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"32\" height=\"32\" viewBox=\"0 0 32 32\"><path fill=\"#5694bd\" d=\"M8 12l8 8 8-8z\" /></svg>"); }
845+
border-color: #5694bd; }
847846
select:focus {
848847
color: #91ce3b;
849848
background-color: #e2f2ca;
850-
border-color: #91ce3b;
851-
background-image: url("data:image/svg+xml;utf8, <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"32\" height=\"32\" viewBox=\"0 0 32 32\"><path fill=\"#91ce3b\" d=\"M8 12l8 8 8-8z\" /></svg>"); }
849+
border-color: #91ce3b; }
852850
select[multiple] {
853851
background-image: none; }
854852

@@ -857,7 +855,9 @@ select {
857855
-moz-appearance: none;
858856
text-indent: 0.01px;
859857
text-overflow: '';
860-
background-image: url("data:image/svg+xml;utf8, <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"32\" height=\"32\" viewBox=\"0 0 32 32\"><path d=\"M8 12l8 8 8-8z\" /></svg>"); } }
858+
background-image: url("data:image/svg+xml;utf8, <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"32\" height=\"32\" viewBox=\"0 0 32 32\"><path d=\"M8 12l8 8 8-8z\" /></svg>"); }
859+
select:hover, select:focus {
860+
background-image: url("data:image/svg+xml;utf8, <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"32\" height=\"32\" viewBox=\"0 0 32 32\"><path d=\"M8 12l8 8 8-8z\" /></svg>"); } }
861861

862862
input[type='text'], input[type='search'], input[type='tel'], input[type='email'], input[type='password'], input[type='url'], input[type='date'], input[type='datetime'], input[type='time'], input[type='number'], input[list], textarea {
863863
-webkit-appearance: none;
@@ -1559,7 +1559,7 @@ article header {
15591559
.show-html:before {
15601560
content: '</>';
15611561
margin-right: 0.5em; }
1562-
@media screen and (max-width: 50em) {
1562+
@media screen and (max-width: 48em) {
15631563
.show-html {
15641564
text-indent: -9999px;
15651565
width: 3em; }
@@ -1608,7 +1608,7 @@ article header {
16081608
.menu li ul li a {
16091609
text-transform: none; }
16101610

1611-
@media screen and (max-width: 50em) {
1611+
@media screen and (max-width: 48em) {
16121612
#nav-menu + div {
16131613
display: none !important; }
16141614
.menu, .nav-toggle {
@@ -1717,3 +1717,46 @@ article header {
17171717
.menu-push-toright .nav-toggle {
17181718
left: 100%;
17191719
margin-left: -3em; } } }
1720+
1721+
footer {
1722+
background: whitesmoke; }
1723+
footer .social-share {
1724+
text-align: right; }
1725+
1726+
.hideshare-wrap {
1727+
position: relative;
1728+
display: inline-block;
1729+
width: auto !important;
1730+
height: auto !important; }
1731+
1732+
.hideshare-list {
1733+
position: absolute;
1734+
right: 0;
1735+
left: auto !important;
1736+
bottom: 100% !important;
1737+
top: auto !important;
1738+
margin: 0;
1739+
padding: 0;
1740+
list-style: none;
1741+
text-align: center;
1742+
background: white;
1743+
width: auto !important;
1744+
margin-bottom: 0.75em;
1745+
white-space: nowrap; }
1746+
.hideshare-list:after {
1747+
content: '';
1748+
position: absolute;
1749+
border: 0.5em solid transparent;
1750+
border-top-color: white;
1751+
bottom: -1em;
1752+
right: 1.5em; }
1753+
.hideshare-list li {
1754+
display: inline-block;
1755+
zoom: 1;
1756+
*display: inline; }
1757+
.hideshare-list li a {
1758+
display: block;
1759+
padding: 0.25em 0.5em;
1760+
border-left: thin solid #eeeeee; }
1761+
.hideshare-list li:first-child a {
1762+
border-left-width: 0; }

docs/css/docs.scss

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro);
21

32
// Settings
43

@@ -363,3 +362,59 @@ article header {
363362
}
364363
}
365364
}
365+
366+
367+
footer {
368+
background: whitesmoke;
369+
370+
.social-share { text-align: right; }
371+
}
372+
373+
374+
.hideshare-wrap {
375+
position: relative;
376+
display: inline-block;
377+
width: auto !important;
378+
height: auto !important;
379+
}
380+
381+
.hideshare-list {
382+
position: absolute;
383+
right: 0;
384+
left: auto !important;
385+
bottom: 100% !important;
386+
top: auto !important;
387+
margin: 0;
388+
padding: 0;
389+
list-style: none;
390+
text-align: center;
391+
background: white;
392+
width: auto !important;
393+
margin-bottom: 0.75em;
394+
white-space: nowrap;
395+
396+
&:after {
397+
content: '';
398+
position: absolute;
399+
border: 0.5em solid transparent;
400+
border-top-color: white;
401+
bottom: -1em;
402+
right: 1.5em;
403+
}
404+
405+
li {
406+
display: inline-block;
407+
zoom: 1;
408+
*display: inline;
409+
410+
a {
411+
display: block;
412+
padding: 0.25em .5em;
413+
border-left: thin solid #eee;
414+
}
415+
416+
&:first-child a {
417+
border-left-width: 0;
418+
}
419+
}
420+
}

docs/index.html

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,22 @@
2121
<meta content="http://www.terrain.io" property="og:url">
2222
<meta content="A collection of structural stylesheets for your projects." property="og:description">
2323

24-
<meta name="description" content="A collection of structural stylesheets for your projects.">
24+
<meta name="description" content="A collection of structural stylesheets for your web projects.">
25+
<meta name="keywords" content="css, stylesheets, sass, scss, front-end, design, responsive">
26+
2527
<meta name="viewport" content="width = device-width, initial-scale = 1">
2628

2729
<link rel="icon" href="favicon.ico">
30+
<link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic' rel='stylesheet' type='text/css'>
31+
2832
<link rel="stylesheet" href="css/docs.css">
2933
</head>
3034

3135
<body class="menu-push">
3236
<header class="hero">
3337
<div class="hero-background">
3438
<img id="heroImage" class="hero-image" src="images/mountain.jpg" />
39+
<!-- Photo by Uwe Gille - http://commons.wikimedia.org/wiki/File:Nuptse-fromLobuche.jpg -->
3540
<svg id='triangleGrid' preserveaspectratio='xMidYMin slice' version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000">
3641
<rect x="-17.678" y="-17.678" transform="matrix(0.7071 -0.7071 0.7071 0.7071 0 0)" fill="none" width="35.355" height="35.355"/>
3742
<rect x="32.322" y="-17.678" transform="matrix(0.7071 -0.7071 0.7071 0.7071 14.6447 35.3553)" fill="none" width="35.355" height="35.355"/>
@@ -1594,22 +1599,47 @@ <h2>Menus</h2>
15941599
</main>
15951600

15961601

1597-
<footer>
1602+
<div id="comments">
15981603
<div class="container">
1599-
Made by <a href="https://triggerapp.com">Trigger</a>.
1604+
<div id="disqus_thread"></div>
1605+
<script type="text/javascript">
1606+
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
1607+
var disqus_shortname = 'terraincss'; // required: replace example with your forum shortname
1608+
1609+
/* * * DON'T EDIT BELOW THIS LINE * * */
1610+
(function() {
1611+
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
1612+
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
1613+
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
1614+
})();
1615+
</script>
1616+
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
1617+
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
1618+
</div>
1619+
</div>
16001620

1601-
&nbsp;&nbsp;&nbsp;
16021621

1603-
<span>Contact us: <a href="https://twitter.com/terraincss">@terraincss</a></span>
1622+
<footer>
1623+
<div class="container">
1624+
<div class="grid-container">
1625+
<div class='one-half'>
1626+
Made by <a href="https://triggerapp.com">Trigger</a>.
1627+
<span>Contact us: <a href="https://twitter.com/terraincss">@terraincss</a></span>
1628+
</div>
1629+
<div class='one-half social-share'>
1630+
<a class="button submit share-button" href="#">Share</a>
1631+
</div>
1632+
</div>
16041633
</div>
16051634
</footer>
16061635

16071636
<div id="nav-toggle-overlay" class="nav-toggle-overlay"></div>
16081637

16091638
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
16101639
<script type="text/javascript" src="js/jquery.sticky-kit.js"></script>
1611-
1640+
<script type="text/javascript" src="js/share.min.js"></script>
16121641
<script type="text/javascript" src="js/color-sampler.js"></script>
1642+
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/fastclick/1.0.0/fastclick.min.js"></script>
16131643
<script type="text/javascript" src="js/main.js"></script>
16141644

16151645
<script>

docs/js/main.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,22 @@
11
(function (global) {
22

3+
$(".share-button").hideshare({
4+
media: "http://triggerapp.s3.amazonaws.com/images/terrain/avatar.jpg",
5+
description: "A collection of structural stylesheets for your projects.",
6+
position: "top",
7+
facebook: true,
8+
twitter: true,
9+
googleplus: true,
10+
pinterest: false,
11+
linkedin: false
12+
});
13+
314
$("#nav-menu").stick_in_parent();
415

16+
setTimeout(function() {
17+
$(document.body).trigger("sticky_kit:recalc");
18+
}, 7500);
19+
520
$('[href=' + window.location.hash + ']').addClass('active')
621

722
$("#nav-menu a").on('click', function(e) {
@@ -120,3 +135,8 @@
120135
});
121136
})();
122137
})(window || this);
138+
139+
140+
$(function() {
141+
FastClick.attach(document.body);
142+
});

docs/js/share.min.js

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

terrain/interactive/_selects.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,12 @@ select {
3232
color: $select-hover-foreground-color;
3333
background-color: $select-hover-background-color;
3434
border-color: $select-hover-border-color;
35-
background-image: url("data:image/svg+xml;utf8, <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"32\" height=\"32\" viewBox=\"0 0 32 32\"><path fill=\"#{ $select-hover-foreground-color }\" d=\"M8 12l8 8 8-8z\" /></svg>");
3635
}
3736

3837
&:focus {
3938
color: $select-focus-foreground-color;
4039
background-color: $select-focus-background-color;
4140
border-color: $select-focus-border-color;
42-
background-image: url("data:image/svg+xml;utf8, <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"32\" height=\"32\" viewBox=\"0 0 32 32\"><path fill=\"#{ $select-focus-foreground-color }\" d=\"M8 12l8 8 8-8z\" /></svg>");
4341
}
4442

4543
&[multiple] { background-image: none; }
@@ -56,5 +54,9 @@ select {
5654
text-indent: 0.01px;
5755
text-overflow: '';
5856
background-image: url("data:image/svg+xml;utf8, <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"32\" height=\"32\" viewBox=\"0 0 32 32\"><path d=\"M8 12l8 8 8-8z\" /></svg>");
57+
58+
&:hover, &:focus {
59+
background-image: url("data:image/svg+xml;utf8, <svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"32\" height=\"32\" viewBox=\"0 0 32 32\"><path d=\"M8 12l8 8 8-8z\" /></svg>");
60+
}
5961
}
6062
}

terrain/layout/_blocks.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ pre {
4949
padding: $line-height / 2;
5050
white-space: pre-wrap;
5151
max-height: 80vh;
52-
overflow: scroll;
52+
overflow-x: hidden;
53+
overflow-y: scroll;
5354
}
5455

5556
details {

0 commit comments

Comments
 (0)