Skip to content

Commit

Permalink
Final tweaks to match new comp.
Browse files Browse the repository at this point in the history
  • Loading branch information
karledurante committed Oct 19, 2012
1 parent 2eb4a9e commit ebcee33
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 30 deletions.
19 changes: 15 additions & 4 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,34 @@ h1, h2, h3 {

h1 {
font-weight: 300;
font-size: 42px;
line-height: 32px;
font-size: 52px;
line-height: 42px;
}

h2 {
font-weight: 300;
font-size: 22px;
font-size: 26px;
line-height: 20px;
}

h3 {
font-weight: 300;
font-size: 17px;
}

a {
color: $red;
&:hover {
color: $blue;
}
&:visited {
color: $red;
}
}

p {
font-size: 16px;
line-height: 18px;
line-height: 24px;
}

.header {
Expand Down
39 changes: 20 additions & 19 deletions app/assets/stylesheets/home.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
@import "colors";

.design_column {
width: 500px;
width: 513px;
float: left;
margin-bottom: 20px;
margin-top: 15px;
}

.intro_column {
width: 360px;
width: 380px;
float: left;
margin-left: 40px;
margin-bottom: 20px;
Expand All @@ -23,7 +23,7 @@
padding: 20px 0;
border-top: solid 1px $grey;
border-bottom: solid 1px $grey;

h1, h2 {
color: $brown;
}
Expand Down Expand Up @@ -59,7 +59,7 @@
border-radius: 4px;
background-color: $blue;
padding: 25px;
margin: 25px;
margin: 10px;
color: white;
text-align: center;

Expand All @@ -70,7 +70,7 @@

h1, h2 {
color: $white;
font-size: 36px;
font-size: 38px;
text-shadow: $grey 0.1em;

&:hover {
Expand All @@ -92,11 +92,15 @@

.thumbnails {
text-align: center;
}

.thumbnail {
padding: 0 3px;
width: 110px;
.thumbnail {
padding-right: 15px;
width: 113px;
}

.last {
padding-right: 0px;
}
}

.reset_columns {
Expand All @@ -106,27 +110,24 @@

.about_header {
margin: 5px 0 0 0;
border-radius: 2px;
height: 20px;
width: 900px;
padding: 5px 15px;
font-size: 18px;
background-color: $orange;
color: $white;
border-bottom: 2px solid $orange;
width: 933px;
font-size: 26px;
color: $orange;
font-weight: 300;
font-family: museo-slab,Tahoma,sans-serif;
}

.about_column {
width: 360px;
width: 353px;
float: left;
margin-bottom: 20px;
margin-top: 15px;
}

.group_column {
width: 520px;
width: 540px;
float: left;
margin-left: 40px;
margin-left: 47px;
margin-bottom: 20px;
}
10 changes: 5 additions & 5 deletions app/views/home/_design.html.erb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div class="shirt_design">
<%= image_tag "shirt_design.jpg", :width => 500%>
<%= image_tag "shirt_design.jpg", :width => 513%>
</div>

<div class="thumbnails">
<span><%= image_tag "thumbnail.jpg", :width => 100, :class => 'thumbnail' %></span>
<span><%= image_tag "thumbnail.jpg", :width => 100, :class => 'thumbnail' %></span>
<span><%= image_tag "thumbnail.jpg", :width => 100, :class => 'thumbnail' %></span>
<span><%= image_tag "thumbnail.jpg", :width => 100, :class => 'thumbnail' %></span>
<span><%= image_tag "thumbnail.jpg", :class => 'thumbnail' %></span>
<span><%= image_tag "thumbnail.jpg", :class => 'thumbnail' %></span>
<span><%= image_tag "thumbnail.jpg", :class => 'thumbnail' %></span>
<span><%= image_tag "thumbnail.jpg", :class => 'thumbnail last' %></span>
</div>
2 changes: 1 addition & 1 deletion app/views/home/_message.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

<p>This year we are selling a limited edition T-Shirt to raise funds. With a purchase, you are not only supporting a great cause, but you also get a really cool T-Shirt.</p>

<p>Thanks,<br/>- Team Stachesquach</p>
<p><%=link_to "Check out our team page here", "#"%></p>
2 changes: 1 addition & 1 deletion app/views/home/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@

<div class="group_column">
<div class="intro_graphic">
<%= image_tag "stachesquatch_2012.jpg", :width=> "525" %>
<%= image_tag "stachesquatch_2012.jpg", :width=> "535" %>
</div>
</div>

0 comments on commit ebcee33

Please sign in to comment.