Skip to content

Commit

Permalink
updated interface with bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
tylacock committed May 2, 2012
1 parent e102359 commit 1325661
Show file tree
Hide file tree
Showing 13 changed files with 241 additions and 186 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Expand Up @@ -18,6 +18,8 @@ group :assets do
# gem 'therubyracer', :platform => :ruby

gem 'uglifier', '>= 1.0.3'

gem 'bootstrap-sass', '~> 2.0.2'
end

gem 'jquery-rails'
Expand Down
2 changes: 2 additions & 0 deletions Gemfile.lock
Expand Up @@ -29,6 +29,7 @@ GEM
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
bootstrap-sass (2.0.2)
builder (3.0.0)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
Expand Down Expand Up @@ -103,6 +104,7 @@ PLATFORMS
ruby

DEPENDENCIES
bootstrap-sass (~> 2.0.2)
coffee-rails (~> 3.2.1)
jquery-rails
rails (= 3.2.3)
Expand Down
9 changes: 7 additions & 2 deletions app/assets/stylesheets/application.css.scss
Expand Up @@ -11,9 +11,14 @@
*= require_self
*= require_tree .
*/
@import "bootstrap";

img {
float: left;
}


#banner {
/*#banner {
background: #9c9;
padding: 10px;
border-bottom: 2px solid;
Expand Down Expand Up @@ -63,4 +68,4 @@ font-size: small;
}
}
}
}
}*/
94 changes: 47 additions & 47 deletions app/assets/stylesheets/products.css.scss
Expand Up @@ -2,50 +2,50 @@
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

.products {
table {
border-collapse: collapse;
}

table tr td {
padding: 5px;
vertical-align: top;
}

.list_image {
width: 60px;
height: 70px;
}

.list_description {
width: 60%;

dl {
margin: 0;
}

dt {
color: #244;
font-weight: bold;
font-size: larger;
}

dd {
margin: 0;
}
}

.list_actions {
font-size: x-small;
text-align: right;
padding-left: 1em;
}

.list_line_even {
background: #e0f8f8;
}

.list_line_odd {
background: #f8b0f8;
}
}
// .products {
// table {
// border-collapse: collapse;
// }

// table tr td {
// padding: 5px;
// vertical-align: top;
// }

// .list_image {
// width: 60px;
// height: 70px;
// }

// .list_description {
// width: 60%;

// dl {
// margin: 0;
// }

// dt {
// color: #244;
// font-weight: bold;
// font-size: larger;
// }

// dd {
// margin: 0;
// }
// }

// .list_actions {
// font-size: x-small;
// text-align: right;
// padding-left: 1em;
// }

// .list_line_even {
// background: #e0f8f8;
// }

// .list_line_odd {
// background: #f8b0f8;
// }
// }
114 changes: 58 additions & 56 deletions app/assets/stylesheets/scaffolds.css.scss
@@ -1,56 +1,58 @@
body {
background-color: #fff;
color: #333;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 13px;
line-height: 18px; }

p, ol, ul, td {
font-family: verdana, arial, helvetica, sans-serif;
font-size: 13px;
line-height: 18px; }

pre {
background-color: #eee;
padding: 10px;
font-size: 11px; }

a {
color: #000;
&:visited {
color: #666; }
&:hover {
color: #fff;
background-color: #000; } }

div {
&.field, &.actions {
margin-bottom: 10px; } }

#notice {
color: green; }

.field_with_errors {
padding: 2px;
background-color: red;
display: table; }

#error_explanation {
width: 450px;
border: 2px solid red;
padding: 7px;
padding-bottom: 0;
margin-bottom: 20px;
background-color: #f0f0f0;
h2 {
text-align: left;
font-weight: bold;
padding: 5px 5px 5px 15px;
font-size: 12px;
margin: -7px;
margin-bottom: 0px;
background-color: #c00;
color: #fff; }
ul li {
font-size: 12px;
list-style: square; } }
@import "bootstrap";

// body {
// background-color: #fff;
// color: #333;
// font-family: verdana, arial, helvetica, sans-serif;
// font-size: 13px;
// line-height: 18px; }

// p, ol, ul, td {
// font-family: verdana, arial, helvetica, sans-serif;
// font-size: 13px;
// line-height: 18px; }

// pre {
// background-color: #eee;
// padding: 10px;
// font-size: 11px; }

// a {
// color: #000;
// &:visited {
// color: #666; }
// &:hover {
// color: #fff;
// background-color: #000; } }

// div {
// &.field, &.actions {
// margin-bottom: 10px; } }

// #notice {
// color: green; }

// .field_with_errors {
// padding: 2px;
// background-color: red;
// display: table; }

// #error_explanation {
// width: 450px;
// border: 2px solid red;
// padding: 7px;
// padding-bottom: 0;
// margin-bottom: 20px;
// background-color: #f0f0f0;
// h2 {
// text-align: left;
// font-weight: bold;
// padding: 5px 5px 5px 15px;
// font-size: 12px;
// margin: -7px;
// margin-bottom: 0px;
// background-color: #c00;
// color: #fff; }
// ul li {
// font-size: 12px;
// list-style: square; } }
80 changes: 40 additions & 40 deletions app/assets/stylesheets/store.css.scss
Expand Up @@ -2,47 +2,47 @@
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

.store {
h1 {
margin: 0;
padding-bottom: 0.5em;
font: 150% sans-serif;
color: #226;
border-bottom: 3px dotted #77d;
}
// .store {
// h1 {
// margin: 0;
// padding-bottom: 0.5em;
// font: 150% sans-serif;
// color: #226;
// /*border-bottom: 3px dotted #77d;*/
// }

/* An entry in the store catalog */
.entry {
overflow: auto;
margin-top: 1em;
border-bottom: 1px dotted #77d;
min-height: 100px;
// /* An entry in the store catalog */
// .entry {
// overflow: auto;
// margin-top: 1em;
// border-bottom: 1px dotted #77d;
// min-height: 100px;

img {
width: 80px;
margin-right: 5px;
margin-bottom: 5px;
position: absolute;
}
h3 {
font-size: 120%;
font-family: sans-serif;
margin-left: 100px;
margin-top: 0;
margin-bottom: 2px;
color: #227;
}
// img {
// width: 80px;
// margin-right: 5px;
// margin-bottom: 5px;
// position: absolute;
// }
// h3 {
// font-size: 120%;
// font-family: sans-serif;
// margin-left: 100px;
// margin-top: 0;
// margin-bottom: 2px;
// color: #227;
// }

p, div.price_line {
margin-left: 100px;
margin-top: 0.5em;
margin-bottom: 0.8em;
}
// p, div.price_line {
// margin-left: 100px;
// margin-top: 0.5em;
// margin-bottom: 0.8em;
// }

.price {
color: #44a;
font-weight: bold;
margin-right: 3em;
}
}
}
// .price {
// color: #44a;
// font-weight: bold;
// margin-right: 3em;
// }
// }
// }

0 comments on commit 1325661

Please sign in to comment.