From: Ben Beltran <redacted>
Date: Wed, 1 Dec 2010 22:58:21 +0000 (-0700)
Subject: Cambio de Layout + Favicon
X-Git-Url: https://git.r.bdr.sh/rbdr/grita/commitdiff_plain/396b06b88ac6a3afaf816fe29bce239269c3511e?ds=sidebyside

Cambio de Layout + Favicon

Agregué el favicon nuevo y cambié un poco el layout para darle más enfasis al texto.
---

diff --git a/grita.rb b/grita.rb
index 406dde7..6e4d367 100644
--- a/grita.rb
+++ b/grita.rb
@@ -47,7 +47,7 @@ get '/:grito' do
     
     @markdown = RDiscount.new(@grito.text)
     
-    haml :grito
+    haml :grito, :layout => :layoutmini
 end
 
 error do
diff --git a/public/images/favicon.ico b/public/images/favicon.ico
new file mode 100644
index 0000000..9cb8445
Binary files /dev/null and b/public/images/favicon.ico differ
diff --git a/public/images/favicon.png b/public/images/favicon.png
new file mode 100644
index 0000000..024f0da
Binary files /dev/null and b/public/images/favicon.png differ
diff --git a/public/images/logomini.png b/public/images/logomini.png
new file mode 100644
index 0000000..862403f
Binary files /dev/null and b/public/images/logomini.png differ
diff --git a/views/layout.haml b/views/layout.haml
index 6fed808..160b858 100644
--- a/views/layout.haml
+++ b/views/layout.haml
@@ -6,7 +6,9 @@
 				%title= "#{@grito.title} - ¡Grita!"
 			-else
 				%title ¡Grita!
-		%link{:rel => 'stylesheet', :type => 'text/css', :href => '/style.css', :title => 'default'}
+		%link{:rel => 'stylesheet', :type => 'text/css', :href => '/style.css', :title => 'default'}		
+		%link{:rel => "icon", :href => "/images/favicon.ico", :type => "image/x-icon"}
+		%link{:rel => "icon", :href => "/images/favicon.png", :type => "image/png"}
 		%meta{'http-equiv' => 'Contet-Type', :content => 'text/html; charset=utf-8' }/
 	%body
 		#wrapper
diff --git a/views/layoutmini.haml b/views/layoutmini.haml
new file mode 100644
index 0000000..23fbe14
--- /dev/null
+++ b/views/layoutmini.haml
@@ -0,0 +1,21 @@
+!!! 5
+%html
+	%head
+		-unless @grito.nil?
+			-if @grito.errors.empty?
+				%title= "#{@grito.title} - ¡Grita!"
+			-else
+				%title ¡Grita!
+		%link{:rel => 'stylesheet', :type => 'text/css', :href => '/style.css', :title => 'default'}		
+		%link{:rel => "icon", :href => "/images/favicon.ico", :type => "image/x-icon"}
+		%link{:rel => "icon", :href => "/images/favicon.png", :type => "image/png"}
+		%meta{'http-equiv' => 'Contet-Type', :content => 'text/html; charset=utf-8' }/
+	%body
+		#wrapper
+			#header
+				%a{:id => 'logomini', :href=> '/'}<
+					%span Grita!
+			%hr/
+			#body 
+				=yield
+			#footer
\ No newline at end of file
diff --git a/views/style.css b/views/style.css
index 3a1f6e7..7582af3 100644
--- a/views/style.css
+++ b/views/style.css
@@ -23,7 +23,16 @@ body {
   display: block;
   margin: 10px 250px;
 }
+#header #logomini {
+  background-image: url(/images/logomini.png);
+  background-repeat: no-repeat;
+  width: 140px;
+  height: 65px;
+  display: block;
+  margin: 10px 380px;
+}
 #header #logo span { display: none; }
+#header #logomini span { display: none; }
 #header #description p {
   font-size: 1.4em;
   line-height: 1.8em;
diff --git a/views/style.less b/views/style.less
index 972269c..516cbbc 100644
--- a/views/style.less
+++ b/views/style.less
@@ -41,7 +41,16 @@ body{
 	margin: 10px 250px;
 }
 
-#header #logo span{
+#header #logomini{
+	background-image: url(/images/logomini.png);
+	background-repeat: no-repeat;
+	width: 140px;
+	height: 65px;
+	display: block;
+	margin: 10px 380px;
+}
+
+#header #logo span, #header #logomini span{
 	display: none;
 }