Skip to content

Commit

Permalink
Fixing broken responsive grids
Browse files Browse the repository at this point in the history
  • Loading branch information
@gene1wood
gene1wood committed Nov 18, 2014
1 parent cff1997 commit 7946548
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 61 deletions.
115 changes: 56 additions & 59 deletions css/screen.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,74 +37,74 @@ p {margin-bottom: 24px;}
/* @Fonts *********/
/* Regular */
@font-face {
font-family: "Open Sans";
src: url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.eot");
src: url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"),
url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.woff") format("woff"),
url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.ttf") format("truetype");
font-weight: normal;
font-style: normal;
font-family: "Open Sans";
src: url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.eot");
src: url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"),
url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.woff") format("woff"),
url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.ttf") format("truetype");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: "Open Sans";
src: url("//www.mozilla.org/media/fonts/OpenSans-Italic-webfont.eot");
src: url("//www.mozilla.org/media/fonts/OpenSans-Italic-webfont.eot?#iefix") format("embedded-opentype"),
url("//www.mozilla.org/media/fonts/OpenSans-Italic-webfont.woff") format("woff"),
url("//www.mozilla.org/media/fonts/OpenSans-Italic-webfont.ttf") format("truetype");
font-weight: normal;
font-style: italic;
font-family: "Open Sans";
src: url("//www.mozilla.org/media/fonts/OpenSans-Italic-webfont.eot");
src: url("//www.mozilla.org/media/fonts/OpenSans-Italic-webfont.eot?#iefix") format("embedded-opentype"),
url("//www.mozilla.org/media/fonts/OpenSans-Italic-webfont.woff") format("woff"),
url("//www.mozilla.org/media/fonts/OpenSans-Italic-webfont.ttf") format("truetype");
font-weight: normal;
font-style: italic;
}

@font-face {
font-family: "Open Sans";
src: url("//www.mozilla.org/media/fonts/OpenSans-Semibold-webfont.eot");
src: url("//www.mozilla.org/media/fonts/OpenSans-Semibold-webfont.eot?#iefix") format("embedded-opentype"),
url("//www.mozilla.org/media/fonts/OpenSans-Semibold-webfont.woff") format("woff"),
url("//www.mozilla.org/media/fonts/OpenSans-Semibold-webfont.ttf") format("truetype");
font-weight: bold;
font-style: normal;
font-family: "Open Sans";
src: url("//www.mozilla.org/media/fonts/OpenSans-Semibold-webfont.eot");
src: url("//www.mozilla.org/media/fonts/OpenSans-Semibold-webfont.eot?#iefix") format("embedded-opentype"),
url("//www.mozilla.org/media/fonts/OpenSans-Semibold-webfont.woff") format("woff"),
url("//www.mozilla.org/media/fonts/OpenSans-Semibold-webfont.ttf") format("truetype");
font-weight: bold;
font-style: normal;
}

@font-face {
font-family: "Open Sans";
src: url("//www.mozilla.org/media/fonts/OpenSans-SemiboldItalic-webfont.eot");
src: url("//www.mozilla.org/media/fonts/OpenSans-SemiboldItalic-webfont.eot?#iefix") format("embedded-opentype"),
url("//www.mozilla.org/media/fonts/OpenSans-SemiboldItalic-webfont.woff") format("woff"),
url("//www.mozilla.org/media/fonts/OpenSans-SemiboldItalic-webfont.ttf") format("truetype");
font-weight: bold;
font-style: italic;
font-family: "Open Sans";
src: url("//www.mozilla.org/media/fonts/OpenSans-SemiboldItalic-webfont.eot");
src: url("//www.mozilla.org/media/fonts/OpenSans-SemiboldItalic-webfont.eot?#iefix") format("embedded-opentype"),
url("//www.mozilla.org/media/fonts/OpenSans-SemiboldItalic-webfont.woff") format("woff"),
url("//www.mozilla.org/media/fonts/OpenSans-SemiboldItalic-webfont.ttf") format("truetype");
font-weight: bold;
font-style: italic;
}

