Merge pull request #426 from danleech/develop

Develop
This commit is contained in:
Dan Leech 2017-05-03 14:22:47 +01:00 committed by GitHub
commit b232456da5

View File

@ -104,16 +104,16 @@
<link rel="preconnect" href="//cdn.carbonads.com"> <link rel="preconnect" href="//cdn.carbonads.com">
<link rel="preconnect" href="//github.com"> <link rel="preconnect" href="//github.com">
<title>Simple Icons</title> <title>Simple Icons</title>
<meta name="description" content="SVG icons for popular brands."> <meta name="description" content="Free SVG icons for popular brands.">
<meta property="og:type" content="website"> <meta property="og:type" content="website">
<meta property="og:title" content="Simple Icons"> <meta property="og:title" content="Simple Icons">
<meta property="og:description" content="SVG icons for popular brands."> <meta property="og:description" content="Free SVG icons for popular brands.">
<meta property="og:url" content="https://simpleicons.org"> <meta property="og:url" content="https://simpleicons.org">
<meta property="og:site_name" content="Simple Icons"> <meta property="og:site_name" content="Simple Icons">
<meta property="og:image" content="https://simpleicons.org/images/og.png"> <meta property="og:image" content="https://simpleicons.org/images/og.png">
<meta name="twitter:card" content="summary_large_image"> <meta name="twitter:card" content="summary_large_image">
<meta name="twitter:title" content="Simple Icons"> <meta name="twitter:title" content="Simple Icons">
<meta name="twitter:description" content="SVG icons for popular brands."> <meta name="twitter:description" content="Free SVG icons for popular brands.">
<meta name="twitter:site" content="@bathtype"> <meta name="twitter:site" content="@bathtype">
<meta name="twitter:domain" content="Simple Icons"> <meta name="twitter:domain" content="Simple Icons">
<meta name="twitter:image:src" content="https://simpleicons.org/images/og.png"> <meta name="twitter:image:src" content="https://simpleicons.org/images/og.png">
@ -123,15 +123,15 @@
<link rel="mask-icon" href="https://simpleicons.org/images/logo.svg" color="#111111"> <link rel="mask-icon" href="https://simpleicons.org/images/logo.svg" color="#111111">
<style> <style>
* { * {
box-sizing: border-box; box-sizing: border-box;
} }
:root { :root {
font-size: 100%; font-size: 100%;
} }
a { a {
text-decoration: none; text-decoration: none;
} }
abbr { abbr {
@ -139,202 +139,224 @@
} }
body { body {
background-color: #FFFFFF; background-color: #FFFFFF;
color: #263238; color: #263238;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
font-size: 0.875rem; font-size: 0.875rem;
line-height: 1.5rem; line-height: 1.5rem;
margin: 0; margin: 0;
} }
svg { svg {
height: 1.5rem; height: 1.5rem;
width: 1.5rem; width: 1.5rem;
} }
path, rect, circle { path, rect, circle {
fill: #FFF; fill: #FFF;
} }
#carbonads { #carbonads {
height: 100%; height: 100%;
width: 100%; width: 100%;
} }
#carbonads a { #carbonads a {
color: #263238; color: #263238;
} }
#carbonads > span { #carbonads > span {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
justify-content: space-between; justify-content: space-between;
} }
.carbon-img { .carbon-img {
display: block; display: block;
padding: 1rem 1rem 0.5rem; padding: 1rem 1rem 0.5rem;
} }
.carbon-text { .carbon-text {
display: block; display: block;
font-size: 0.75rem; font-size: 0.75rem;
line-height: 1rem; line-height: 1rem;
margin: 0 auto; margin: 0 auto;
max-width: 15rem; max-width: 15rem;
} }
.carbon-poweredby { .carbon-poweredby {
font-size: 0.625rem; font-size: 0.625rem;
font-weight: 700; font-weight: 700;
line-height: 1.5rem; line-height: 1.5rem;
opacity: 0.25; opacity: 0.25;
text-transform: uppercase; text-transform: uppercase;
} }
.footer { .footer {
background-color: #EEE; background-color: #EEE;
padding: 1.5rem; padding: 1.5rem;
} }
@media (min-width: 720px) { @media (min-width: 45rem) {
.footer { .footer {
padding: 3rem; display: flex;
justify-content: space-between;
padding: 3rem;
} }
} }
.footer a { .footer a {
color: #263238; color: #263238;
text-decoration: underline; text-decoration: underline;
} }
.footer p { .footer p {
margin: 0; margin: 0;
opacity: 0.5; opacity: 0.5;
}
a.share-button {
background-color: #1DA1F2;
border-radius: 0.125rem;
color: #FFF;
display: block;
margin: 0.75rem 0 0;
padding: 0.75rem 1.5rem;
text-align: center;
text-decoration: none;
}
@media (min-width: 45rem) {
a.share-button {
margin: 0;
}
} }
.hero { .hero {
font-size: 1.5rem; font-size: 1.5rem;
line-height: 2rem; line-height: 2rem;
margin: 0; margin: 0;
padding: 4.5rem 1.5rem 1.5rem; padding: 3rem 1.5rem 1.5rem;
text-align: center; text-align: center;
} }
@media (min-width: 45rem) {
.hero {
padding: 4.5rem 3rem 1.5rem;
}
}
.grid { .grid {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
list-style: none; list-style: none;
margin: 1.5rem; margin: 1.5rem;
padding: 0; padding: 0;
} }
@media (min-width: 720px) { @media (min-width: 45rem) {
.grid { .grid {
margin: 3rem; margin: 3rem;
} }
} }
@supports (display: grid) { @supports (display: grid) {
.grid { .grid {
display: grid; display: grid;
grid-template-columns: repeat(auto-fill, minmax(9rem, 1fr)); grid-template-columns: repeat(auto-fill, minmax(9rem, 1fr));
grid-auto-rows: 6rem; grid-auto-rows: 6rem;
grid-column-gap: 0.375rem; grid-column-gap: 0.375rem;
grid-row-gap: 0.375rem; grid-row-gap: 0.375rem;
grid-auto-flow: dense; grid-auto-flow: dense;
} }
} }
.grid-item { .grid-item {
background-color: #757575; background-color: #757575;
text-align: center; text-align: center;
} }
@supports not (display: grid) { @supports not (display: grid) {
.grid-item { .grid-item {
border: 0.1875rem solid #FFF; border: 0.1875rem solid #FFF;
padding: 0 0 0.75rem; padding: 0 0 0.75rem;
width: 20%; width: 20%;
} }
} }
.grid-item--ad { .grid-item--ad {
background-color: #EEE; background-color: #EEE;
grid-column: -2 / -1; grid-column: -2 / -1;
grid-row-end: span 2; grid-row-end: span 2;
height: auto; height: auto;
} }
@media (min-width: 21.75rem) { @media (min-width: 21.75rem) {
.grid-item--ad { .grid-item--ad {
grid-column: -3 / -1; grid-column: -3 / -1;
} }
} }
@supports not (display: grid) { @supports not (display: grid) {
.grid-item--ad { .grid-item--ad {
width: 100%; width: 100%;
} }
} }
.grid-item__link { .grid-item__link {
color: #FFFFFF; color: #FFFFFF;
display: block; display: block;
padding: 1rem 1rem 0; padding: 1rem 1rem 0;
text-align: center; text-align: center;
width: 100%; width: 100%;
} }
.grid-item__image { .grid-item__image {
height: 1.5rem; height: 1.5rem;
width: 1.5rem; width: 1.5rem;
} }
.grid-item__title { .grid-item__title {
font-size: 0.75rem; font-size: 0.75rem;
font-weight: 400; font-weight: 400;
line-height: 1rem; line-height: 1rem;
margin: 0; margin: 0;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.grid-item__subtitle { .grid-item__subtitle {
color: #FFFFFF; color: #FFFFFF;
font-size: 0.75rem; font-size: 0.75rem;
line-height: 1rem; line-height: 1rem;
margin: 0; margin: 0;
opacity: 0.5; opacity: 0.5;
} }
.navbar { .navbar {
background-color: #263238; background-color: #263238;
} }
.navbar__nav { .navbar__nav {
display: flex; display: flex;
list-style: none; list-style: none;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
@media (min-width: 720px) { @media (min-width: 45rem) {
.navbar__nav { .navbar__nav {
padding: 0 1.5rem; padding: 0 1.5rem;
} }
} }
.navbar__nav-item a { .navbar__nav-item a {
color: #FFF; color: #FFF;
display: block; display: block;
opacity: 0.5; opacity: 0.5;
padding: 1.5rem 0.375rem; padding: 1.5rem 0.375rem;
} }
.navbar__nav-item a:focus, .navbar__nav-item a:hover { .navbar__nav-item a:focus, .navbar__nav-item a:hover {
opacity: 1; opacity: 1;
} }
.navbar__nav-item:last-child a { .navbar__nav-item:last-child a {
padding: 1.5rem 1.5rem 1.5rem 0.375rem; padding: 1.5rem 1.5rem 1.5rem 0.375rem;
} }
.navbar__nav-item--home { .navbar__nav-item--home {
flex-grow: 1; flex-grow: 1;
} }
.navbar__nav-item--home a { .navbar__nav-item--home a {
opacity: 1; opacity: 1;
padding: 1.5rem 0 1.5rem 1.5rem; padding: 1.5rem 0 1.5rem 1.5rem;
} }
</style> </style>
</head> </head>
@ -348,7 +370,7 @@
</ul> </ul>
</header> </header>
<main role="main"> <main role="main">
<p class="hero">{{ site.data.simple-icons.icons | size }} free <abbr title="Scalable Vector Graphic">SVG</abbr> icons for popular brands</p> <p class="hero">Free <abbr title="Scalable Vector Graphic">SVG</abbr> icons for popular&nbsp;brands</p>
<ul class="grid"> <ul class="grid">
<li class="grid-item grid-item--ad"> <li class="grid-item grid-item--ad">
<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1696&amp;serve=CVYD42T&amp;placement=simpleiconsorg" id="_carbonads_js"></script> <script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1696&amp;serve=CVYD42T&amp;placement=simpleiconsorg" id="_carbonads_js"></script>
@ -378,8 +400,9 @@
</ul> </ul>
</main> </main>
<footer class="footer" role="contentinfo"> <footer class="footer" role="contentinfo">
<p>A <a href="https://github.com/danleech/simple-icons/blob/master/LICENSE.md">CC0</a> project maintained by <a href="https://twitter.com/bathtype">Dan&nbsp;Leech</a>.</p> <p>A <a href="https://github.com/danleech/simple-icons/blob/master/LICENSE.md">CC0</a> project maintained by <a href="https://twitter.com/bathtype">Dan&nbsp;Leech</a>.<br>
<p>Use <a href="https://github.com/danleech/simple-icons">GitHub</a> for requests, corrections and contributions.</p> Use <a href="https://github.com/danleech/simple-icons">GitHub</a> for requests, corrections and contributions.</p>
<a class="share-button" href="https://twitter.com/share?url=https%3A%2F%2Fsimpleicons.org&via=bathtype&text=Simple%20Icons%3A%20free%20SVG%20icons%20for%20popular%20brands.">Share this on Twitter!</a>
</footer> </footer>
<script> <script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){