Skip to content
This repository
Browse code

Fix del merge

  • Loading branch information...
commit 1133f3f0a40c8faeb4a162916b237128fe61a04e 2 parents e455cc5 + 3753982
arpunk authored
BIN  public/images/background.jpg
BIN  public/images/fondo.png
BIN  public/images/iconBtc.png
7 public/stylesheets/style.css
... ... @@ -1,5 +1,6 @@
1 1 body {
2 2 font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
  3 + background-image:url('/images/background.jpg');
3 4 }
4 5
5 6 a {
@@ -11,4 +12,10 @@ a {
11 12 padding: 5px;
12 13 border: 1px solid #E5EAF1;
13 14 color: #666;
  15 +}
  16 +
  17 +.imagenFondo {
  18 + background-image:url('/images/fondo.png');
  19 + width: 372px;
  20 + height: 250px;
14 21 }
11 views/index.jade
... ... @@ -1,6 +1,5 @@
1   -p El precio de BTC hoy esta en:
2   -
3   -p.fbbox USD$
4   - b #{dolares}
5   -p.fbbox EUR€
6   - b #{euros}
  1 +.imagenFondo
  2 + p(class='fbbox', style='position:absolute;top:155px;left:140px;')
  3 + img(src='/images/iconBtc.png', width='16px', height:'16px', style='float:left;')
  4 + span(style='margin-left:4px;') El precio para Hoy: USD$
  5 + b #{dolares}

0 comments on commit 1133f3f

Please sign in to comment.
Something went wrong with that request. Please try again.