Skip to content

Commit

Permalink
fix up links page to fit bootstrap layout
Browse files Browse the repository at this point in the history
  • Loading branch information
mattvanhorn committed Jul 7, 2012
1 parent eb07e37 commit 82dd0a0
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 16 deletions.
Binary file modified app/assets/images/coeymans_landing.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 12 additions & 13 deletions app/assets/stylesheets/links.css.scss
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
#links {
width: 630px;
margin: 0 auto;

@include makeColumn(8,2);
h1 {
text-align: center;
font-size: 36px;
}
img {
margin-top: 10px;
margin-bottom: -40px;
}

p {
width: 240px;
p.artists {
@include makeColumn(3);
float: left;
}

dl {
width: 340px;
margin-left: 20px;
float: right;
font-size: 16px;
@include makeColumn(4);
margin-top: 0;
padding-top: 0;
}

dt {
margin-left: 0;
margin-bottom: 3px;
}

dd {
margin-left: 0;
margin-bottom: 12px;
}
a:link, a:visited {
color: #FFF;
}
}
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
%li= link_to 'Portraits', '#'
%li= link_to 'Biography', biography_path
%li= link_to 'Blog', '#'
%li= link_to 'Links', '#"'
%li= link_to 'Links', links_path
%li
%a{:href => '#'} Workshops
.container
Expand Down
4 changes: 2 additions & 2 deletions app/views/pages/links.html.haml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#links
%h1 Artists I Have Learned From...

= image_tag 'coeymans_landing.png', :size => '630x412'
= image_tag 'coeymans_landing.png', :size => '620x405'

%p
%p.artists
Over the years, I have had the privilege of meeting many artists that share my
passion for watercolor. Of those artists that I have met, these are the ones
that have had the most influence on my work.
Expand Down

0 comments on commit 82dd0a0

Please sign in to comment.