Skip to content

Commit

Permalink
Add design changes and remove SASS files because SASS is not generati…
Browse files Browse the repository at this point in the history
…ng as it should. Rails3 bug?
  • Loading branch information
mrDoktar committed May 11, 2010
1 parent 1325098 commit 7eb781d
Show file tree
Hide file tree
Showing 12 changed files with 440 additions and 414 deletions.
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
.bundle
db/*.sqlite3
log/*.log
tmp/**/*
public/stylesheets/posts.css
public/stylesheets/buttons.css
public/stylesheets/application.css
tmp/**/*
3 changes: 2 additions & 1 deletion app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
= yield :javascript
= csrf_meta_tag
%body
= yield
#container
= yield
3 changes: 2 additions & 1 deletion app/views/posts/show.html.haml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
= render @post
#post
= render @post

= render "posts_list", :posts => @posts
Binary file added public/images/body_background.png
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/date_badge.png
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/post_background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
97 changes: 97 additions & 0 deletions public/stylesheets/application.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
@font-face {
font-family: "Sorts MG Italic";
src: url("/fonts/OFLGoudyStM-Italic.otf") format("opentype"); }

@font-face {
font-family: "Sorts MG";
src: url("/fonts/OFLGoudyStM.otf") format("opentype"); }

@font-face {
font-family: "Prociono";
src: url("/fonts/Prociono-Regular.otf") format("opentype"); }

@font-face {
font-family: "League Gothic";
src: url("/fonts/League-Gothic.otf") format("opentype"); }

body {
font-size: 0.75%; }

html > body {
font: 14px/1.5 Helvetica, Arial, sans-serif;
line-height: 1.5em;
padding-top: 1px;
/*background: url('/images/baseline.jpg');*/
background: #FFF url('/images/body_background.png') repeat-x top;
}

a {
color: #2e5d89;
border-bottom: 1px dotted #498fd3;
text-decoration: none; }
a:hover {
border-bottom-style: solid; }

