Skip to content

Commit

Permalink
Add ornamental dividers.
Browse files Browse the repository at this point in the history
  • Loading branch information
Scott Upton committed Apr 2, 2012
1 parent 6ee9862 commit 0a42e70
Show file tree
Hide file tree
Showing 16 changed files with 134 additions and 27 deletions.
10 changes: 9 additions & 1 deletion _navigation.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
<nav>
<img src="/images/logo.png">
<figure><img src="/images/logo.png"></figure>

<ul>
<li><a href="/" class="selected">Home</a></li>
<li><a href="/gallery/">Gallery</a></li>
<li><a href="/about/">About Us</a></li>
<li><a href="/about/">Our Process</a></li>
<li><a href="/testimonials/">Testimonials</a></li>
<li><a href="/resources/">Resources</a></li>
<li><a href="/contact/">Contact Us</a></li>
</ul>

<hr>

<ul class="contact">
<li>303-449-3298</li>
<li>info@bw-construction.com</li>
</ul>
</nav>
Binary file added images/divider_leaf.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/divider_leaf_sml.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions index.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@

<div class="clear">&nbsp;</div>

<div class="grid_9">
<hr>
</div>

<div class="clear">&nbsp;</div>

<div class="grid_3">
<h3>We lorem ipsum</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
Expand Down
10 changes: 9 additions & 1 deletion public/about/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,24 @@

<body>
<header></header><nav>
<img src="/images/logo.png">
<figure><img src="/images/logo.png"></figure>

<ul>
<li><a href="/" class="selected">Home</a></li>
<li><a href="/gallery/">Gallery</a></li>
<li><a href="/about/">About Us</a></li>
<li><a href="/about/">Our Process</a></li>
<li><a href="/testimonials/">Testimonials</a></li>
<li><a href="/resources/">Resources</a></li>
<li><a href="/contact/">Contact Us</a></li>
</ul>

<hr>

<ul class="contact">
<li>303-449-3298</li>
<li>info@bw-construction.com</li>
</ul>
</nav>
<div class="wrapper clearfix">
<div class="container_9">
Expand Down
10 changes: 9 additions & 1 deletion public/contact/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,24 @@

<body>
<header></header><nav>
<img src="/images/logo.png">
<figure><img src="/images/logo.png"></figure>

<ul>
<li><a href="/" class="selected">Home</a></li>
<li><a href="/gallery/">Gallery</a></li>
<li><a href="/about/">About Us</a></li>
<li><a href="/about/">Our Process</a></li>
<li><a href="/testimonials/">Testimonials</a></li>
<li><a href="/resources/">Resources</a></li>
<li><a href="/contact/">Contact Us</a></li>
</ul>

<hr>

<ul class="contact">
<li>303-449-3298</li>
<li>info@bw-construction.com</li>
</ul>
</nav>
<div class="wrapper clearfix">
<div class="container_9">
Expand Down
10 changes: 9 additions & 1 deletion public/gallery/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,24 @@

<body>
<header></header><nav>
<img src="/images/logo.png">
<figure><img src="/images/logo.png"></figure>

<ul>
<li><a href="/" class="selected">Home</a></li>
<li><a href="/gallery/">Gallery</a></li>
<li><a href="/about/">About Us</a></li>
<li><a href="/about/">Our Process</a></li>
<li><a href="/testimonials/">Testimonials</a></li>
<li><a href="/resources/">Resources</a></li>
<li><a href="/contact/">Contact Us</a></li>
</ul>

<hr>

<ul class="contact">
<li>303-449-3298</li>
<li>info@bw-construction.com</li>
</ul>
</nav>
<div class="wrapper clearfix">
<div class="container_9">
Expand Down
Binary file added public/images/divider_leaf.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/divider_leaf_sml.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 15 additions & 1 deletion public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,24 @@

<body>
<header></header><nav>
<img src="/images/logo.png">
<figure><img src="/images/logo.png"></figure>

<ul>
<li><a href="/" class="selected">Home</a></li>
<li><a href="/gallery/">Gallery</a></li>
<li><a href="/about/">About Us</a></li>
<li><a href="/about/">Our Process</a></li>
<li><a href="/testimonials/">Testimonials</a></li>
<li><a href="/resources/">Resources</a></li>
<li><a href="/contact/">Contact Us</a></li>
</ul>

<hr>

<ul class="contact">
<li>303-449-3298</li>
<li>info@bw-construction.com</li>
</ul>
</nav>
<div class="wrapper clearfix">
<div class="container_9">
Expand All @@ -54,6 +62,12 @@ <h2>Personal is our passion</h2>

<div class="clear">&nbsp;</div>

<div class="grid_9">
<hr>
</div>

<div class="clear">&nbsp;</div>

<div class="grid_3">
<h3>We lorem ipsum</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
Expand Down
10 changes: 9 additions & 1 deletion public/resources/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,24 @@

<body>
<header></header><nav>
<img src="/images/logo.png">
<figure><img src="/images/logo.png"></figure>

