rubyberlin · hagenburger · Sep 4, 2014 · Aug 26, 2014 · Aug 26, 2014 · Aug 26, 2014
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,4 @@
-# If you have OpenSSL installed, we recommend updating
-# the following line to use "https"
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gem "middleman"
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,5 +1,5 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activesupport (4.1.5)
       i18n (~> 0.6, >= 0.6.9)

diff --git a/config.rb b/config.rb
@@ -1,50 +1,3 @@
-###
-# Compass
-###
-
-# Change Compass configuration
-# compass_config do |config|
-#   config.output_style = :compact
-# end
-
-###
-# Page options, layouts, aliases and proxies
-###
-
-# Per-page layout changes:
-#
-# With no layout
-# page "/path/to/file.html", :layout => false
-#
-# With alternative layout
-# page "/path/to/file.html", :layout => :otherlayout
-#
-# A path which all have the same layout
-# with_layout :admin do
-#   page "/admin/*"
-# end
-
-# Proxy pages (http://middlemanapp.com/dynamic-pages/)
-# proxy "/this-page-has-no-template.html", "/template-file.html", :locals => {
-#  :which_fake_page => "Rendering a fake page with a local variable" }
-
-###
-# Helpers
-###
-
-# Automatic image dimensions on image_tag helper
-# activate :automatic_image_sizes
-
-# Reload the browser automatically whenever files change
-# activate :livereload
-
-# Methods defined in the helpers block are available in templates
-# helpers do
-#   def some_helper
-#     "Helping"
-#   end
-# end
-
 activate :i18n, path: '/:locale'
 
 helpers do
@@ -60,30 +13,17 @@ def t(id, replacements = {})
 end
 
 set :css_dir, 'stylesheets'
-
 set :js_dir, 'javascripts'
-
 set :images_dir, 'images'
 
-# Build-specific configuration
 configure :build do
-  # For example, change the Compass output style for deployment
   activate :minify_css
-
-  # Minify Javascript on build
-  # activate :minify_javascript
-
-  # Enable cache buster
-  # activate :asset_hash
-
-  # Use relative URLs
-  # activate :relative_assets
-
-  # Or use a different image path
-  # set :http_prefix, "/Content/images/"
+  activate :asset_hash
+  activate :relative_assets
 end
 
 activate :deploy do |deploy|
   deploy.method = :git
   deploy.build_before = true # default: false
 end
+
diff --git a/locales/es.yml b/locales/es.yml
@@ -1,12 +1,12 @@
 ---
 es:
   header:
-    title: "Berlin Code of Conduct"
-    sub-title: "Un Código de Conducta para todos los User Groups y Conferencias"
+    title: "Berlín Code of Conduct"
+    sub-title: "Un Código de Conducta para todas las Comunidades de Usuarios y Conferencias"
   supporters:
-    title: "Partidarios"
-    sub-title: "Estos User Groups y Conferencias son partidarios del Berlin Code of Conduct:"
-    add: "Para agregar tu user group/conferencia aquí, sólo agrégalo como un Pull Request en %{link:nuestro repositorio}."
+    title: "Partidarios/as"
+    sub-title: "Estas Comunidades y Conferencias son partidarias del Berlín Code of Conduct:"
+    add: "Para agregar tu comunidad/conferencia aquí, sólo agrégalo como un Pull Request en %{link:nuestro repositorio}."
   footer:
     attribution: "Este código de conducta es una adaptación del %{link:código de conducta de pdx.rb}."
 
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
@@ -1,11 +1,12 @@
 <!doctype html>
-<html>
+<html lang="<%= I18n.locale %>">
   <head>
     <meta charset="utf-8">
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
     <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1" name="viewport">
-    <title>Berlin Code of Conduct</title>
-    <link href="stylesheets/style.css" rel="stylesheet">
+    <meta content="<%= t('header.title') %>" name="description">
+    <title><%= t('header.title') %></title>
+    <link href="<%= asset_url('stylesheets/style.css') %>" rel="stylesheet">
     <script src="//use.typekit.net/vvs3qav.js"></script>
     <script>try{Typekit.load();}catch(e){}</script>
   </head>

diff --git a/source/stylesheets/style.css.scss b/source/stylesheets/style.css.scss
@@ -1,7 +1,5 @@
 @charset "utf-8";
 
-@import "compass";
-
 %headline-font {
   font-family: "museo-sans", "helvetica", "arial", sans-serif;
   font-weight: 100;
@@ -157,12 +155,12 @@
 }
 
 .supporters--contacts-item {
+  box-sizing: border-box;
   float: left;
   list-style: none;
   margin: 1rem 0 0 0;
   padding: 0 5% 0 0;
   width: 25%;
-  @include box-sizing(border-box);
   @media all and (max-width: 1000px) {
     width: 50%;
   }