h1 {
font-family: "League Gothic";
letter-spacing: 0.05em;
font-size: 2.5em;
line-height: 0.6em;
margin-bottom: 0.6em;
font-weight: normal;
color: #303030; }
h1 a {
color: #303030;
text-decoration: none;
border: 0; }
h1 a:hover {
text-decoration: underline; }

h2 {
font-family: "League Gothic";
letter-spacing: 0.05em;
font-size: 1.714em;
line-height: 0.875em;
margin-bottom: 0.875em;
font-weight: normal;
color: #303030; }

h5 {
position: absolute;
top: -1.3em;
z-index: 9999;
padding: 0pt 0.2em;
margin-left: 1em;
color: #999999;
font-size: 0.9em;
font-weight: normal; }

hr {
border: 0;
border-bottom: 0.071em solid black;
margin: 0;
height: 0;
margin-bottom: 1.429em; }

p {
font-size: 1em;
line-height: 1.5em;
margin-bottom: 1.5em; }

strong {
font-weight: bold; }

.hidden {
display: none; }

.inline {
display: inline; }

.lefty {
float: left; }

#container {
width: 960px;
margin-left: auto;
margin-right: auto;
}
200 changes: 200 additions & 0 deletions public/stylesheets/buttons.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
.button {
display: inline-block;
font-family: "Lucida Grande";
zoom: 1;
*display: inline;
vertical-align: baseline;
margin: 0 0.143em;
outline: none;
cursor: pointer;
text-align: center;
text-decoration: none;
padding: 0.5em 2em 0.55em;
text-shadow: 0 0.071em 0.071em rgba(0, 0, 0, 0.3);
-webkit-border-radius: 0.5em;
-moz-border-radius: 0.5em;
border-radius: 0.5em;
font-size: 0.714em;
padding: 0.2em 1em 0.275em;
color: #606060;
border: solid 0.071em #b7b7b7;
background: white;
background: -webkit-gradient(linear, left top, left bottom, from(white), to(#ededed));
background: -moz-linear-gradient(top, white, #ededed);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed'); }
.button:hover {
text-decoration: none;
background: #ededed;
background: -webkit-gradient(linear, left top, left bottom, from(white), to(#dcdcdc));
background: -moz-linear-gradient(top, white, #dcdcdc);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#dcdcdc'); }
.button:active {
position: relative;
top: 1px;
color: #999999;
background: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(white));
background: -moz-linear-gradient(top, #ededed, white);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#ffffff'); }
.button.bigrounded {
-webkit-border-radius: 2em;
-moz-border-radius: 2em;
border-radius: 2em; }
.button.medium {
font-size: 0.857em;
padding: 0.4em 1.5em 0.42em; }
.button.small {
font-size: 0.7em;
padding: 0.1em 0.3em; }
.button.active, .button.black {
color: #d7d7d7;
border: solid 1px #333333;
background: #333333;
background: -webkit-gradient(linear, left top, left bottom, from(#666666), to(black));
background: -moz-linear-gradient(top, #666666, black);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#666666', endColorstr='#000000'); }
.button.active:hover, .button.black:hover {
background: black;
background: -webkit-gradient(linear, left top, left bottom, from(#444444), to(black));
background: -moz-linear-gradient(top, #444444, black);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#444444', endColorstr='#000000'); }
.button.active:active, .button.black:active {
color: #666666;
background: -webkit-gradient(linear, left top, left bottom, from(black), to(#444444));
background: -moz-linear-gradient(top, black, #444444);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#666666'); }
.button.gray {
color: #e9e9e9;
border: solid 1px #555555;
background: #6e6e6e;
background: -webkit-gradient(linear, left top, left bottom, from(#888888), to(#575757));
background: -moz-linear-gradient(top, #888888, #575757);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#888888', endColorstr='#575757'); }
.button.gray:hover {
background: #616161;
background: -webkit-gradient(linear, left top, left bottom, from(#757575), to(#4b4b4b));
background: -moz-linear-gradient(top, #757575, #4b4b4b);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#757575', endColorstr='#4b4b4b'); }
.button.gray:active {
color: #afafaf;
background: -webkit-gradient(linear, left top, left bottom, from(#575757), to(#888888));
background: -moz-linear-gradient(top, #575757, #888888);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#575757', endColorstr='#888888'); }
.button.white {
color: #606060;
border: solid 1px #b7b7b7;
background: white;
background: -webkit-gradient(linear, left top, left bottom, from(white), to(#ededed));
background: -moz-linear-gradient(top, white, #ededed);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed'); }
.button.white:hover {
background: #ededed;
background: -webkit-gradient(linear, left top, left bottom, from(white), to(#dcdcdc));
background: -moz-linear-gradient(top, white, #dcdcdc);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#dcdcdc'); }
.button.white:active {
color: #999999;
background: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(white));
background: -moz-linear-gradient(top, #ededed, white);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#ffffff'); }
.button.orange {
color: #fef4e9;
border: solid 1px #da7c0c;
background: #f78d1d;
background: -webkit-gradient(linear, left top, left bottom, from(#faa51a), to(#f47a20));
background: -moz-linear-gradient(top, #faa51a, #f47a20);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#faa51a', endColorstr='#f47a20'); }
.button.orange:hover {
background: #f47c20;
background: -webkit-gradient(linear, left top, left bottom, from(#f88e11), to(#f06015));
background: -moz-linear-gradient(top, #f88e11, #f06015);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f88e11', endColorstr='#f06015'); }
.button.orange:active {
color: #fcd3a5;
background: -webkit-gradient(linear, left top, left bottom, from(#f47a20), to(#faa51a));
background: -moz-linear-gradient(top, #f47a20, #faa51a);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f47a20', endColorstr='#faa51a'); }
.button.red {
color: #faddde;
border: solid 1px #980c10;
background: #d81b21;
background: -webkit-gradient(linear, left top, left bottom, from(#ed1c24), to(#aa1317));
background: -moz-linear-gradient(top, #ed1c24, #aa1317);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ed1c24', endColorstr='#aa1317'); }
.button.red:hover {
background: #b61318;
background: -webkit-gradient(linear, left top, left bottom, from(#c9151b), to(#a11115));
background: -moz-linear-gradient(top, #c9151b, #a11115);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#c9151b', endColorstr='#a11115'); }
.button.red:active {
color: #de898c;
background: -webkit-gradient(linear, left top, left bottom, from(#aa1317), to(#ed1c24));
background: -moz-linear-gradient(top, #aa1317, #ed1c24);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#aa1317', endColorstr='#ed1c24'); }
.button.blue {
color: #d9eef7;
border: solid 1px #0076a3;
background: #0095cd;
background: -webkit-gradient(linear, left top, left bottom, from(#00adee), to(#0078a5));
background: -moz-linear-gradient(top, #00adee, #0078a5);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5'); }
.button.blue:hover {
background: #007ead;
background: -webkit-gradient(linear, left top, left bottom, from(#0095cc), to(#00678e));
background: -moz-linear-gradient(top, #0095cc, #00678e);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0095cc', endColorstr='#00678e'); }
.button.blue:active {
color: #80bed6;
background: -webkit-gradient(linear, left top, left bottom, from(#0078a5), to(#00adee));
background: -moz-linear-gradient(top, #0078a5, #00adee);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0078a5', endColorstr='#00adee'); }
.button.rosy {
color: #fae7e9;
border: solid 1px #b73948;
background: #da5867;
background: -webkit-gradient(linear, left top, left bottom, from(#f16c7c), to(#bf404f));
background: -moz-linear-gradient(top, #f16c7c, #bf404f);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f16c7c', endColorstr='#bf404f'); }
.button.rosy:hover {
background: #ba4b58;
background: -webkit-gradient(linear, left top, left bottom, from(#cf5d6a), to(#a53845));
background: -moz-linear-gradient(top, #cf5d6a, #a53845);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cf5d6a', endColorstr='#a53845'); }
.button.rosy:active {
color: #dca4ab;
background: -webkit-gradient(linear, left top, left bottom, from(#bf404f), to(#f16c7c));
background: -moz-linear-gradient(top, #bf404f, #f16c7c);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bf404f', endColorstr='#f16c7c'); }
.button.green {
color: #e8f0de;
border: solid 1px #538312;
background: #64991e;
background: -webkit-gradient(linear, left top, left bottom, from(#7db72f), to(#4e7d0e));
background: -moz-linear-gradient(top, #7db72f, #4e7d0e);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7db72f', endColorstr='#4e7d0e'); }
.button.green:hover {
background: #538018;
background: -webkit-gradient(linear, left top, left bottom, from(#6b9d28), to(#436b0c));
background: -moz-linear-gradient(top, #6b9d28, #436b0c);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#6b9d28', endColorstr='#436b0c'); }
.button.green:active {
color: #a9c08c;
background: -webkit-gradient(linear, left top, left bottom, from(#4e7d0e), to(#7db72f));
background: -moz-linear-gradient(top, #4e7d0e, #7db72f);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4e7d0e', endColorstr='#7db72f'); }
.button.pink {
color: #feeef5;
border: solid 1px #d2729e;
background: #f895c2;
background: -webkit-gradient(linear, left top, left bottom, from(#feb1d3), to(#f171ab));
background: -moz-linear-gradient(top, #feb1d3, #f171ab);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#feb1d3', endColorstr='#f171ab'); }
.button.pink:hover {
background: #d57ea5;
background: -webkit-gradient(linear, left top, left bottom, from(#f4aacb), to(#e86ca4));
background: -moz-linear-gradient(top, #f4aacb, #e86ca4);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4aacb', endColorstr='#e86ca4'); }
.button.pink:active {
color: #f3c3d9;
background: -webkit-gradient(linear, left top, left bottom, from(#f171ab), to(#feb1d3));
background: -moz-linear-gradient(top, #f171ab, #feb1d3);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f171ab', endColorstr='#feb1d3'); }
Loading

0 comments on commit 7eb781d

Please sign in to comment.