Skip to content
Browse files

More spacing and type tweaks.

  • Loading branch information...
1 parent 50a4804 commit 28e4da85aec10ab9fadaaa7eade6ea76c15e7630 Scott Upton committed Apr 4, 2012
View
2 index.html.erb
@@ -38,7 +38,7 @@
<div class="grid_3">
<aside>
- <h3>We can help with your next:</h3>
+ <h3>Call us for your next:</h3>
<ul>
<li><span>Kitchen &amp; Bath Remodel</span></li>
<li><span>Whole House Remodel</span></li>
View
4 layout.html.erb
@@ -9,7 +9,7 @@
<meta name="keywords" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700" type="text/css">
+<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700|Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700" type="text/css">
<link rel="stylesheet" href="/stylesheets/grid.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/normalize.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/fonts.css" type="text/css">
@@ -25,7 +25,7 @@
<%= render '_header.html.erb' %>
<%= render '_navigation.html.erb' %>
-<div class="wrapper clearfix">
+<div class="content clearfix">
<div class="container_9">
<%= yield %>
</div>
View
4 public/about/index.html
@@ -9,7 +9,7 @@
<meta name="keywords" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700" type="text/css">
+<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700|Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700" type="text/css">
<link rel="stylesheet" href="/stylesheets/grid.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/normalize.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/fonts.css" type="text/css">
@@ -42,7 +42,7 @@
<li>info@bw-construction.com</li>
</ul>
</nav>
-<div class="wrapper clearfix">
+<div class="content clearfix">
<div class="container_9">
<div class="grid_9">
<h1>About Us</h1>
View
4 public/contact/index.html
@@ -9,7 +9,7 @@
<meta name="keywords" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700" type="text/css">
+<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700|Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700" type="text/css">
<link rel="stylesheet" href="/stylesheets/grid.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/normalize.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/fonts.css" type="text/css">
@@ -42,7 +42,7 @@
<li>info@bw-construction.com</li>
</ul>
</nav>
-<div class="wrapper clearfix">
+<div class="content clearfix">
<div class="container_9">
<div class="grid_9">
<h1>Contact</h1>
View
4 public/gallery/index.html
@@ -9,7 +9,7 @@
<meta name="keywords" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700" type="text/css">
+<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700|Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700" type="text/css">
<link rel="stylesheet" href="/stylesheets/grid.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/normalize.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/fonts.css" type="text/css">
@@ -42,7 +42,7 @@
<li>info@bw-construction.com</li>
</ul>
</nav>
-<div class="wrapper clearfix">
+<div class="content clearfix">
<div class="container_9">
<div class="grid_9">
<h1>Gallery</h1>
View
6 public/index.html
@@ -9,7 +9,7 @@
<meta name="keywords" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700" type="text/css">
+<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700|Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700" type="text/css">
<link rel="stylesheet" href="/stylesheets/grid.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/normalize.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/fonts.css" type="text/css">
@@ -42,7 +42,7 @@
<li>info@bw-construction.com</li>
</ul>
</nav>
-<div class="wrapper clearfix">
+<div class="content clearfix">
<div class="container_9">
<div class="masthead clearfix">
<div class="grid_6">
@@ -84,7 +84,7 @@
<div class="grid_3">
<aside>
- <h3>We can help with your next:</h3>
+ <h3>Call us for your next:</h3>
<ul>
<li><span>Kitchen &amp; Bath Remodel</span></li>
<li><span>Whole House Remodel</span></li>
View
4 public/process/index.html
@@ -9,7 +9,7 @@
<meta name="keywords" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700" type="text/css">
+<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700|Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700" type="text/css">
<link rel="stylesheet" href="/stylesheets/grid.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/normalize.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/fonts.css" type="text/css">
@@ -42,7 +42,7 @@
<li>info@bw-construction.com</li>
</ul>
</nav>
-<div class="wrapper clearfix">
+<div class="content clearfix">
<div class="container_9">
<div class="grid_9">
<h1>Our Process</h1>
View
4 public/resources/index.html
@@ -9,7 +9,7 @@
<meta name="keywords" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700" type="text/css">
+<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700|Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700" type="text/css">
<link rel="stylesheet" href="/stylesheets/grid.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/normalize.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/fonts.css" type="text/css">
@@ -42,7 +42,7 @@
<li>info@bw-construction.com</li>
</ul>
</nav>
-<div class="wrapper clearfix">
+<div class="content clearfix">
<div class="container_9">
<div class="grid_9">
<h1>Resources</h1>
View
BIN ...ic/stylesheets/.sass-cache/98189d6c47f93b7391c4bbfb07b588a1adb8faa2/application.css.scssc
Binary file not shown.
View
29 public/stylesheets/application.css
@@ -72,24 +72,29 @@ aside {
aside ul {
font-family: 'Merriweather', serif;
font-size: 14px;
- color: #fff;
padding: 0 1.25em; }
aside ul li {
margin-bottom: 8px; }
- aside ul li span {
- color: #4d4d4d; }
aside h3 {
- font-size: 16px;
+ font-size: 20px;
+ font-weight: normal;
+ color: #930;
margin: 0; }
-div.wrapper,
+div.content,
footer {
max-width: 1040px;
background: #f2f3ed url("/images/bkd_diagonal_tan.jpg") repeat fixed top left;
margin-left: 230px; }
-div.wrapper {
+div.content {
padding-bottom: 3.0em; }
+ div.content h3 {
+ margin: 0 0 0.33em 0; }
+ div.content h3 + p {
+ margin-top: 0; }
+ div.content hr {
+ height: 36px; }
footer {
padding-top: 20px;
@@ -133,7 +138,13 @@ hr {
border: none; }
div.masthead {
- background: transparent url("../images/donna_and_randy.png") no-repeat scroll bottom right; }
+ background: transparent url("../images/donna_and_randy.png") no-repeat scroll bottom right;
+ min-height: 162px; }
+ div.masthead h1 {
+ margin: 0 0 1.0em 0; }
+ div.masthead h4 {
+ margin-top: 2.0em;
+ margin-bottom: 0.33em; }
/* Smaller screens */
@media only screen and (max-width: 1023px) {
@@ -155,7 +166,7 @@ div.masthead {
nav ul li a {
padding: 3px 6px; }
- div.wrapper,
+ div.content,
footer {
margin-left: 0; } }
/* Mobile */
@@ -171,7 +182,7 @@ div.masthead {
background-color: none;
box-shadow: none; }
- div.wrapper,
+ div.content,
footer {
margin-left: 0; }
View
4 public/testimonials/index.html
@@ -9,7 +9,7 @@
<meta name="keywords" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700" type="text/css">
+<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Merriweather:400,300,700|Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700" type="text/css">
<link rel="stylesheet" href="/stylesheets/grid.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/normalize.css" type="text/css">
<link rel="stylesheet" href="/stylesheets/fonts.css" type="text/css">
@@ -42,7 +42,7 @@
<li>info@bw-construction.com</li>
</ul>
</nav>
-<div class="wrapper clearfix">
+<div class="content clearfix">
<div class="container_9">
<div class="grid_9">
<h1>Testimonials</h1>
View
BIN stylesheets/.sass-cache/98189d6c47f93b7391c4bbfb07b588a1adb8faa2/application.css.scssc
Binary file not shown.
View
31 stylesheets/application.css.scss
@@ -98,31 +98,38 @@ aside {
ul {
font-family: 'Merriweather', serif;
font-size: 14px;
- color: #fff;
padding: 0 1.25em;
li {
margin-bottom: 8px;
- span { color: #4d4d4d; }
}
}
h3 {
- font-size: 16px;
+ font-size: 20px;
+ font-weight: normal;
+ color: #930;
margin: 0;
}
}
-div.wrapper,
+div.content,
footer {
max-width: 1040px;
background: #f2f3ed url('/images/bkd_diagonal_tan.jpg') repeat fixed top left;
margin-left: 230px;
}
-div.wrapper {
+div.content {
padding-bottom: 3.0em;
+
+ h3 {
+ margin: 0 0 0.33em 0;
+ & + p { margin-top: 0; }
+ }
+
+ hr { height: 36px; }
}
footer {
@@ -177,6 +184,16 @@ hr {
div.masthead {
background: transparent url('../images/donna_and_randy.png') no-repeat scroll bottom right;
+ min-height: 162px;
+
+ h1 {
+ margin: 0 0 1.0em 0;
+ }
+
+ h4 {
+ margin-top: 2.0em;
+ margin-bottom: 0.33em;
+ }
}
/* Smaller screens */
@@ -208,7 +225,7 @@ div.masthead {
}
}
- div.wrapper,
+ div.content,
footer {
margin-left: 0;
}
@@ -232,7 +249,7 @@ div.masthead {
box-shadow: none;
}
- div.wrapper,
+ div.content,
footer {
margin-left: 0;
}

0 comments on commit 28e4da8

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