Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'design'

  • Loading branch information...
commit d5b0c235b9b928afe84016c1554210d9aafefa4b 2 parents f52b9ab + 6f204de
@fguillen fguillen authored
Showing with 1,807 additions and 651 deletions.
  1. +2 −1  app/controllers/application.rb
  2. +2 −2 app/helpers/application_helper.rb
  3. +0 −2  app/helpers/resources_helper.rb
  4. +0 −2  app/helpers/sessions_helper.rb
  5. +0 −2  app/helpers/static_pages_helper.rb
  6. +6 −6 app/views/layouts/_menu.html.erb
  7. +1 −2  app/views/layouts/_sidebar.html.erb
  8. +72 −0 app/views/layouts/layout.html.erb
  9. +2 −2 app/views/papers/index.html.erb
  10. +2 −2 app/views/papers/show.html.erb
  11. +16 −7 config/environment.rb
  12. +0 −4 config/initializers/requires.rb
  13. +33 −18 doc/INSTALL.md
  14. BIN  public/favicon.ico
  15. BIN  public/images/available.png
  16. BIN  public/images/{delete.png → bg.png}
  17. BIN  public/images/big-avatar.png
  18. BIN  public/images/bin_closed.png
  19. BIN  public/images/{edit.png → button.png}
  20. BIN  public/images/cancel.png
  21. BIN  public/images/comment.png
  22. BIN  public/images/cover.png
  23. BIN  public/images/cross.png
  24. BIN  public/images/edit-comment.png
  25. BIN  public/images/edited.png
  26. BIN  public/images/email.png
  27. BIN  public/images/europe.png
  28. BIN  public/images/feed.png
  29. BIN  public/images/flag_green.png
  30. BIN  public/images/flag_red.png
  31. BIN  public/images/green.png
  32. BIN  public/images/invoice_header.png
  33. BIN  public/images/logo.png
  34. BIN  public/images/logos/accens_logo.png
  35. BIN  public/images/logos/aspgems.png
  36. BIN  public/images/logos/aytomadrid.png
  37. BIN  public/images/logos/aytomadrid_02.jpg
  38. BIN  public/images/logos/etsit.png
  39. BIN  public/images/logos/flowers.png
  40. BIN  public/images/logos/hotelsearch.png
  41. BIN  public/images/logos/secuoyas.png
  42. BIN  public/images/logos/teledit.png
  43. BIN  public/images/logos/thecocktail.png
  44. BIN  public/images/logos/vorago.png
  45. BIN  public/images/money_add.png
  46. BIN  public/images/money_delete.png
  47. BIN  public/images/nav-background.png
  48. BIN  public/images/nav-divider.png
  49. BIN  public/images/no-voy.png
  50. BIN  public/images/page.png
  51. BIN  public/images/prize.png
  52. BIN  public/images/rails.png
  53. BIN  public/images/recycle.png
  54. BIN  public/images/register.png
  55. BIN  public/images/rss.png
  56. BIN  public/images/send.png
  57. BIN  public/images/soldout.png
  58. BIN  public/images/{grid.png → sponsor.png}
  59. BIN  public/images/star.png
  60. BIN  public/images/tag.png
  61. BIN  public/images/tick.png
  62. BIN  public/images/twitter.png
  63. BIN  public/images/unavailable.png
  64. BIN  public/images/user_go.png
  65. BIN  public/images/user_red.png
  66. BIN  public/images/voy.png
  67. +29 −0 public/stylesheets/debugger.css
  68. +14 −0 public/stylesheets/edicion.css
  69. +58 −0 public/stylesheets/extras.css
  70. +49 −88 public/stylesheets/forms.css
  71. +40 −0 public/stylesheets/grid-2cols.css
  72. +47 −0 public/stylesheets/grid-3cols.css
  73. +0 −1  public/stylesheets/grid.css
  74. +45 −1 public/stylesheets/ie.css
  75. +21 −0 public/stylesheets/ie6.css
  76. +12 −0 public/stylesheets/ie7.css
  77. +85 −0 public/stylesheets/print.css
  78. +293 −0 public/stylesheets/registro.css
  79. +56 −21 public/stylesheets/reset.css
  80. +74 −0 public/stylesheets/scaffold.css
  81. +260 −485 public/stylesheets/screen.css
  82. +119 −1 public/stylesheets/typography.css
  83. +4 −4 test/functional/users_controller_test.rb
  84. +111 −0 vendor/plugins/exception_notification/README
  85. +4 −0 vendor/plugins/exception_notification/init.rb
  86. +99 −0 vendor/plugins/exception_notification/lib/exception_notifiable.rb
  87. +66 −0 vendor/plugins/exception_notification/lib/exception_notifier.rb
  88. +78 −0 vendor/plugins/exception_notification/lib/exception_notifier_helper.rb
  89. +61 −0 vendor/plugins/exception_notification/test/exception_notifier_helper_test.rb
  90. +7 −0 vendor/plugins/exception_notification/test/test_helper.rb
  91. +1 −0  vendor/plugins/exception_notification/views/exception_notifier/_backtrace.rhtml
  92. +7 −0 vendor/plugins/exception_notification/views/exception_notifier/_environment.rhtml
  93. +16 −0 vendor/plugins/exception_notification/views/exception_notifier/_inspect_model.rhtml
  94. +4 −0 vendor/plugins/exception_notification/views/exception_notifier/_request.rhtml
  95. +2 −0  vendor/plugins/exception_notification/views/exception_notifier/_session.rhtml
  96. +3 −0  vendor/plugins/exception_notification/views/exception_notifier/_title.rhtml
  97. +6 −0 vendor/plugins/exception_notification/views/exception_notifier/exception_notification.rhtml