<ul>
<li><a href="/" class="selected">Home</a></li>
<li><a href="/gallery/">Gallery</a></li>
<li><a href="/about/">About Us</a></li>
<li><a href="/about/">Our Process</a></li>
<li><a href="/testimonials/">Testimonials</a></li>
<li><a href="/resources/">Resources</a></li>
<li><a href="/contact/">Contact Us</a></li>
</ul>

<hr>

<ul class="contact">
<li>303-449-3298</li>
<li>info@bw-construction.com</li>
</ul>
</nav>
<div class="wrapper clearfix">
<div class="container_9">
Expand Down
Binary file modified ...ic/stylesheets/.sass-cache/98189d6c47f93b7391c4bbfb07b588a1adb8faa2/application.css.scssc
View file
Binary file not shown.
43 changes: 30 additions & 13 deletions public/stylesheets/application.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,31 @@ nav {
top: 0;
left: 0;
width: 250px;
text-align: center; }
text-align: center;
font-family: 'Merriweather', serif; }
nav figure {
margin-bottom: 1.0em; }
nav hr {
margin: 1.5em 3.0em; }
nav ul {
margin: 20px 0 0 0;
margin: 0;
padding: 0;
font-size: 18px;
font-family: 'Merriweather', serif; }
nav ul li a {
text-decoration: none;
color: #5f6667;
padding: 10px 0;
display: block;
-webkit-transition: color 150ms ease-in-out; }
nav ul li a.selected {
color: #930; }
nav ul li a:hover, nav ul li a:visited:hover {
color: #383c3d; }
color: #5f6667; }
nav ul.contact {
font-size: 14px; }
nav ul li {
padding: 4px 0; }
nav ul li a {
padding: 6px 0;
color: inherit;
text-decoration: none;
display: block;
-webkit-transition: color 150ms ease-in-out; }
nav ul li a.selected {
color: #930; }
nav ul li a:hover, nav ul li a:visited:hover {
color: #383c3d; }

div.wrapper,
footer {
Expand Down Expand Up @@ -74,12 +83,20 @@ h4 {
p {
font-size: 15px; }

hr {
background: transparent url("../images/divider_leaf.png") no-repeat scroll center center;
display: block;
height: 14px;
border: none; }

/* Smaller screens */
@media only screen and (max-width: 1023px) {
nav {
padding-top: 15px;
position: static;
width: 100%; }
nav hr {
margin: 0 4%; }
nav ul {
overflow: hidden;
margin: 10px auto;
Expand Down
10 changes: 9 additions & 1 deletion public/testimonials/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,24 @@

<body>
<header></header><nav>
<img src="/images/logo.png">
<figure><img src="/images/logo.png"></figure>

<ul>
<li><a href="/" class="selected">Home</a></li>
<li><a href="/gallery/">Gallery</a></li>
<li><a href="/about/">About Us</a></li>
<li><a href="/about/">Our Process</a></li>
<li><a href="/testimonials/">Testimonials</a></li>
<li><a href="/resources/">Resources</a></li>
<li><a href="/contact/">Contact Us</a></li>
</ul>

<hr>

<ul class="contact">
<li>303-449-3298</li>
<li>info@bw-construction.com</li>
</ul>
</nav>
<div class="wrapper clearfix">
<div class="container_9">
Expand Down
Binary file modified stylesheets/.sass-cache/98189d6c47f93b7391c4bbfb07b588a1adb8faa2/application.css.scssc
View file
Binary file not shown.
36 changes: 29 additions & 7 deletions stylesheets/application.css.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,33 @@ nav {
left: 0;
width: 250px;
text-align: center;
font-family: 'Merriweather', serif;

figure {
margin-bottom: 1.0em;
}

hr {
margin: 1.5em 3.0em;
}

ul {
margin: 20px 0 0 0;
margin: 0;
padding: 0;
font-size: 18px;
font-family: 'Merriweather', serif;
color: #5f6667;

&.contact {
font-size: 14px;
}

li {
padding: 4px 0;

a {
padding: 6px 0;
color: inherit;
text-decoration: none;
color: #5f6667;
padding: 10px 0;
display: block;
-webkit-transition: color 150ms ease-in-out;

Expand Down Expand Up @@ -100,13 +115,22 @@ p {
font-size: 15px;
}

hr {
background: transparent url('../images/divider_leaf.png') no-repeat scroll center center;
display: block;
height: 14px;
border: none;
}

/* Smaller screens */
@media only screen and (max-width: 1023px) {
nav {
padding-top: 15px;
position: static;
width: 100%;

hr { margin: 0 4%; }

ul {
overflow: hidden;
margin: 10px auto;
Expand Down Expand Up @@ -137,9 +161,7 @@ p {
}

nav {
ul {
font-size: 16px;
}
ul { font-size: 16px; }
}

div.wrapper,
Expand Down

0 comments on commit 0a42e70

Please sign in to comment.