Acabado el compare.

linkingpaths · Apr 18, 2010 · 825a15b · 825a15b
1 parent b874374
commit 825a15b
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 12 deletions.
diff --git a/app/views/municipios/compare.html.erb b/app/views/municipios/compare.html.erb
@@ -5,9 +5,9 @@
 <!-- contents -->
 <div class="contents">
   <!-- main -->
-  <div class="main">
-    <div style="float:left">
-      <h2>Muni A: <%= @muni.nombre %></h2>
+  <div class="main mainfull">
+    <div class="compare_city compare_city_a">
+      <h2><%= @muni.nombre %></h2>
 
       <% budget = @muni.budget_for(@year) %>
       <% if budget %>
@@ -29,11 +29,11 @@
             <%= (budget.expense_loans*100/budget.total_gastos).round %>
           ];
         </script>
-        <div id="holder_a"></div>
+        <div class="holder" id="holder_a"></div>
 
         <!-- totals -->
         <div class="totals">
-          <h2>Total:</h2>
+          <h3>Total:</h3>
           <div class="balance">
             <p class="incomings">
               <span class="title">Total ingresos:</span>
@@ -53,8 +53,8 @@
 
     </div>
 
-    <div style="float:left">
-      <h2>Muni B: <%= @muni_b.nombre %></h2>
+    <div class="compare_city compare_city_b">
+      <h2><%= @muni_b.nombre %></h2>
 
       <% budget = @muni_b.budget_for(@year) %>
       <% if budget %>
@@ -76,11 +76,11 @@
             <%= (budget.expense_loans*100/budget.total_gastos).round %>
           ];
         </script>
-        <div id="holder_b"></div>
+        <div class="holder" id="holder_b"></div>
 
         <!-- totals -->
         <div class="totals">
-          <h2>Total:</h2>
+          <h3>Total:</h3>
           <div class="balance">
             <p class="incomings">
               <span class="title">Total ingresos:</span>

diff --git a/app/views/municipios/show.html.erb b/app/views/municipios/show.html.erb
@@ -80,11 +80,11 @@
 
       <h2 class="incomings_title">Ingresos</h2>
       <h2 class="expenses_title">Gastos</h2>
-      <div id="holder"></div>
+      <div class="holder" id="holder"></div>
 
       <!-- totals -->
       <div class="totals">
-        <h2>Total:</h2>
+        <h3>Total:</h3>
         <div class="balance">
           <p class="incomings">
             <span class="title">Total ingresos:</span>

diff --git a/public/stylesheets/screen.css b/public/stylesheets/screen.css
@@ -788,6 +788,50 @@ textarea:focus
 	width: 659px;
 }
 
+.main.mainfull
+{
+	width: 920px;
+}
+
+.compare_city
+{
+
+}
+
+.compare_city .holder
+{
+	background: url(/images/graph.gif) no-repeat center center;
+}
+
+.compare_city h2
+{
+	border-bottom: 1px solid #ddd;
+	border-top: 1px solid #ddd;
+	color: #6cb9be;
+	font-family: 'AvenirLTStd55RomanBold', 'Lucida Sans', 'Lucida Grande', 'Lucida Sans Unicode', Lucida, Arial, sans-serif;
+	font-size: 32px;
+	margin: 0 auto 20px auto;
+	padding: 10px 0;
+	text-align: center;
+	width: 95%;
+}
+
+.compare_city .totals h3
+{
+	display: block;
+	top: 0;
+}
+
+.compare_city_a
+{
+	float: left;
+}
+
+.compare_city_b
+{
+	float: right;
+}
+
 .incomings_title,
 .expenses_title
 {
@@ -816,14 +860,19 @@ textarea:focus
 	background: url(/images/graph.gif) no-repeat center center;
 }
 
+.holder
+{
+
+}
+
 
 /* @group .totals */
 .totals
 {
 	margin: 0 0 60px 0;
 }
 
-.totals h2
+.totals h3
 {
 	color: #008c95;
 	display: inline-block;