From 3c7965142da6f798f9139d0c21e34bce2aa2a021 Mon Sep 17 00:00:00 2001 From: Benjamin Flores Date: Fri, 15 May 2015 14:57:42 -0300 Subject: [PATCH 1/2] "Supported by" fix. --- public/stylesheets/app.css | 51 +++++++++++++++++++++++-------------- public/stylesheets/app.styl | 47 +++++++++++++++++++++------------- views/layout.jade | 11 +++++--- 3 files changed, 68 insertions(+), 41 deletions(-) diff --git a/public/stylesheets/app.css b/public/stylesheets/app.css index 164961222..17d4924f2 100644 --- a/public/stylesheets/app.css +++ b/public/stylesheets/app.css @@ -3022,7 +3022,8 @@ html { } body { -webkit-text-size-adjust: none; - font: 16px/30px 'Avenir'; + font: 16px/30px 'Avenir W01', Arial, sans-serif; + font-weight: 200; color: rgba(255,255,255,0.8); background: #000; height: 100%; @@ -3048,7 +3049,8 @@ textarea, select, button { outline: none; - font-family: 'Avenir'; + font-family: 'Avenir W01', Arial, sans-serif; + font-weight: 200; } a { color: #01b7ee; @@ -3376,6 +3378,14 @@ ul li { display: inline-block; vertical-align: middle; } +#menu .supported { + display: none; +} +@media (min-width: 768px) { + #menu .supported { + display: block; + } +} @media screen and (min-width: 992px) and (max-height: 750px) { #menu { overflow-y: scroll; @@ -3387,21 +3397,17 @@ ul li { bottom: 0; left: 0; font-size: 14px; - padding-bottom: 50px; text-align: center; color: #999; z-index: 10; - display: block; + margin: 0 auto; } @media (min-width: 768px) { .supported { - position: fixed; - width: 240px; - } -} -@media (min-width: 992px) { - .supported { - width: 330px; + width: 100%; + margin-left: -10px; + position: absolute; + bottom: 20px; } } .supported .auth0 { @@ -3412,9 +3418,11 @@ ul li { margin-bottom: -8px; background: url("../images/supported_logo.svg") no-repeat; } -@media screen and (min-width: 992px) and (max-height: 680px) { +@media screen and (min-width: 768px) and (max-height: 750px) { .supported { - display: none; + position: relative; + bottom: auto; + margin-top: 80px; } } .menu-hold { @@ -3508,7 +3516,8 @@ ul li { position: relative; -webkit-transform: none; transform: none; - top: 80px; + top: auto; + margin-top: 80px; } } .rw-wrapper { @@ -3577,6 +3586,15 @@ ul li { padding-left: 350px; } } +.content .supported { + display: block; + margin-top: 40px; +} +@media (min-width: 768px) { + .content .supported { + display: none; + } +} .home { max-width: 840px; width: 100%; @@ -4421,11 +4439,6 @@ html.is-menu body .social li:last-child { font-weight: bold; color: #d4fd02; } -@media (min-width: 992px) { - .ie .search-con .results { - width: 1000px; - } -} @-webkit-keyframes blink { to { visibility: hidden; diff --git a/public/stylesheets/app.styl b/public/stylesheets/app.styl index a9340c968..ea15908f4 100644 --- a/public/stylesheets/app.styl +++ b/public/stylesheets/app.styl @@ -9,7 +9,8 @@ html body -webkit-text-size-adjust none - font 16px/30px 'Avenir' + font 16px/30px 'Avenir W01', Arial, sans-serif + font-weight 200 color rgba(255,255,255,.8) background #000 height 100% @@ -28,7 +29,8 @@ body input, textarea, select, button outline none - font-family 'Avenir' + font-family 'Avenir W01', Arial, sans-serif + font-weight 200 a color blue @@ -291,25 +293,31 @@ ul display inline-block vertical-align middle + .supported + display none + +breakpoint("tablet") + display block + .supported clear both padding 10px bottom 0 left 0 - font-size: 14px; - padding-bottom 50px + font-size 14px text-align center color #999 z-index 10 - display block + margin 0 auto +breakpoint("tablet") - position fixed - width 240px - +breakpoint("desktop") - width 330px - - @media screen and ( max-height: 680px ) - display none + width 100% + margin-left -10px + position absolute + bottom 20px + +breakpoint("tablet") + @media screen and ( max-height: 750px ) + position relative + bottom auto + margin-top 80px .auth0 width 24px @@ -338,7 +346,8 @@ ul position relative -webkit-transform none transform none - top 80px + top auto + margin-top 80px li padding-left 26% @@ -401,6 +410,7 @@ ul li margin 0 5px 0 + .rw-wrapper position: relative; @@ -452,6 +462,12 @@ ul +breakpoint("desktop") padding-left 350px + .supported + display block + margin-top 40px + +breakpoint("tablet") + display none + .home max-width 840px width 100% @@ -1098,11 +1114,6 @@ html.is-menu, html.is-menu body color: yellow; - -+breakpoint("desktop") - .ie .search-con .results - width 1000px - @keyframes blink { to { visibility: hidden; diff --git a/views/layout.jade b/views/layout.jade index e45d9d599..86fff283f 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -87,15 +87,18 @@ html(lang="en") li a(href='/', data-search='') Strategies + a(href='http://auth0.com', target='_blank').supported + | Supported by + i.auth0 + #page-content.content block content - - a(href='http://auth0.com', target='_blank').supported - | Supported by - i.auth0 + a(href='http://auth0.com', target='_blank').supported + | Supported by + i.auth0 .search-con .head From 33476ccf2c2bf0a81fb7458d28e59b03cd2dd4ed Mon Sep 17 00:00:00 2001 From: Benjamin Flores Date: Fri, 15 May 2015 15:00:38 -0300 Subject: [PATCH 2/2] Font minor fix. --- public/stylesheets/app.css | 4 ++-- public/stylesheets/app.styl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/stylesheets/app.css b/public/stylesheets/app.css index 17d4924f2..b4f7393a5 100644 --- a/public/stylesheets/app.css +++ b/public/stylesheets/app.css @@ -3022,7 +3022,7 @@ html { } body { -webkit-text-size-adjust: none; - font: 16px/30px 'Avenir W01', Arial, sans-serif; + font: 16px/30px 'Avenir', Arial, sans-serif; font-weight: 200; color: rgba(255,255,255,0.8); background: #000; @@ -3049,7 +3049,7 @@ textarea, select, button { outline: none; - font-family: 'Avenir W01', Arial, sans-serif; + font-family: 'Avenir', Arial, sans-serif; font-weight: 200; } a { diff --git a/public/stylesheets/app.styl b/public/stylesheets/app.styl index ea15908f4..5b679be0f 100644 --- a/public/stylesheets/app.styl +++ b/public/stylesheets/app.styl @@ -9,7 +9,7 @@ html body -webkit-text-size-adjust none - font 16px/30px 'Avenir W01', Arial, sans-serif + font 16px/30px 'Avenir', Arial, sans-serif font-weight 200 color rgba(255,255,255,.8) background #000 @@ -29,7 +29,7 @@ body input, textarea, select, button outline none - font-family 'Avenir W01', Arial, sans-serif + font-family 'Avenir', Arial, sans-serif font-weight 200 a