Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix del merge

  • Loading branch information...
commit 1133f3f0a40c8faeb4a162916b237128fe61a04e 2 parents e455cc5 + 3753982
arpunk authored
View
BIN  public/images/background.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/images/fondo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  public/images/iconBtc.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
7 public/stylesheets/style.css
@@ -1,5 +1,6 @@
body {
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
+ background-image:url('/images/background.jpg');
}
a {
@@ -11,4 +12,10 @@ a {
padding: 5px;
border: 1px solid #E5EAF1;
color: #666;
+}
+
+.imagenFondo {
+ background-image:url('/images/fondo.png');
+ width: 372px;
+ height: 250px;
}
View
11 views/index.jade
@@ -1,6 +1,5 @@
-p El precio de BTC hoy esta en:
-
-p.fbbox USD$
- b #{dolares}
-p.fbbox EUR€
- b #{euros}
+.imagenFondo
+ p(class='fbbox', style='position:absolute;top:155px;left:140px;')
+ img(src='/images/iconBtc.png', width='16px', height:'16px', style='float:left;')
+ span(style='margin-left:4px;') El precio para Hoy: USD$
+ b #{dolares}
Please sign in to comment.
Something went wrong with that request. Please try again.