/* Light */
@font-face {
font-family: "Open Sans Light";
src: url("//www.mozilla.org/media/fonts/OpenSans-Light-webfont.eot");
src: url("//www.mozilla.org/media/fonts/OpenSans-Light-webfont.eot?#iefix") format("embedded-opentype"),
url("//www.mozilla.org/media/fonts/OpenSans-Light-webfont.woff") format("woff"),
url("//www.mozilla.org/media/fonts/OpenSans-Light-webfont.ttf") format("truetype");
font-weight: normal;
font-style: normal;
font-family: "Open Sans Light";
src: url("//www.mozilla.org/media/fonts/OpenSans-Light-webfont.eot");
src: url("//www.mozilla.org/media/fonts/OpenSans-Light-webfont.eot?#iefix") format("embedded-opentype"),
url("//www.mozilla.org/media/fonts/OpenSans-Light-webfont.woff") format("woff"),
url("//www.mozilla.org/media/fonts/OpenSans-Light-webfont.ttf") format("truetype");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: "Open Sans Light";
src: url("//www.mozilla.org/media/fonts/OpenSans-LightItalic-webfont.eot");
src: url("//www.mozilla.org/media/fonts/OpenSans-LightItalic-webfont.eot?#iefix") format("embedded-opentype"),
url("//www.mozilla.org/media/fonts/OpenSans-LightItalic-webfont.woff") format("woff"),
url("//www.mozilla.org/media/fonts/OpenSans-LightItalic-webfont.ttf") format("truetype");
font-weight: normal;
font-style: italic;
font-family: "Open Sans Light";
src: url("//www.mozilla.org/media/fonts/OpenSans-LightItalic-webfont.eot");
src: url("//www.mozilla.org/media/fonts/OpenSans-LightItalic-webfont.eot?#iefix") format("embedded-opentype"),
url("//www.mozilla.org/media/fonts/OpenSans-LightItalic-webfont.woff") format("woff"),
url("//www.mozilla.org/media/fonts/OpenSans-LightItalic-webfont.ttf") format("truetype");
font-weight: normal;
font-style: italic;
}

@font-face {
font-family: "Open Sans Light";
src: url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.eot");
src: url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"),
url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.woff") format("woff"),
url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.ttf") format("truetype");
font-weight: bold;
font-style: normal;
font-family: "Open Sans Light";
src: url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.eot");
src: url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"),
url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.woff") format("woff"),
url("//www.mozilla.org/media/fonts/OpenSans-Regular-webfont.ttf") format("truetype");
font-weight: bold;
font-style: normal;
}

body {font-family: 'Open Sans', "Lucida Sans", "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif;}
Expand Down Expand Up @@ -272,16 +272,13 @@ html {
body {
color: rgb(60,60,60);
-webkit-text-size-adjust: 100%; /* Stops Mobile Safari from auto-adjusting font-sizes */
}

#outer-wrapper {
background: url('../media/bg-gradient-sand.png') repeat-x scroll 0% 0%, url('../media/bg-sand.png') repeat scroll 0% 0%, none repeat scroll 0% 0% #F5F1E8;
background: url('../media/bg-gradient-sand.png') repeat-x scroll 0% 0%, url('../media/bg-sand.png') repeat scroll 0% 0%, none repeat scroll 0% 0% #F5F1E8;
}

#wrapper {
width: 896px;
margin: 0px auto;
padding: 72px 48px 84px;
width: 896px;
margin: 0px auto;
padding: 72px 48px 84px;
}

#menu {width: 100%; min-height: 72px; line-height: 72px; text-align: center; margin-bottom: 48px; font-family: 'Open Sans Light', "Lucida Sans", "Lucida Grande", "Lucida Sans Unicode", Verdana, sans-serif; background-color: white;
Expand Down Expand Up @@ -318,7 +315,7 @@ px 68 160 252 344 436 528 620 712 */

@media only screen and (min-width: 768px) and (max-width: 991px) {

body {
#wrapper {
width: 712px;
padding: 48px 28px 60px;
}
Expand All @@ -339,7 +336,7 @@ px 68 160 252 */

@media only screen and (max-width: 767px) {

body {
#wrapper {
width: 252px;
padding: 48px 34px 60px;
}
Expand Down Expand Up @@ -371,7 +368,7 @@ px 68 160 252 344 436 */

@media only screen and (min-width: 480px) and (max-width: 767px) {

body {
#wrapper {
width: 436px;
padding: 36px 22px 48px;
}
Expand Down
2 changes: 0 additions & 2 deletions ssl-config-generator/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ <h2>{{server}} {{serverVersion}} | {{securityProfile}} profile | OpenSSL {{opens
<body>
<a href="https://github.com/mozilla/server-side-tls"><img style="position: absolute; top: 0; left: 0; border: 0;" src="https://camo.githubusercontent.com/567c3a48d796e2fc06ea80409cc9dd82bf714434/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f6c6566745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_left_darkblue_121621.png"></a>
<a href="https://www.mozilla.org/" id="tabzilla">mozilla</a>
<div id="outer-wrapper">
<div id="wrapper">
<h1>Mozilla SSL Configuration Generator</h1>
<div style="width 100px; float:left; padding:1em;">
Expand Down Expand Up @@ -278,7 +277,6 @@ <h1>Mozilla SSL Configuration Generator</h1>
<p><a href="https://wiki.mozilla.org/Security/Server_Side_TLS">More details on these security profiles</a></p>
</div>
</div>
</div>
</body>

</html>

0 comments on commit 7946548

Please sign in to comment.