Adds working deposit and purchases.

- Switch to bootstrap.
 - Still no balance checking or form feedback messages.
This commit is contained in:
nikolark committed 2012-02-22 05:22:04 +01:00
1 parent ce8190c870
commit fc400dffd4
36 files changed
+9233 -812

No files matched your search

+2 -2
View File
@@ -1,4 +1,5 @@
# Require any additional compass plugins here.
require 'compass_twitter_bootstrap'
# Set this to the root of your project when deployed:
http_path = "/"
@@ -9,12 +10,11 @@ javascripts_dir = "javascripts"
# You can select your preferred output style here (can be overridden via the command line):
# output_style = :expanded or :nested or :compact or :compressed
# To enable relative paths to assets via compass helper functions. Uncomment:
# relative_assets = true
# To disable debugging comments that display the original location of your selectors. Uncomment:
# line_comments = false
line_comments = false
# If you prefer the indented syntax, you might want to regenerate this
Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 923 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

File renamed without changes.
File renamed without changes.
File renamed without changes.
-16
View File
@@ -1,16 +0,0 @@
@import "blueprint";
// To generate css equivalent to the blueprint css but with your configuration applied, uncomment:
// +blueprint-ie
//Recommended Blueprint configuration with scoping and semantic layout:
body.bp {
@include blueprint-ie(true);
// Note: Blueprint centers text to fix IE6 container centering.
// This means all your texts will be centered under all version of IE by default.
// If your container does not have the .container class, don't forget to restore
// the correct behavior to your main container (but not the body tag!)
// Example:
// .my-container
// text-align: left
}
-10
View File
@@ -1,10 +0,0 @@
// Here is where you can define your constants for your application and to configure the blueprint framework.
// Feel free to delete these if you want keep the defaults:
$blueprint-grid-columns: 24;
$blueprint-container-size: 950px;
$blueprint-grid-margin: 10px;
// Use this to calculate the width based on the total width.
// Or you can set $blueprint-grid-width to a fixed value and unset $blueprint-container-size -- it will be calculated for you.
$blueprint-grid-width: ($blueprint-container-size + $blueprint-grid-margin) / $blueprint-grid-columns - $blueprint-grid-margin;
-6
View File
@@ -1,6 +0,0 @@
// Only apply the blueprint form styles to forms with
// a class of "bp". This makes it easier to style
// forms from scratch if you need to.
form.bp {
@include blueprint-form; }
-16
View File
@@ -1,16 +0,0 @@
// Import the non-default scaffolding module to help us get started.
@import "blueprint/scaffolding";
// This configuration will only apply the
// blueprint styles to pages with a body class of "bp"
// This makes it easier to have pages without blueprint styles
// when you're using a single/combined stylesheet.
body.bp {
@include blueprint-typography(true);
@include blueprint-utilities;
@include blueprint-debug;
@include blueprint-interaction;
// Remove the scaffolding when you're ready to start doing visual design.
// Or leave it in if you're happy with how blueprint looks out-of-the-box
@include blueprint-scaffolding; }
-38
View File
@@ -1,38 +0,0 @@
// Page layout can be done using mixins applied to your semantic classes and IDs
// For instance this layout defines a two column layout on pages with
// a body class of "two-col".
//
// The markup would look like:
// <div id="container">
// <div id="header"></div>
// <div id="sidebar"></div>
// <div id="content"></div>
// <div id="footer"></div>
// </div>
//
// and the layout would look like:
// +------------------------+
// | #header |
// +--------+---------------+
// | | |
// |#sidebar| #content |
// | | |
// +------------------------+
// | #footer |
// +--------+---------------+
body.two-col {
#container {
@include container; }
#header, #footer {
@include column($blueprint-grid-columns); }
#sidebar {
// One third of the grid columns, rounding down. With 24 cols, this is 8.
$sidebar-columns: floor($blueprint-grid-columns / 3);
@include column($sidebar-columns); }
#content {
// Two thirds of the grid columns, rounding up.
// With 24 cols, this is 16.
$content-columns: ceil(2 * $blueprint-grid-columns / 3);
// true means it's the last column in the row
@include column($content-columns, true); } }
+1 -5
View File
@@ -1,5 +1 @@
@import "blueprint";
//Recommended Blueprint configuration with scoping and semantic layout:
body.bp {
@include blueprint-print(true); }
@import "compass_twitter_bootstrap";
+21 -37
View File
@@ -1,30 +1,9 @@
// This import applies a global reset to any page that imports this stylesheet.
@import "blueprint/reset";
// To configure blueprint, edit the partials/base.sass file.
@import "partials/base";
// Import all the default blueprint modules so that we can access their mixins.
@import "blueprint";
// Combine the partials into a single screen stylesheet.
@import "partials/page";
@import "partials/form";
@import "partials/two_col";
@import "compass";
//@import "compass";
@import "compass_twitter_bootstrap";
body {
background-color: $blueprint-background-color;
#header {
nav {
margin:2em;
ul {
@include inline-block-list;
}
}
}
#register {
@@ -33,16 +12,15 @@ body {
@include inline-block-list;
li {
img { }
padding: 1em;
padding: 1.5em;
text-align: center;
width: 100px;
&:hover {
background-color: darken($blueprint-background-color, 20%);
background-color: #dddddd;
}
&.selected {
background-color: darken($blueprint-background-color, 20%);
&.marked {
background-color: #dddddd;
}
}
}
@@ -56,19 +34,25 @@ body {
text-align: center;
&:hover {
background-color: darken($blueprint-background-color, 20%);
background-color: #dddddd;
}
}
}
}
}
input[type=submit] {
padding: 1em;
padding-left: 1.5em;
padding-right: 1.5em;
position:relative;
left: 100px;
#total {
div {
color: #ffffff;
background-color: #222;
padding: 10px;
min-width:115px;
h2 {
color: #ffffff;
}
}
}
button {
margin-top:10px;
}
}
section {
margin-bottom:2em;
-85
View File
@@ -1,85 +0,0 @@
body.bp {
text-align: center;
}
* html body.bp legend {
margin: 0px -8px 16px 0;
padding: 0;
}
html > body.bp p code {
*white-space: normal;
}
body.bp .container {
text-align: left;
}
body.bp sup {
vertical-align: text-top;
}
body.bp sub {
vertical-align: text-bottom;
}
body.bp hr {
margin: -8px auto 11px;
}
body.bp img {
-ms-interpolation-mode: bicubic;
}
body.bp fieldset {
padding-top: 0;
}
body.bp legend {
margin-top: -0.2em;
margin-bottom: 1em;
margin-left: -0.5em;
}
body.bp fieldset, body.bp #IE8#HACK {
padding-top: 1.4em;
}
body.bp legend, body.bp #IE8#HACK {
margin-top: 0;
margin-bottom: 0;
}
body.bp textarea {
overflow: auto;
}
body.bp label {
position: relative;
top: -0.25em;
}
body.bp input.text {
margin: 0.5em 0;
background-color: white;
border: 1px solid #bbbbbb;
}
body.bp input.text:focus {
border: 1px solid #666666;
}
body.bp input.title {
margin: 0.5em 0;
background-color: white;
border: 1px solid #bbbbbb;
}
body.bp input.title:focus {
border: 1px solid #666666;
}
body.bp input.checkbox {
position: relative;
top: 0.25em;
}
body.bp input.radio {
position: relative;
top: 0.25em;
}
body.bp input.button {
position: relative;
top: 0.25em;
}
body.bp textarea {
margin: 0.5em 0;
}
body.bp select {
margin: 0.5em 0;
}
body.bp button {
position: relative;
top: 0.25em;
}
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff