Permalink
Browse files

added bootstrap

  • Loading branch information...
1 parent 99cf8b7 commit 810c44b8ae5d9ba62c089049b67702f32d1c52b5 Francois Paul committed Mar 13, 2012
Showing with 3,391 additions and 14 deletions.
  1. +13 −11 app/views/home/transact.eco
  2. +1 −0 css/index.styl
  3. +5 −3 css/theme.styl
  4. +3,372 −0 public/bootstrap.css
@@ -1,13 +1,15 @@
-<div>
- <div class='price'>
- R25.50
- </div>
- <ul class="description">
- <li>1 x Americano : R14.00</li>
- <li>1 x Espresso : R11.50</li>
- </ul>
- <div class="merchant">
- vida e caffè Hout Bay
+<div style='margin:10px'>
+ <div class="well">
+ <div class='price'>
+ R25.50
+ </div>
+ <ul class="description">
+ <li>1 x Americano : R14.00</li>
+ <li>1 x Espresso : R11.50</li>
+ </ul>
+ <div class="merchant">
+ vida e caffè Hout Bay
+ </div>
</div>
<form id='form' onsubmit="return false;">
<input type="password"
@@ -20,6 +22,6 @@
autocapitalize="off"
autocomplete="off"/>
<br/>
- <button id='accept_button'>Accept</button>
+ <button class='btn btn-large btn-info' id='accept_button'>Accept</button>
</form>
</div>
View
@@ -1,4 +1,5 @@
@import './mixin'
+@import './bootstrap.css'
body, html
height: 100%
View
@@ -5,8 +5,8 @@ body
overflow-x: hidden
-webkit-user-select: none
margin: 0; padding: 0
- color: #292D39
- background: #FFF
+ //color: #292D39
+ //background: #FFF
*
-webkit-tap-highlight-color: rgba(0,0,0,0)
@@ -30,6 +30,7 @@ body.stage
height: 40px
line-height: 40px
+
h2
margin: 0
padding: 0
@@ -38,6 +39,7 @@ body.stage
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5)
font-weight: normal
+ /*
button
position: absolute
left: 0
@@ -58,4 +60,4 @@ body.stage
&:active
-webkit-box-shadow: inset 0 -1px 1px rgba(0, 0, 0, 0.3), inset 0 1px 1px 0 rgba(0, 0, 0, 0.6), 0 1px 0 rgba(255, 255, 255, 0.4), inset 0 0 20px rgba(255, 255, 255, 0.2)
-
+ */
Oops, something went wrong.

0 comments on commit 810c44b

Please sign in to comment.