View
3  app/controllers/application.rb
@@ -4,6 +4,7 @@
class ApplicationController < ActionController::Base
# restful_authentication
include AuthenticatedSystem
+ include ExceptionNotifiable
helper :all # include all helpers, all the time
@@ -19,7 +20,7 @@ class ApplicationController < ActionController::Base
# from your application log (in this case, all fields with names like "password").
# filter_parameter_logging :password
- layout 'application'
+ layout 'layout'
rescue_from ActiveRecord::RecordNotFound, :with => :record_not_found
View
4 app/helpers/application_helper.rb
@@ -6,9 +6,9 @@ def title(page_title)
end
def menu_to(name, options = {}, html_options = {}, &block)
- content = link_to(name, options, html_options, &block)
+ content = link_to("<span>#{name}</span>", options, html_options, &block)
if current_page?(options)
- "<li class=\"selected\">#{content}</li>"
+ "<li class=\"current\">#{content}</li>"
else
"<li>#{content}</li>"
end
View
2  app/helpers/resources_helper.rb
@@ -1,2 +0,0 @@
-module ResourcesHelper
-end
View
2  app/helpers/sessions_helper.rb
@@ -1,2 +0,0 @@
-module SessionsHelper
-end
View
2  app/helpers/static_pages_helper.rb
@@ -1,2 +0,0 @@
-module StaticPagesHelper
-end
View
12 app/views/layouts/_menu.html.erb
@@ -1,10 +1,10 @@
-<div id="main-menu">
+<div id="main-menu" class="menu">
<ul>
<%= menu_to 'Home', root_path %>
<%= menu_to 'Calendar', calendar_path %>
<%= menu_to 'Talks', papers_path %>
- <% if admin? %>
<%= menu_to 'Submit Talk', new_paper_path %>
+ <% if admin? %>
<%= menu_to 'Events', events_path %>
<% end %>
<%= menu_to 'People', users_path(:page => 1) %>
@@ -15,19 +15,19 @@
</ul>
</div>
-<div id="user-menu">
+<div id="user-menu" class="menu">
<ul>
<% if logged_in? %>
<%= menu_to 'Profile', user_path(current_user) %>
<% if current_user.everything_paid? %>
<%= menu_to 'Pay!', new_cart_path %>
<% else %>
- <%= menu_to 'Pay!', new_cart_path, :highlight => true %>
+ <%= menu_to 'Pay!', new_cart_path %> <!-- , :highlight => true -->
<% end %>
<%= menu_to 'Logout', logout_path %>
<% else %>
<%= menu_to 'Login', new_session_path %>
- <%= menu_to 'Signup', new_user_path, :class => "highlight" %>
+ <%= menu_to 'Signup', new_user_path %> <!-- , :class => "highlight" -->
<% end %>
</ul>
-</div>
+</div>
View
3  app/views/layouts/_sidebar.html.erb
@@ -5,7 +5,6 @@
<% end %>
<div class="spot">
- <%= image_tag "europe.png" %>
<h3>What's EuRuKo?</h3>
<p>
EuRuKo is an annual conference about the Ruby programming
@@ -72,7 +71,7 @@
</div>
<div class="spot">
- <%= image_tag "ruby.png" %>
+ <%= image_tag "rails.png" %>
<h3>Got Ruby?</h3>
<p>
Ruby is a dynamic, open source programming language with a focus
View
72 app/views/layouts/layout.html.erb
@@ -0,0 +1,72 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+ <title>Conferencia Rails 2009 - <%= yield(:title) || "La conferencia sobre Rails en castellano" %></title>
+
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta name="robots" content="index, follow" />
+ <meta name="mssmarttagspreventparsing" content="true" />
+ <meta name="author" content="El equipo de la Conferencia Rails Hispana" />
+ <meta name="description" content="Reunión anual de los desarrolladores y empresas hispanas que trabajan con Ruby y Rails cada día. El objetivo de la conferencia es difundir el Open Source y poner en contacto a profesionales del sector." />
+ <meta name="dc.title" content="IV Conferencia Rails" />
+ <meta rel="start" href="http://www.conferenciarails.org" title="IV Conferencia Rails" />
+ <meta rel="alternate" href="http://www.conferenciarails.org/rss" title="IV Conferencia Rails Feed" type="application/rss+xml" />
+
+ <%= stylesheet_link_tag "reset.css", :media => "screen, projection" %>
+ <%= stylesheet_link_tag "typography.css", :media => "screen, projection" %>
+ <%= stylesheet_link_tag "grid-3cols.css", :media => "screen, projection" %>
+ <%= stylesheet_link_tag "forms.css", :media => "screen, projection" %>
+ <%= stylesheet_link_tag "screen", :media => "screen, projection" %>
+ <%= stylesheet_link_tag "extras", :media => "screen, projection" %>
+
+ <!--[if lte IE 7]>
+ <%= stylesheet_link_tag "ie", :media => "screen, projection" %>
+ <![endif]-->
+
+ <!--[if IE 6]>
+ <%= stylesheet_link_tag "ie6", :media => "screen, projection" %>
+ <![endif]-->
+
+ <!--[if IE 7]>
+ <%= stylesheet_link_tag "ie7", :media => "screen, projection" %>
+ <![endif]-->
+
+ <%= javascript_include_tag :defaults %>
+ </head>
+ <body>
+ <div class="canvas">
+ <div id="header">
+ <%= render :partial => 'layouts/menu' %>
+ </div>
+
+ <div id="content">
+ <div id="left-sidebar">
+ <div id="twitter">
+ <h5>Twitter <span>@conferenciaror</span></h5>
+ <ul id="twitter_update_list"></ul>
+ </div>
+ </div>
+
+ <div id="main">
+ <% flash.each do |name, msg| %>
+ <%= content_tag :div, msg, :id => name, :class => 'flash' %>
+ <% end %>
+
+ <%= yield %>
+ </div>
+
+ <div id="right-sidebar">
+ <%= render :partial => 'layouts/sidebar' %>
+ </div>
+ </div>
+
+ <div id="footer">
+ <%= render :partial => 'layouts/footer' %>
+ </div>
+ </div>
+ <!-- TODO-HTML -->
+ <!--%= render :partial => 'partials/twitter' %-->
+ <!--%= render :partial => 'partials/stats' %-->
+ </body>
+</html>
View
4 app/views/papers/index.html.erb
@@ -1,12 +1,12 @@
<% title 'List of Talks' %>
-<% if current_page?('/') %>
+<!-- <% if current_page?('/') %>
<div id="cover"><%= image_tag 'cover.png' %></div>
<% if !logged_in? %>
<%= render :partial => "soldout" %>
<% end %>
-<% end %>
+<% end %> -->
<h3><%= yield(:title) %></h3>
<% if admin? %>
View
4 app/views/papers/show.html.erb
@@ -1,11 +1,11 @@
<% title "#{@paper.title}" %>
-<h3>
+<h2>
<%= yield(:title) %>
<% if logged_in? && current_user.is_speaker_on_or_admin?( @paper ) %>
<%= link_to image_tag('edit.png'), edit_paper_path(@paper) %>
<% end %>
-</h3>
+</h2>
<div class="entry">
<%= image_tag @paper.photo.url(:medium), :class => 'avatar' %>
View
23 config/environment.rb
@@ -23,13 +23,16 @@
# Specify gems that this application depends on.
# They can then be installed with "rake gems:install" on new installations.
# You have to specify the :lib option for libraries, where the Gem name (sqlite3-ruby) differs from the file itself (sqlite3)
- config.gem "haml"
- config.gem(
- 'mislav-will_paginate',
- :version => '~> 2.2.3',
- :lib => 'will_paginate',
- :source => 'http://gems.github.com'
- )
+ config.gem 'haml'
+ config.gem 'mislav-will_paginate', :version => '~> 2.2.3', :lib => 'will_paginate', :source => 'http://gems.github.com'
+ config.gem 'bluecloth'
+ config.gem 'pdf-writer', :lib => 'pdf/writer'
+
+ unless RAILS_ENV == 'production'
+ config.gem 'faker', :lib => false
+ config.gem 'mocha', :lib => false
+ config.gem 'thoughtbot-factory_girl', :lib => false, :version => ">= 1.2"
+ end
# config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
# config.gem "sqlite3-ruby", :lib => "sqlite3"
@@ -82,6 +85,10 @@
# restful_authentication
config.active_record.observers = :user_observer
+
+ # The following would be better belong to requires.rb although, if there, it causes rake gems:install to not to work.
+ # In Rails 2.3 this issue is already solved so we could move this to requires.rb
+ require 'paperclip_validations_extended'
end
# custom date formats
@@ -89,3 +96,5 @@
:cool => "%A %d %B %Y at %H:%M %p",
:date => "%A %d %B %Y"
)
+
+ExceptionNotifier.exception_recipients = APP_CONFIG[:email_notification_recipients]
View
4 config/initializers/requires.rb
@@ -1,9 +1,5 @@
require 'utils'
-require 'paperclip_validations_extended'
-require 'will_paginate'
-require 'pdf/writer'
require 'pdf/simpletable'
-require 'bluecloth'
# extensions
require 'pdfwritter_extensions'
View
51 doc/INSTALL.md
@@ -1,3 +1,25 @@
+_Si encuentras que estas instrucciones son incorrectas o incompletas, por favor, siéntete libre de actualizarlas._
+
+Instalar la aplicación en un paso
+----------------------
+
+ rake init:all db=<mysql|sqlite> [user=user] [password=password]
+
+Ejemplo:
+
+ rake init:all db=mysql user=euruko password=euruko
+ rake init:all db=sqlite
+
+Esto creará los ficheros de configuración database.yml, config.yml, site_keys.rb, borrará las actuales DBs, creará las nuevas, popularizará la DB development con datos ficticios y creará un usuario y un admin.
+
+Si la tarea falla porque faltan dependencias externas, se pueden instalar ejecutando:
+
+ [sudo] rake gems:install
+
+Y luego volver a intentar el `rake init:all`
+
+(Nota: [ImageMagick](http://is.gd/27Gir) es también una dependencia)
+
Instalar la aplicación a mano y poco a poco
----------------------
@@ -6,10 +28,17 @@ Instalar la aplicación a mano y poco a poco
git clone git://github.com/fguillen/ConfRoR2009.git
### External dependencies
- gem install mocha
- gem install faker
- gem install will-paginate -v=2.2.3
- # gem install Roman2K-rails-test-serving -s http://gems.github.com # testing accelerator
+
+ [sudo] gem install mocha
+ [sudo] gem install faker
+ [sudo] gem install mislav-will_paginate -v=2.2.3
+ [sudo] gem install haml
+ [sudo] gem install bluecloth
+ [sudo] gem install pdf-writer
+ [sudo] gem install thoughtbot-factory_girl
+ # [sudo] gem install Roman2K-rails-test-serving -s http://gems.github.com # testing accelerator
+
+* [ImageMagick](http://is.gd/27Gir)
### Iniciar Configuraciones
@@ -32,17 +61,3 @@ Instalar la aplicación a mano y poco a poco
### Popularizar la BD con datos de prueba
rake populate:all
-
-
-
-Instalar la aplicación en un paso
-----------------------
-
- rake init:all db=<mysql|sqlite> [user=user] [password=password]
-
-Ejemplo:
-
- rake init:all db=mysql user=euruko password=euruko
- rake init:all db=sqlite
-
-Esto creará los ficheros de configuración database.yml, config.yml, site_keys.rb, borrará las actuales DBs, creará las nuevas, popularizará la DB development con datos ficticios y creará un usuario y un admin.
View
BIN  public/favicon.ico
Binary file not shown
View
BIN  public/images/available.png
Deleted file not rendered
View
BIN  public/images/delete.png → public/images/bg.png 100755 → 100644
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/big-avatar.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/bin_closed.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/edit.png → public/images/button.png 100755 → 100644
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/cancel.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/comment.png
Deleted file not rendered
View
BIN  public/images/cover.png
Deleted file not rendered
View
BIN  public/images/cross.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/edit-comment.png
Deleted file not rendered
View
BIN  public/images/edited.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/email.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/europe.png
Deleted file not rendered
View
BIN  public/images/feed.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/flag_green.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/flag_red.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/green.png
Deleted file not rendered
View
BIN  public/images/invoice_header.png
Deleted file not rendered
View
BIN  public/images/logo.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/logos/accens_logo.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/logos/aspgems.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/logos/aytomadrid.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/logos/aytomadrid_02.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/logos/etsit.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/logos/flowers.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/logos/hotelsearch.png
Diff not rendered
View
BIN  public/images/logos/secuoyas.png
Diff not rendered
View
BIN  public/images/logos/teledit.png
Diff not rendered
View
BIN  public/images/logos/thecocktail.png
Diff not rendered
View
BIN  public/images/logos/vorago.png
Diff not rendered
View
BIN  public/images/money_add.png
Diff not rendered
View
BIN  public/images/money_delete.png
Diff not rendered
View
BIN  public/images/nav-background.png
Diff not rendered
View
BIN  public/images/nav-divider.png
Diff not rendered
View
BIN  public/images/no-voy.png
Diff not rendered
View
BIN  public/images/page.png
Diff not rendered
View
BIN  public/images/prize.png
Diff not rendered
View
BIN  public/images/rails.png
Diff not rendered
View
BIN  public/images/recycle.png
Diff not rendered
View
BIN  public/images/register.png
Diff not rendered
View
BIN  public/images/rss.png
Diff not rendered
View
BIN  public/images/send.png
Diff not rendered
View
BIN  public/images/soldout.png
Diff not rendered
View
BIN  public/images/grid.png → public/images/sponsor.png 100755 → 100644
Diff not rendered
View
BIN  public/images/star.png
Diff not rendered
View
BIN  public/images/tag.png
Diff not rendered
View
BIN  public/images/tick.png
Diff not rendered
View
BIN  public/images/twitter.png
Diff not rendered
View
BIN  public/images/unavailable.png
Diff not rendered
View
BIN  public/images/user_go.png
Diff not rendered
View
BIN  public/images/user_red.png
Diff not rendered
View
BIN  public/images/voy.png
Diff not rendered
View
29 public/stylesheets/debugger.css
@@ -0,0 +1,29 @@
+/*
+ debugger.css
+ Collection of test for the suite, use this only on development
+ http://meyerweb.com/eric/thoughts/2007/09/07/diagnostic-styling
+*/
+
+
+/* Check for empty tags */
+table#imgtest th,
+table#imgtest td { text-align: center; padding: 5px; }
+table#imgtest tbody th { text-align: right; }
+table#imgtest img {width: 25px; height: 25px;}
+div:empty, span:empty, li:empty, p:empty, td:empty, th:empty { padding: 0.5em; background: yellow; }
+*[style], img, a[href], font, center { outline: 5px solid red; }
+table, th { border: 5px solid red; }
+
+/* Empty for empty titles */
+img[alt][title] { outline-width: 0; }
+img[alt] { outline-color: fuchsia; }
+img[alt], img[title] { outline-style: double;}
+img[alt=""][title], img[alt][title=""] { outline-width: 3px;}
+img[alt=""][title=""] { outline-style: dotted;}
+a[title] { outline-width: 0;}
+a[title=""] { outline-width: 3px;}
+a[href="#"] { background: lime;}
+a[href=""] { background: fuchsia; }
+
+/* Check for summary */
+table[summary], th[scope="col"], th[scope="row"] { border: 1px solid #AAA; }
View
14 public/stylesheets/edicion.css
@@ -0,0 +1,14 @@
+#menu {
+ background-color: #ffa;
+ padding: 5px;
+ font-size: 12px;
+ font-weight: bold;
+}
+
+.par {
+ background-color: #ddd;
+}
+
+.impar {
+ background-color: #fff;
+}
View
58 public/stylesheets/extras.css
@@ -0,0 +1,58 @@
+/*
+ classes.css
+ Cool classes that shouldn't be in the core
+*/
+
+
+/*
+ Mark Boulton's incremental leading for sidenotes
+ It's a bit shaky at this time, because Safari rounded pixels badly
+ http://www.markboulton.co.uk/journal/comments/incremental_leading
+
+*/
+
+.sidenote {
+ font-size: 10px;
+ line-height: 1.44em;
+ margin-bottom: 1.5em;
+}
+
+/* Nice looking text */
+.classic {
+ font-family: "Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua", Georgia, serif;
+ font-weight: normal;
+}
+
+.spot img {
+float:left;
+padding:0 12px 10px 0;
+}
+
+.sponsor img {
+border:1px solid #777777;
+float:none;
+padding:0;
+}
+
+.grid-item {
+display:block;
+float:left;
+font-size:80%;
+height:115px;
+margin-right:10px;
+text-align:center;
+width:86px;
+}
+
+.pagination {
+color:#999999;
+float:right;
+font-size:11px;
+margin-right:10px;
+clear:both;
+}
+
+.entry img {
+float:left;
+margin:0 16px 8px 0;
+}
View
137 public/stylesheets/forms.css
@@ -1,93 +1,54 @@
-form {
- margin: 18px 0 0 0;
- padding: 0; }
-
-label {
- font-size: 90%;
- font-weight: bold;
- font-family:"Lucida Grande", Tahoma, Arial, sans-serif; }
-
-label[for="remember_me"] {
- font-weight: normal; }
+/*
+ forms.css
+ Sets up some default styling for forms
+ Gives you classes to enhance your forms
+ For text fields, use class .title or .text
+*/
-input[type="text"], input[type="password"] {
- font-size: 1.25em;
- padding: 4px;
- background: #FFFFFF;
- color: #333;
- border: 1px solid #AAA;
- width: 65%; }
-textarea {
- width: 65%;
- height: 100px;
- padding: 5px;
- border: 1px solid #AAA;
- color: #555; }
-
-textarea.large {
- width: 75%;
- height: 450px;
- padding: 5px;
- border: 1px solid #AAA;
- color: #555; }
-
-
-input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
- background: #FFFBCA;
- color: #000;
- border: 1px solid #AAA; }
-
-.example, .tip {
- font-size: 75%;
- color: #666;
- font-family:"Lucida Grande", Tahoma, Arial, sans-serif; }
-
-.required {
- color: #F00; }
-
-#alert, #error, #notice {
- padding: 6px 10px 6px 10px;
- margin-bottom: 24px;
- width: 96%;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px; }
-
-#notice {
- background: #65CD33;
- color: #FFF; }
+fieldset { padding: 0; margin: 0; }
-#alert {
- background: #EBD151;
- color: #FFF; }
+input {
+ border: 1px solid #B7B5AC;
+ font-size: 1em;
+ padding: 0.25em;
+ width: 84%;
+}
-#error{
- background: #DB2225;
- color: #FFF; }
-
-.errorExplanation {
- margin-bottom: 30px;
- color: #000; }
+input[type="checkbox"] {
+ width: auto;
+}
-.errorExplanation h2 {
- color: #DA0202;
- font-size: 150%; }
-
-.errorExplanation p, li {
- font-size: 100%;
- font-family: Helvetica, Arial, Verdana, sans-serif; }
-
-.fieldWithErrors {
- margin: 0;
- padding: 0; }
-
-.fieldWithErrors input, .fieldWithErrors textarea {
- border: 2px solid #DA0202; }
-
-.notes {
- margin-top: 18px;
- font-size: 12px;
- font-family: Helvetica, Arial, Verdana, sans-serif; }
-
-#comments textarea {
- width: 90%; }
+textarea {
+ border: 1px solid #B7B5AC;
+ height: 100px;
+ width: 85%;
+}
+
+.comment textarea { width: 99%; }
+
+input.text:focus, input.title:focus, textarea:focus, select:focus { border: 1px solid #666; }
+
+#main input[type="image"] {
+ border: none;
+ width: auto;
+ display: inline-block;
+ vertical-align: middle;
+}
+
+#main label { font-weight: bold; font-size: 0.9em; }
+
+#register label {
+ display: inline-block;
+ width: 6em;
+ padding-right: 0.25em;
+ text-align: right;
+ font-weight: bold;
+}
+
+#register input {
+ border: 1px solid #B7B5AC;
+ font-size: 1em;
+ padding: 0.25em;
+ width: 50%;
+}
View
40 public/stylesheets/grid-2cols.css
@@ -0,0 +1,40 @@
+.canvas {
+ margin: 0 auto;
+ width: 100%;
+ min-width: 960px;
+ max-width: 1100px;
+ text-align: left;
+ overflow: hidden;
+}
+
+#header, #content, #footer {
+ float: left;
+ width: 100%;
+ display: block;
+ position: relative;
+}
+
+#menu, #right-sidebar, #left-sidebar, #main {
+ position: relative;
+ float: left;
+ left: 100%;
+ overflow: hidden;
+}
+
+#menu {
+ margin-left: -72%;
+ width: 70%;
+}
+
+#main {
+ margin-left: -98%;
+ width: 69%;
+}
+
+#right-sidebar {
+ margin-left: -26%;
+ padding-left: 0%;
+ width: 24%;
+}
+
+hr { background-color: #E0DFDA; margin: 0 0 1em 0; padding: 0; }
View
47 public/stylesheets/grid-3cols.css
@@ -0,0 +1,47 @@
+.canvas {
+ margin: 0 auto;
+ width: 100%;
+ min-width: 960px;
+ max-width: 1100px;
+ text-align: left;
+ overflow: hidden;
+}
+
+#header, #content, #footer {
+ float: left;
+ width: 100%;
+ display: block;
+ position: relative;
+}
+
+#menu, #right-sidebar, #left-sidebar, #main {
+ position: relative;
+ float: left;
+ left: 100%;
+ overflow: hidden;
+}
+
+#menu {
+ margin-left: -72%;
+ width: 70%;
+}
+
+#left-sidebar {
+ margin-left: -98%;
+ padding-right: 2%;
+ width: 22%;
+ border-right: 1px solid #E0DFDA;
+}
+
+#main, #plan, #profile {
+ margin-left: -72%;
+ width: 44%;
+}
+
+#right-sidebar {
+ margin-left: -26%;
+ padding-left: 0%;
+ width: 24%;
+}
+
+hr { background-color: #E0DFDA; margin: 0 0 1em 0; padding: 0; }
View
1  public/stylesheets/grid.css
@@ -1 +0,0 @@
-.showgrid{background:url(../images/grid.png)}.content{width:950px;margin:0 auto}.span-1,.span-2,.span-3,.span-4,.span-5,.span-6,.span-7,.span-8,.span-9,.span-10,.span-11,.span-12,.span-13,.span-14,.span-15,.span-16,.span-17,.span-18,.span-19,.span-20,.span-21,.span-22,.span-23,.span-24{float:left;margin-right:10px}.last{margin-right:0}.span-1{width:30px}.span-2{width:70px}.span-3{width:110px}.span-4{width:150px}.span-5{width:190px}.span-6{width:230px}.span-7{width:270px}.span-8{width:310px}.span-9{width:350px}.span-10{width:390px}.span-11{width:430px}.span-12{width:470px}.span-13{width:510px}.span-14{width:550px}.span-15{width:590px}.span-16{width:630px}.span-17{width:670px}.span-18{width:710px}.span-19{width:750px}.span-20{width:790px}.span-21{width:830px}.span-22{width:870px}.span-23{width:910px}.span-24{width:950px;margin:0}.append-1{padding-right:40px}.append-2{padding-right:80px}.append-3{padding-right:120px}.append-4{padding-right:160px}.append-5{padding-right:200px}.append-6{padding-right:240px}.append-7{padding-right:280px}.append-8{padding-right:320px}.append-9{padding-right:360px}.append-10{padding-right:400px}.append-11{padding-right:440px}.append-12{padding-right:480px}.append-13{padding-right:520px}.append-14{padding-right:560px}.append-15{padding-right:600px}.append-16{padding-right:640px}.append-17{padding-right:680px}.append-18{padding-right:720px}.append-19{padding-right:760px}.append-20{padding-right:800px}.append-21{padding-right:840px}.append-22{padding-right:880px}.append-23{padding-right:920px}.prepend-1{padding-left:40px}.prepend-2{padding-left:80px}.prepend-3{padding-left:120px}.prepend-4{padding-left:160px}.prepend-5{padding-left:200px}.prepend-6{padding-left:240px}.prepend-7{padding-left:280px}.prepend-8{padding-left:320px}.prepend-9{padding-left:360px}.prepend-10{padding-left:400px}.prepend-11{padding-left:440px}.prepend-12{padding-left:480px}.prepend-13{padding-left:520px}.prepend-14{padding-left:560px}.prepend-15{padding-left:600px}.prepend-16{padding-left:640px}.prepend-17{padding-left:680px}.prepend-18{padding-left:720px}.prepend-19{padding-left:760px}.prepend-20{padding-left:800px}.prepend-21{padding-left:840px}.prepend-22{padding-left:880px}.prepend-23{padding-left:920px}.border{padding-right:4px;margin-right:5px;border-right:1px solid #BBB}.colborder{padding-right:24px;margin-right:25px;border-right:1px solid #EEE}.pull-1{margin-left:-40px}.pull-2{margin-left:-80px}.pull-3{margin-left:-120px}.pull-4{margin-left:-160px}.pull-5{margin-left:-200px}.pull-1,.pull-2,.pull-3,.pull-4,.pull-5,.pull-5{float:left;position:relative}.push-1{margin:0 -40px 1.5em 40px}.push-2{margin:0 -80px 1.5em 80px}.push-3{margin:0 -120px 1.5em 120px}.push-4{margin:0 -160px 1.5em 160px}.push-5{margin:0 -200px 1.5em 200px}.push-0,.push-1,.push-2,.push-3,.push-4,.push-5{float:right;position:relative}.box{padding:1.5em;margin-bottom:1.5em;background:#E5ECF9}hr{background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:0.1em;margin:0 0 1.45em;border:none}.space{background:#FFF;color:#FFF}.clearfix:after,.canvas:after{content:".";display:block;height:0;clear:both;visibility:hidden}.clearfix,.canvas{display:inline-block}* html .clearfix,* html .canvas{height:1%}.clearfix,.canvas{display:block}.clear{clear:both}
View
46 public/stylesheets/ie.css
@@ -1 +1,45 @@
-body{text-align:center}.container{text-align:left}* html .column{overflow-x:hidden}* html legend{margin:-18px -8px 16px 0;padding:0}ol{margin-left:2em}sup{vertical-align:text-top}sub{vertical-align:text-bottom}html>body p code *{white-space:normal}hr{margin:-8px auto 11px}
+/*
+ ie.css
+ This fixes general IE bugs for every version lower than IE7, require this file like this:
+ <!--[if lt IE 7]>
+ <link rel="stylesheet" href="stylesheets/ie.css" type="text/css" media="screen, projection" title="IE" charset="utf-8" />
+ <![endif]-->
+*/
+
+/* Make sure the layout is centered in IE5 */
+body { text-align: center; }
+
+/* Fixes IE margin bugs */
+* html .column { overflow-x: hidden; }
+
+/* Fixes incorrect styling of legend in IE6. */
+* html legend { margin: -18px -8px 16px 0; padding: 0; }
+
+/* Fixes incorrect placement of ol numbers in IE6/7. */
+ol { margin-left: 2em; }
+
+/* Fixes wrong line-height on sup/sub in IE. */
+sup { vertical-align: text-top; }
+sub { vertical-align: text-bottom; }
+
+/* Fixes IE7 missing wrapping of code elements. */
+html>body p code { *white-space: normal; }
+
+/* IE 6 & 7 have problems with setting proper <hr> margins. */
+hr { margin: 0px auto 18px; color: #E0DFDA; }
+
+/* Verses on IE */
+.verse pre {
+ text-align: center;
+}
+
+.verse pre span {
+ text-align: left;
+ display: inline-block;
+ white-space: pre;
+}
+
+#menu a { padding: 0px 0px 0px 10px; }
+#menu a span { padding: 5px 10px 5px 0px; }
+
+p.details { font-family: Verdana; }
View
21 public/stylesheets/ie6.css
@@ -0,0 +1,21 @@
+/*
+ ie6.css
+ This fixes IE6 bugs, require this file like this:
+ <!--[if IE 6]>
+ <link rel="stylesheet" href="stylesheets/ie6.css" type="text/css" media="screen, projection" title="IE6" charset="utf-8" />
+ <![endif]-->
+*/
+
+
+.canvas {
+/*
+ Could be nice to get this working
+ width: expression(document.body.clientWidth < 980 ? "985px" : documentElement.clientWidth > 1176? "1176px" : "98%" );
+*/
+
+/*
+ Fixed width for IE6
+ fuck 'em all
+*/
+ width: 1050px;
+}
View
12 public/stylesheets/ie7.css
@@ -0,0 +1,12 @@
+/*
+ ie7.css
+ This fixes IE7 bugs, require this file like this:
+ <!--[if IE 7]>
+ <link rel="stylesheet" href="stylesheets/ie7.css" type="text/css" media="screen, projection" title="IE7" charset="utf-8" />
+ <![endif]-->
+*/
+
+.canvas {
+ min-width: 1050px;
+ max-width: 1200px;
+}
View
85 public/stylesheets/print.css
@@ -0,0 +1,85 @@
+/* --------------------------------------------------------------
+
+ print.css
+ * Gives you some sensible styles for printing pages.
+ * See Readme file in this directory for further instructions.
+
+ Some additions you'll want to make, customized to your markup:
+ #header, #footer, #navigation { display:none; }
+
+-------------------------------------------------------------- */
+
+body {
+ line-height: 1.5;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ color:#000;
+ background: none;
+ font-size: 10pt;
+}
+
+
+/* Layout
+-------------------------------------------------------------- */
+
+.container {
+ background: none;
+}
+
+hr {
+ background:#ccc;
+ color:#ccc;
+ width:100%;
+ height:2px;
+ margin:2em 0;
+ padding:0;
+ border:none;
+}
+hr.space {
+ background: #fff;
+ color: #fff;
+}
+
+
+/* Text
+-------------------------------------------------------------- */
+
+h1,h2,h3,h4,h5,h6 { font-family: "Helvetica Neue", Arial, "Lucida Grande", sans-serif; }
+code { font:.9em "Courier New", Monaco, Courier, monospace; }
+
+img { float:left; margin:1.5em 1.5em 1.5em 0; }
+a img { border:none; }
+p img.top { margin-top: 0; }
+
+blockquote {
+ margin:1.5em;
+ padding:1em;
+ font-style:italic;
+ font-size:.9em;
+}
+
+.small { font-size: .9em; }
+.large { font-size: 1.1em; }
+.quiet { color: #999; }
+.hide { display:none; }
+
+
+/* Links
+-------------------------------------------------------------- */
+
+a:link, a:visited {
+ background: transparent;
+ font-weight:700;
+ text-decoration: underline;
+}
+
+a:link:after, a:visited:after {
+ content: " (" attr(href) ") ";
+ font-size: 90%;
+}
+
+/* If you're having trouble printing relative links, uncomment and customize this:
+ (note: This is valid CSS3, but it still won't go through the W3C CSS Validator) */
+
+/* a[href^="/"]:after {
+ content: " (http://www.yourdomain.com" attr(href) ") ";
+} */
View
293 public/stylesheets/registro.css
@@ -0,0 +1,293 @@
+a:link {
+ color: blue;
+}
+
+a:visited {
+ color: blue;
+}
+
+a:hover {
+ color: gray;
+}
+
+a:active {
+ color: blue;
+}
+
+a img {border: none; }
+
+body {
+
+ color: #000;
+ font-size: 90%;
+ margin: 0;
+ font-family: "Lucida Grande", Helvetica, Arial, Verdana, sans-serif;
+ line-height: 1.5; /* Unitless for proper inheritance */
+}
+
+
+h1 {
+ font-weight: bold;
+ font-size: 120%;
+}
+
+label {
+ font-size: 90%;
+ float: left;
+ text-align: left;
+ margin-right: 0.5em;
+ display: block
+}
+
+input {
+ background-color: #fff;
+ border: 1px solid #ccc;
+}
+
+textarea {
+ background-color: #fff;
+ border: 1px solid #ccc;
+}
+
+table {
+ border: 3px solid #ccc;
+ border-collapse: collapse;
+ width: 100%;
+ table-layout: fixed;
+}
+
+caption {
+ font-size: 90%;
+ font-style: italic;
+ text-align: left;
+ padding-bottom: 1em;
+}
+
+td {
+ padding-left: 1em;
+ padding-right: 1em;
+ padding-top: 0.3em;
+ padding-bottom: 0.3em;
+}
+
+/*
+th {
+ border: solid 1px #ccc;
+}
+*/
+
+.center {
+ text-align: center;
+}
+
+.signup_link {
+ text-align: center;
+ font-weight: bold;
+}
+
+.reset_link {
+ text-align: center;
+ font-size: 80%;
+}
+
+.fieldWithErrors {
+ padding: 2px;
+ background-color: red;
+ display: table;
+}
+
+.errorExplanation {
+ font-size: 100%;
+ background-color: #fff4e4;
+ border: 3px solid red;
+ padding-left: 2em;
+ margin-bottom : 2em;
+}
+
+.notice {
+ float: left;
+ background-color: #fad163;
+ padding-left: 2em;
+ padding-right: 2em;
+}
+
+.resalta {
+ background-color: yellow;
+}
+
+.perfil {
+ background-color: #f1f1f1;
+ border: 1px solid #c6dcdd;
+ padding: 0.5em;
+ padding-left: 2em;
+}
+
+.usuario {
+ background-color: #fff;
+ border: 1px solid #fff;
+ padding: 0.5em;
+ padding-left: 2em;
+}
+
+.pagado {
+ background-color: #fff;
+ border: 3px solid #6c0;
+ padding: 0.5em;
+ padding-left: 2em;
+}
+
+.nopagado {
+ background-color: #fff4e4;
+ border: 3px solid red;
+ padding: 0.5em;
+ padding-left: 2em;
+}
+
+.usuario_noactivado {
+ background-color: #EEEBBE;
+}
+
+.usuario_pagado {
+ background-color: #cf6;
+}
+
+.usuario_nopagado {
+ background-color: #FFE8E5;
+}
+
+.usuario_publico {
+ background-color: #EEEBBE;
+ font-size: 80%;
+}
+
+.loginbox {
+ background-color: #cf6;
+ border: 3px solid #6c0;
+ padding: 1em;
+}
+
+.adminbox {
+ background-color: #f1f1f1;
+ border: 3px solid #c6dcdd;
+ padding: 1em;
+}
+
+#patrocinadores {
+ background-color: #f1f1f1;
+ border: 3px solid #c6dcdd;
+ padding: 1em;
+}
+
+.logo {
+ min-height: 60px;
+}
+
+
+.cuadro {
+ border: solid 1px #ccc;
+ width: 2em;
+}
+
+.caption {
+ background-color: #fff;
+}
+
+.subject {
+ width: 40%;
+}
+
+td.campo {
+ font-style: italic;
+ width: 10em;
+ vertical-align: text-top;
+}
+
+td.img_command {
+ width: 25px;
+}
+
+td.importe {
+ border-left: 1px solid #ccc;
+ padding-right: 0;
+ text-align: right;
+ width: 3em;
+}
+
+table.explanation {
+ border: none;
+ font-size: 90%;
+}
+
+div.hidden {
+ overflow: hidden;
+ white-space: nowrap;
+}
+
+#container {
+ background: #FFF url(../../images/hd2.png) top left repeat-x;
+}
+
+#top {
+ height: 4em;
+ background: #000 url(../../images/title.png) center no-repeat; height: 54px;
+}
+
+#top h2 { display: none; color: #FFF; padding: 1em 0 1em 0; text-align: center; font-size: 1.5em; font-family: Gill Sans; }
+
+
+#flash {
+ clear: both;
+ height: 1.5em;
+ margin-top: 2em;
+ margin-left: 20%;
+ text-align: center;
+ font-weight: bold;
+}
+
+#left {
+ float: left;
+ width: 60%;
+ margin-left: 5%;
+ padding-top: 1em;
+ padding-bottom: 2em;
+}
+
+#right {
+ float: right;
+ width: 15em;
+ margin-right: 5%;
+ padding-top: 1em;
+ padding-bottom: 2em;
+}
+
+#footer {
+ height: 2em;
+ background-color: #137AD3;
+ color: #fff;
+ clear: both;
+ padding: .5em;
+ text-align: center;
+ font-size: 80%;
+}
+
+#footer a {
+ color: #fff;
+}
+
+
+
+#menu { font-size: 85%; margin: 0 0 0 34px; padding-top: 92px; background: transparent url(../../images/header.png) no-repeat; }
+#menu a { color: #222; text-decoration: none; font-weight: bold; padding: 0.2em 0.45em 0.2em 0.45em; }
+#menu a:hover { text-decoration: underline; }
+
+
+#menu ul {
+ margin: 1.6em 0 0 0;
+ padding: 0.7em 0 0.85em 0;
+}
+
+#menu ul li {
+ margin: 0 1em 0 0;
+ float: left;
+ list-style-type: none;
+}
View
77 public/stylesheets/reset.css
@@ -1,41 +1,76 @@
-/* --------------------------------------------------------------
+/*
+ reset.css
+ This resets all the styles (for compatibility) and adds vertical rhythm
+ This is based on Eric Meyer's reset reloaded
+ http://meyerweb.com/eric/thoughts/2007/05/01/reset-reloaded
+*/
- reset.css
- * Resets default browser CSS.
- Based on work by Eric Meyer:
- * meyerweb.com/eric/thoughts/2007/05/01/reset-reloaded/
-
- Icons are available for purchase at:
- * http://www.istockphoto.com/file_closeup/arts-and-entertainment/arts-symbols/4575877-satin-icons-set-9.php?id=4575877
-
--------------------------------------------------------------- */
-
-html, body, div, span, object, iframe,
+/* Reset only the elements we want to use, 100.01% corrects several bugs */
+html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, code,
-del, dfn, em, img, q, dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, samp,
+small, strong, sub, sup, tt, var,
+dl, dt, dd, ol, ul, li, fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td {
margin: 0;
padding: 0;
border: 0;
font-weight: inherit;
font-style: inherit;
- font-size: 100%;
+ font-size: 100.01%;
font-family: inherit;
vertical-align: baseline;
}
+/* Uncomment to reset everything or double check */
+/* * { margin: 0; padding: 0; } */
+
+/* Remember to define focus styles! */
+:focus { outline: 0; }
+
+/* Set vertical rhythm and basic style */
+body {
+ line-height: 1.5;
+ color: black;
+ background: white;
+}
+
+/* Tables still need 'cellspacing="0"' in the markup */
+table {
+ border-collapse: separate;
+ border-spacing: 0;
+}
+
+table, td, th { vertical-align: middle; }
+
+caption, th, td {
+ text-align: left;
+ font-weight: normal;
+}
+
+/* Remove the style of the lists */
+ol, ul { list-style: none; }
-body { line-height: 1.5; background: #fff; margin:1.5em 0; }
+/* Adjust the height of the separators */
+hr {
+ margin: 1.5em 0 1.5em 0;
+ padding: 0;
+ border: 0;
+ color: #000;
+ height: 1px;
+}
-/* Tables still need 'cellspacing="0"' in the markup. */
-table { border-collapse: separate; border-spacing: 0; }
-caption, th, td { text-align: left; font-weight:400; }
+/* Handle annoying spaces with form elements */
+input, textarea {
+ margin: 0;
+ padding: 0
+}
-/* Remove possible quote marks (") from <q>, <blockquote>. */
+/* Remove quoute marks */
blockquote:before, blockquote:after, q:before, q:after { content: ""; }
blockquote, q { quotes: "" ""; }
+/* Remove border on linked images */
a img { border: none; }
View
74 public/stylesheets/scaffold.css
@@ -0,0 +1,74 @@
+body { background-color: #fff; color: #333; }
+
+body, p, ol, ul, td {
+ font-family: verdana, arial, helvetica, sans-serif;
+ font-size: 13px;
+ line-height: 18px;
+}
+
+pre {
+ background-color: #eee;
+ padding: 10px;
+ font-size: 11px;
+}
+
+a { color: #000; }
+a:visited { color: #666; }
+a:hover { color: #fff; background-color:#000; }
+
+.fieldWithErrors {
+ padding: 2px;
+ background-color: red;
+ display: table;
+}
+
+#errorExplanation {
+ width: 400px;
+ border: 2px solid red;
+ padding: 7px;
+ padding-bottom: 12px;
+ margin-bottom: 20px;
+ background-color: #f0f0f0;
+}
+
+#errorExplanation h2 {
+ text-align: left;
+ font-weight: bold;
+ padding: 5px 5px 5px 15px;
+ font-size: 12px;
+ margin: -7px;
+ background-color: #c00;
+ color: #fff;
+}
+
+#errorExplanation p {
+ color: #333;
+ margin-bottom: 0;
+ padding: 5px;
+}
+
+#errorExplanation ul li {
+ font-size: 12px;
+ list-style: square;
+}
+
+div.uploadStatus {
+ margin: 5px;
+}
+
+div.progressBar {
+ margin: 5px;
+}
+
+div.progressBar div.border {
+ background-color: #fff;
+ border: 1px solid grey;
+ width: 100%;
+}
+
+div.progressBar div.background {
+ background-color: #333;
+ height: 18px;
+ width: 0%;
+}
+
View
745 public/stylesheets/screen.css
@@ -1,509 +1,284 @@
-/*--- screen.css ---*/
-
-body {
- background-color: #FFF;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 80%;
- padding: 0;
- margin: 0;
- text-align: center; }
-
-#page {
- margin: 0 auto;
- padding: 0 20px;
- width: 900px;
- text-align: left;
- background-color: #FFFFFF;
- clear: both; }
-
-#main {
- background-color: white;
- float: left;
- width: 100%;
- margin: 15px 0px 0px 30px; }
-
-h1 {
- color: #FFFFFF;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 35px;
- font-weight: bold;
- letter-spacing: 0.02em;
- line-height: 0.72em;
- text-transform: uppercase; }
-
-h2 {
- color: #435F79;
- font-family: Georgia, sans-serif;
- font-size: 180%;
- font-weight: normal;
- margin: 0px; }
-
-h3 {
- font-family: Helvetica, Arial, Verdana, sans-serif;
- font-size: 160%;
- margin: 0px;
- font-weight: bold; }
-
-h3 a {
- color: #850707;
- text-decoration: none;
- border-bottom: none;
- margin: 0px; }
-
-h3 a:hover {
- color: #BA0A0A;
- border-bottom: none; }
-
-h4 {
- font-family: Georgia, Times, "Times New Roman";
- font-size: 140%;
- margin: 0px; }
-
-h4 a {
- color: #650505;
- margin: 0px; }
-
-h4 a:hover {
- color: #D50202; }
+/*
+ Eureka CSS Framework
+ http://github.com/marze/eureka
+*/
+
+.grid { background: url('../images/grid.png'); }
+
+body { background: #EEEDEA url('../images/bg.png') top repeat-x; }
+
+h1, h2, h3, h4, h5, h6 { color: #282A2B; font-weight:bold; }
+
+h2 a, h3 a, h4 a { text-decoration: none; }
+h2 a:hover, h3 a:hover, h4 a:hover { text-decoration: underline; }
h5 {
- color: #435F79;
- font-family: Georgia, sans-serif;
- font-size: 140%;
- margin: 0px; }
-
-h6 {
- font-size: 80%;
- text-transform: uppercase;
- margin: 20px 0 10px 0;
- font-weight: bold; }
+ text-transform: uppercase;
+ font-family: Verdana;
+ letter-spacing: 2px;
+ font-weight: bold;
+ padding-top: 1.65em;
+}
+
+#sponsors h5 { padding-top: 0em; }
+
+h5 span {
+ text-transform: lowercase;
+ letter-spacing: 0px;
+ font-weight: normal;
+ font-style: italic;
+}
+
+p.details {
+ font-style: italic;
+ color: #888;
+ font-size: 0.916667em;
+ line-height: 1.636364em;
+ margin-top: -0.25em;
+ text-indent: 0em;
+}
+
+span.details {
+ font-style: italic;
+ color: #888;
+ font-size: 0.916667em;
+}
-a {
- color: #7D0707;
- text-decoration: none;
- border-bottom: 1px solid #DBD6D1; }
-
-a:hover {
- color: #D50202;
- text-decoration: none;
- border-bottom: 1px solid #E20202; }
-
-p {
- color: #111;
- font-family: Helvetica, Arial, Verdana, sans-serif;
- line-height: 1.25em;
- margin: 0px 0px 10px; }
-
-ul {
- padding: 0 0 0 18px; }
-
-li {
- padding: 0; }
-
-
-hr {
- color: #FFF;
- border-bottom: 1px solid #EEE;
- width: 100%;
- margin: 20px 0 0 0; }
-
-
-/*--- main ---*/
-
-#logo {
- margin: 10px 0 15px 0; }
-
-#cover {
- margin-bottom: 15px; }
-
-#content-wrapper {
- float: left;
- width: 580px; }
-
-#content {
- padding: 0px; }
-
-#content h3 {
- color: #111;
- margin: 24px 0 18px 0; }
-
-/*--- sidebar ---*/
-
-#sidebar-wrapper {
- float: right;
- width: 300px; }
-
-#sidebar {
- font-size: 90%;
- padding: 15px;
- padding-top: 0px; }
-
-#sidebar h3 {
- color: #222222;
- font-family: Helvetica, Arial, Verdana, sans-serif;
- font-size: 17px;
- font-weight: bold;
- margin: 0px; }
-
-#sidebar p {
- line-height: 1.4em; }
-
-
-/*--- article ---*/
-
-.entry {
- margin-bottom: 1em;
- padding-bottom: 5px; }
-
-.entry a {
- font-family: Georgia, Times, "Times New Roman"; }
-
-.entry .info {
- margin-top: 1em;
- font-size: 1em; }
-
-.entry p {
- font-size: 1.05em;
- line-height: 1.45em; }
-
-.entry img {
- float: left;
- margin: 0 16px 8px 0; }
-
-.actions {
- margin-top: 5px; }
-
-.actions a {
- padding: 0;
- font-size: 11px;
- font-family: "Lucida Grande", Arial, Helvetica, Verdana, sans-serif; }
+a { color: #CB3522; }
+a:hover { color: #2A5454; }
+a:visited { color: #9B2016; }
-.actions em {
- color: #451811;
- font-style: italic;
- margin: 0px 6px;
- font-weight: bold; }
-
-.actions img {
- background: transparent none repeat scroll 0 0;
- border: medium none;
- margin: 0 2px -4px 0;
- text-decoration: none;
- float: none; }
-
-.tiny-actions {
- margin-top: 2px;
- clear: both; }
+p.details { text-indent: 1em; }
-.tiny-actions a {
- border: none; }
+table {
+ width:100%;
+ margin: 0 0 1.5em 0;
+}
+
+table img { display: inline-block; vertical-align: middle; margin-right: 3px; }
+
+td { padding: 5px 0 5px 5px; border-bottom: 1px solid #DDD; }
+
+.odd td, .even td { border-left: 1px solid #DDD; }
+.odd, .even { background-color: #FFF; }
+
+.highlight { background-color: #FFF8CB; }
+
+.title td {
+ text-align: center;
+ font-weight: bold;
+ font-size: 1.15em;
+ padding: 1em 0 0.5em 0;
+}
+
+.index th {
+ color: #FFF;
+ padding-left: 5px;
+ font-variant: small-caps;
+ background-color: #A3342B;
+ border-left: 1px solid #9B2016;
+ border-bottom: 1px solid #9B2016;
+}
-.grid-item {
- float: left;
- display: block;
- text-align: center;
- width: 86px;
- height: 115px;
- margin-right: 10px;
- font-size: 80%; }
+.bienvenida td, .coffeebreak td, .comida td {
+ padding: 0 0 0 5px;
+ color: #FFF;
+ background-color: #476B6A;
+ border-left: 1px solid #2A5454;
+ border-bottom: 1px solid #2A5454;
+}
+
+.flash{
+ padding: .8em; margin-bottom: 1em;
+ text-align: center; margin: 0 auto; margin-bottom: 1em;
+}
+.errorExplanation ul { margin-bottom: 0; padding: 0;}
+.errorExplanation, #error { background: #E7BEBB; color: #9B2016; }
+#notice { background: #CEDDC4; color: #213026; }
+.canvas { background: url('../images/logo.png') 0 0 no-repeat; }
+
+#header {
+ color: #000;
+ margin-bottom: 3em;
+}
+
+.menu ul {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+ margin-top: 1.5em;
+ margin-bottom: 0.5em;
+ float: right;
+}
+
+.menu li {
+ display: inline;
+ font-size: 1.333333em;
+ line-height: 1.125em;
+ margin-right: 0.5em;
+}
+
+.menu a { padding: 5px 0px 5px 10px; text-decoration: none; color: #FFF; }
+.menu a span { padding: 5px 10px 5px 0px; }
+.menu a:hover { background: url('../images/button.png') bottom left; color: #FFF; }
+.menu a:hover span { background: url('../images/button.png') bottom right; }
+.menu .current a { background: url('../images/button.png') top left; color: #111; }
+.menu .current a span { background: url('../images/button.png') top right; }
+
+#twitter li {
+ list-style-type: none;
+ margin-bottom: 1em;
+}
+
+#twitter ul {
+ margin: 0;
+ padding: 0;
+}
+
+.item { margin-bottom: 2em; }
+.item a img { float: left; width: auto; margin: 6px 6px 0 0; }
+
+/*.avatar { float: right; margin: 0 0 0.5em 0.5em; }*/
.avatar {
border: 1px solid #333333; }
-#extra {
- margin-bottom: 10px; }
-
-#extra .box {
- background-color: #e8f0f6;
- border-color: #D5E9F6; }
-
-#extra p {
- font-size: 100%;
- line-height: 1.2em;
- margin: 0px 0px 5px 0px; }
-
-#extra em {
- font-style: italic; }
-
-#extra #register-button {
- float: left;
- margin: 12px 20px 15px 5px; }
-
-#extra #register-button {
- border: none; }
-
-#extra a img {
- margin-bottom: -3px; }
-
-#extra img a,
-#extra img a:hover {
- border-bottom: none !important;
- text-decoration: none !important; }
-
-#extra .soldout img {
- float: left;
- margin-right: 20px; }
-
-#extra .soldout {
- height: 90px; }
-
-.spot {
- margin-top: 10px;
- margin-bottom: 30px;
- clear: both; }
-
-.spot p {
- font-family: Verdana, sans-serif;
- font-size: 11px;
- color: #333333;
- margin-top: 0px; }
-
-.spot img {
- float: left;
- padding: 0px 12px 10px 0px; }
-
-.box {
- padding: 15px 15px 10px 15px;
- border: 1px solid #dbd6d1;
- background-color: #efedeb;
- margin-bottom: 20px; }
-
-.box span { font-weight: bold; }
-
-.box h3 {
- font-size: 18px;
- margin-bottom: 2px; }
-
-.box input {
- margin-top: 5px; }
-
-.box input.email {
- font-size: 10px;
- padding: 3px;
- color: #a29e96;
- width: 140px; }
-
-.box input.subscribe {
- width: 70px;
- margin-left: 5px;
- color: #232323; }
-
-.box ul {
- margin-left: 20px; }
-
-.form-block {
- width: 94%;
- border-top: 1px solid #CCC;
- padding: 20px 0 0 0;
- margin: 25px 0; }
-
-.form-block h6 {
- font-size: 120%;
- text-transform: none;
- margin: 0;
- padding-bottom: 10px; }
-
-.form-block .tip {
- color: #111; }
-
-.light {
- background-color: #F5F5F5;
- border-color: #F5F5F5; }
-
-.hidden {
- display: none; }
-
-.clear {
- clear: both; }
-
-.left {
- float: left; }
-
-.right {
- float: right; }
-
-.pagination {
- clear: both; }
-
-.more {
- font-size: 85%;
- margin: 25px 0; }
-
-.full, .paid {
- font-family: Verdana, sans-serif;
- font-size: 10px;
- text-transform: uppercase;
- font-weight: bold;
- padding: 2px 2px 2px 2px; }
-
-.full {
- background: #9F9F9F;
- color: #FFF; }
-
-.paid {
- background: #FFFD9D;
- color: #000; }
-
-#resources h6,
-#valorations h6,
-#attendees h6,
-#comments h6 {
- margin: 25px 0 14px 0;
-}
-
-#attendee {
- margin-bottom: 15px; }
-
-#valorations img {
- float: none;
- margin: 0 4px -4px 0; }
+.author-avatar { float: left; margin: 0 1em 0.25em 0; }
+
+.pager {
+ margin: 1.5em 0 0 0;
+ font-size: 1.083333em;
+ line-height: 1.384615em;
+}
+
+.pager a {
+ color: #333;
+ font-weight: bold;
+ font-style: italic;
+}
+
+.pager a:hover { color: #2A5454; }
+
+.pager .previous { float: left; }
+.pager .next { float: right; }
+
+#comments h3 {
+ padding-bottom: 0.5em;
+}
.comment {
- margin-bottom: 15px; }
+ border-top: 1px solid #CCC;
+ margin-top: 1.5em;
+ padding: 1em 1.5em 0.5em 1.5em;
+ background: #E4E1D7;
+}
-.comment .avatar {
- position: absolute; }
+.comment h6 {
+ margin-top: 0;
+}
-.comment p {
- margin-left: 50px; }
+.authors {
+ margin-top: -0.75em;
+ font-size: 0.916667em;
+ line-height: 1.636364em;
+ margin-bottom: 1.25em;
+}
-/*--- footer ---*/
+.date {
+ font-style: italic;
+ font-weight: normal;
+ font-size: 0.916667em;
+ line-height: 1.636364em;
+}
-#footer-wrapper {
- margin: 0 auto;
- margin-top: 30px;
- margin-bottom: 20px;
- width: 900px;
- clear: both; }
+.rate { float: right; }
-#footer {
- font-size: 80%;
- color: #595452;
- font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; }
+#asistentes {
+ margin-bottom: 2em;
+}
+
+#comentarios {
+ margin-top: -0.5em;
+}
-/*--- navigation ---*/
+#register {
+ background-color: #E5E2D7;
+ margin-bottom: 3em;
+ padding: 0 1.5em 1.5em 1.5em;
+ border: 1px dashed #CCC;
+ text-align: center;
+}
-#header {
- background: transparent url(/images/nav-background.png) repeat-x top left;
- width: 100%; }
-
-#nav {
- margin: 0 auto;
- padding: 0 20px;
- width: 900px;
- height: 38px;
- margin-bottom: 20px; }
-
-#nav ul {
- display: block;
+#register img {
margin: 0;
padding: 0;
+}
+
+#register p {
+ margin-bottom: 0;
+}
+
+#register ol {
+ margin: 0;
+ padding: 0;
+}
+
+#register li {
list-style-type: none;
- width: auto; }
+ margin: 0 0 0.5em 0;
+ padding: 0;
+}
+#register label {
+ display: inline-block;
+ width: 6em;