Skip to content
Browse files

switched out stylesheet

  • Loading branch information...
1 parent 01060c5 commit 1f0204dd20a3acc7bd80e75b838ba1773b097076 durfee committed Oct 19, 2013
Showing with 27 additions and 16 deletions.
  1. +26 −15 css/stylesheet.css
  2. +1 −1 index.html
View
41 css/stylesheet.css
@@ -104,17 +104,18 @@ body{
font-family: 'Open Sans', Helvetica, sans-serif;
padding: 0;
margin: 0;
+ padding-top: 65px;
}
#header {
position: fixed;
z-index: 1;
- width:100%;
- display:relative;
+ top: 0;
+ left: 0;
+ right: 0;
background-color: #585858;
- clear:none;
height: 45px;
- margin-left: -20px;
+ padding-top: 20px;
}
@@ -140,42 +141,52 @@ nav a {
border: none;
text-decoration: none;
}
-.header {
+#header nav ul li {
display: inline;
padding-right: 2%;
padding-left: 2%;
+ padding-top: 10px;
}
.soc-media {
display: inline-block;
- color:#B8B8B8;
+ color: #B8B8B8;
font-size: .6em;
padding-left: 1%;
padding-right: 1%;
margin-bottom: -20px;
}
#sign-up-button {
+ margin: 25px auto;
width: 128px;
height: 55px;
border-radius: 5px;
background-color: #6666FF;
color: #FFFFFF;
- float: right;
- position:relative;
- margin-top: 25px;
}
-.title1{
+.title {
font-family: 'Oswald', Verdana, sans-serif;
- font-size: 2.5em;
text-align: center;
}
-.title2{
- font-family: 'Oswald', Verdana, sans-serif;
- font-size: 1.5em;
- text-align: center;
+.title h1 {
+ font-size: 5em;
+}
+
+.title h3 {
+ font-size: 1.75em;
+}
+.title p {
+ font-size: 1.25em;
+}
+
+@media only screen and (min-width: 1220px) {
@durfee
Owner
durfee added a note Oct 20, 2013

Do we need both this media query as well as the one on line 299?

@nquinlan
Collaborator
nquinlan added a note Oct 20, 2013

Nah. You can get rid of line 229's media query.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ #sign-up-button {
+ position: absolute;
+ right: 20px;
+ }
}
/* ==========================================================================
View
2 index.html 100644 → 100755
@@ -13,8 +13,8 @@
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
<link rel="stylesheet" href="css/normalize.css">
- <link rel="stylesheet" href="css/main.css">
<script src="js/vendor/modernizr-2.6.2.min.js"></script>
+ <link rel="stylesheet" href="css/stylesheet.css">
<link href='http://fonts.googleapis.com/css?family=Ubuntu|Open+Sans|Open+Sans+Condensed:300|Oswald' rel='stylesheet' type='text/css'>
</head>
<body>

0 comments on commit 1f0204d

Please sign in to comment.
Something went wrong with that request. Please try again.