Skip to content

Commit

Permalink
fixed overflow
Browse files Browse the repository at this point in the history
  • Loading branch information
mmarcon committed Nov 14, 2013
1 parent caff3c9 commit 92f226e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 16 deletions.
33 changes: 17 additions & 16 deletions web/css/main.css
@@ -1,4 +1,4 @@
/* normalize.css v2.1.0 | MIT License | git.io/normalize */ /*! normalize.css v2.1.0 | MIT License | git.io/normalize */
/* ========================================================================== /* ==========================================================================
HTML5 display definitions HTML5 display definitions
========================================================================== */ ========================================================================== */
Expand Down Expand Up @@ -199,7 +199,7 @@ figure {
* Define consistent border, margin, and padding. * Define consistent border, margin, and padding.
*/ */
fieldset { fieldset {
border: 1px solid silver; border: 1px solid #c0c0c0;
margin: 0 2px; margin: 0 2px;
padding: 0.35em 0.625em 0.75em; } padding: 0.35em 0.625em 0.75em; }


Expand Down Expand Up @@ -335,7 +335,7 @@ html {


body { body {
background: #fff; background: #fff;
font-family: "Titillium Web", sans-serif; font-family: 'Titillium Web', sans-serif;
font-weight: 400; } font-weight: 400; }


#map { #map {
Expand Down Expand Up @@ -372,7 +372,7 @@ header {
margin: 0; margin: 0;
padding: 0; } padding: 0; }
header nav ul li { header nav ul li {
font-family: "Oswald", sans-serif; font-family: 'Oswald', sans-serif;
color: #fff; color: #fff;
display: inline-block; display: inline-block;
font-size: 3rem; font-size: 3rem;
Expand All @@ -395,15 +395,15 @@ header {
z-index: 11; z-index: 11;
padding-bottom: 8rem; } padding-bottom: 8rem; }
header .title h1 { header .title h1 {
font-family: "Oswald", sans-serif; font-family: 'Oswald', sans-serif;
font-size: 11rem; font-size: 11rem;
line-height: 1.2; line-height: 1.2;
margin: 0; margin: 0;
padding: 0; padding: 0;
color: #fff; color: #fff;
font-weight: normal; } font-weight: normal; }
header .title h2 { header .title h2 {
font-family: "Syncopate", sans-serif; font-family: 'Syncopate', sans-serif;
font-size: 2.2rem; font-size: 2.2rem;
text-transform: uppercase; text-transform: uppercase;
color: #fff; color: #fff;
Expand Down Expand Up @@ -511,10 +511,10 @@ header {
color: #fff; color: #fff;
font-size: 1.6rem; } font-size: 1.6rem; }
.content#docs div p { .content#docs div p {
margin: 0.5rem 0; } margin: .5rem 0; }
.content#docs div h3 { .content#docs div h3 {
text-transform: uppercase; text-transform: uppercase;
font-family: "Oswald", sans-serif; font-family: 'Oswald', sans-serif;
color: coral; color: coral;
text-shadow: none; text-shadow: none;
text-shadow: rgba(139, 34, 34, 0.4) 1px 0px 0px; } text-shadow: rgba(139, 34, 34, 0.4) 1px 0px 0px; }
Expand All @@ -528,7 +528,7 @@ header {
height: auto; height: auto;
background: transparent; } background: transparent; }
.content header h3 { .content header h3 {
font-family: "Oswald", sans-serif; font-family: 'Oswald', sans-serif;
font-size: 6rem; font-size: 6rem;
margin: 0; margin: 0;
text-transform: uppercase; text-transform: uppercase;
Expand All @@ -546,23 +546,24 @@ header {
width: 30%; width: 30%;
min-width: 20rem; min-width: 20rem;
height: 25.6rem; height: 25.6rem;
border: 2px solid #333333; border: 2px solid #333;
background: #eee; } background: #eee;
overflow: hidden; }
.content .demos li span, .content .demos li .caption { .content .demos li span, .content .demos li .caption {
position: absolute; position: absolute;
right: 0; right: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
z-index: 10; z-index: 10;
display: block; display: block;
padding: 0.4rem 0; padding: .4rem 0;
background: #333; background: #333;
color: #fff; color: #fff;
text-align: center; text-align: center;
text-transform: uppercase; text-transform: uppercase;
letter-spacing: .1rem; letter-spacing: .1rem;
font-size: 1.6rem; font-size: 1.6rem;
font-family: "Oswald", sans-serif; } font-family: 'Oswald', sans-serif; }
.content .demos li a.playground:link, .content .demos li a.playground:visited { .content .demos li a.playground:link, .content .demos li a.playground:visited {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
Expand All @@ -574,7 +575,7 @@ header {
.content .demos li a.playground:hover, .content .demos li a.playground:active { .content .demos li a.playground:hover, .content .demos li a.playground:active {
background-image: url(../img/console-r.png); } background-image: url(../img/console-r.png); }
.content .demos li .address, .content .demos li .location { .content .demos li .address, .content .demos li .location {
font-family: "Oswald", sans-serif; font-family: 'Oswald', sans-serif;
position: absolute; position: absolute;
color: #333; color: #333;
top: 1rem; top: 1rem;
Expand All @@ -585,8 +586,8 @@ header {
top: 50%; } top: 50%; }
.content .gravatar { .content .gravatar {
float: left; float: left;
margin: 0.5rem 1rem 1rem 0; margin: .5rem 1rem 1rem 0;
border: 8px solid white; } border: 8px solid #fff; }


footer { footer {
background: #fff; background: #fff;
Expand Down
1 change: 1 addition & 0 deletions web/css/main.scss
Expand Up @@ -356,6 +356,7 @@ header {
height: (76.8rem/3); height: (76.8rem/3);
border: 2px solid #333; border: 2px solid #333;
background: #eee; background: #eee;
overflow: hidden;


// &:hover { // &:hover {
// border: 2px solid #444; // border: 2px solid #444;
Expand Down

0 comments on commit 92f226e

Please sign in to comment.