diff --git a/.coveralls.yml b/.coveralls.yml
new file mode 100644
index 000000000..6e649991e
--- /dev/null
+++ b/.coveralls.yml
@@ -0,0 +1 @@
+service_name: travis-ci
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 05906bf13..eb917c637 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@
/spec/examples.txt
/config/database.yml
/config/secrets.yml
+
+/coverage
diff --git a/Gemfile b/Gemfile
index 73325d81d..a0e612360 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,5 +56,6 @@ end
group :test do
gem 'database_cleaner'
gem 'poltergeist'
+ gem 'coveralls', require: false
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 9dad0c3ec..e1390d4ab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -75,6 +75,12 @@ GEM
execjs
coffee-script-source (1.9.1.1)
columnize (0.9.0)
+ coveralls (0.8.2)
+ json (~> 1.8)
+ rest-client (>= 1.6.8, < 2)
+ simplecov (~> 0.10.0)
+ term-ansicolor (~> 1.3)
+ thor (~> 0.19.1)
database_cleaner (1.4.1)
debug_inspector (0.0.2)
devise (3.5.1)
@@ -85,6 +91,9 @@ GEM
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.2.5)
+ docile (1.1.5)
+ domain_name (0.5.24)
+ unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
execjs (2.5.2)
factory_girl (4.5.0)
@@ -97,6 +106,8 @@ GEM
sass (>= 3.3.0, < 3.5)
globalid (0.3.5)
activesupport (>= 4.1.0)
+ http-cookie (1.0.2)
+ domain_name (~> 0.5)
i18n (0.7.0)
jbuilder (2.3.1)
activesupport (>= 3.0.0, < 5)
@@ -121,6 +132,7 @@ GEM
mini_portile (0.6.2)
minitest (5.7.0)
multi_json (1.11.2)
+ netrc (0.10.3)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
orm_adapter (0.5.0)
@@ -164,6 +176,10 @@ GEM
recaptcha (0.4.0)
responders (2.1.0)
railties (>= 4.2.0, < 5)
+ rest-client (1.8.0)
+ http-cookie (>= 1.0.2, < 2.0)
+ mime-types (>= 1.16, < 3.0)
+ netrc (~> 0.7)
rspec-core (3.3.1)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.0)
@@ -191,6 +207,11 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
+ simplecov (0.10.0)
+ docile (~> 1.1.0)
+ json (~> 1.8)
+ simplecov-html (~> 0.10.0)
+ simplecov-html (0.10.0)
spring (1.3.6)
sprockets (3.2.0)
rack (~> 1.0)
@@ -198,9 +219,12 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
+ term-ansicolor (1.3.2)
+ tins (~> 1.0)
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
+ tins (1.5.4)
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2)
@@ -208,6 +232,9 @@ GEM
uglifier (2.7.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
+ unf (0.1.4)
+ unf_ext
+ unf_ext (0.0.7.1)
warden (1.2.3)
rack (>= 1.0)
web-console (2.2.1)
@@ -232,6 +259,7 @@ DEPENDENCIES
capybara
ckeditor
coffee-rails (~> 4.1.0)
+ coveralls
database_cleaner
devise
factory_girl_rails
diff --git a/README.md b/README.md
index 648cefd8d..1df4987c8 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,10 @@
# Aplicación de Participación Ciudadana del Ayuntamiento de Madrid
+[](https://travis-ci.org/AyuntamientoMadrid/participacion)
+[](https://codeclimate.com/github/AyuntamientoMadrid/participacion)
+[](https://gemnasium.com/AyuntamientoMadrid/participacion)
+[](https://coveralls.io/github/AyuntamientoMadrid/participacion?branch=master)
+
Este es el repositorio de código abierto de la Aplicación de Participación Ciudadana del Ayuntamiento de Madrid.
## Estado del proyecto
@@ -22,8 +27,8 @@ cd participacion
bundle install
cp config/database.yml.example config/database.yml
cp config/secrets.yml.example config/secrets.yml
-bundle exec bin/rake db:create db:schema_load
-RAILS_ENV=test bundle exec rake db:create db:schema_load
+bundle exec bin/rake db:create db:schema:load
+RAILS_ENV=test bundle exec rake db:create db:schema:load
```
Para ejecutar la aplicación en local:
diff --git a/app/assets/fonts/foundation-icons.eot b/app/assets/fonts/foundation-icons.eot
deleted file mode 100644
index 1746ad407..000000000
Binary files a/app/assets/fonts/foundation-icons.eot and /dev/null differ
diff --git a/app/assets/fonts/foundation-icons.svg b/app/assets/fonts/foundation-icons.svg
deleted file mode 100644
index 4e014ff89..000000000
--- a/app/assets/fonts/foundation-icons.svg
+++ /dev/null
@@ -1,970 +0,0 @@
-
-
-
-
-
-Created by FontForge 20120731 at Fri Aug 23 09:25:55 2013
- By Jordan Humphreys
-Created by Jordan Humphreys with FontForge 2.0 (http://fontforge.sf.net)
-
-
-
-
-
diff --git a/app/assets/fonts/foundation-icons.ttf b/app/assets/fonts/foundation-icons.ttf
deleted file mode 100644
index 6cce217dd..000000000
Binary files a/app/assets/fonts/foundation-icons.ttf and /dev/null differ
diff --git a/app/assets/fonts/foundation-icons.woff b/app/assets/fonts/foundation-icons.woff
deleted file mode 100644
index e2cfe25dd..000000000
Binary files a/app/assets/fonts/foundation-icons.woff and /dev/null differ
diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot
new file mode 100644
index 000000000..9d0c2321a
Binary files /dev/null and b/app/assets/fonts/icons.eot differ
diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg
new file mode 100644
index 000000000..9a8da8380
--- /dev/null
+++ b/app/assets/fonts/icons.svg
@@ -0,0 +1,22 @@
+
+
+
+Generated by Fontastic.me
+
+
+
diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf
new file mode 100644
index 000000000..787788696
Binary files /dev/null and b/app/assets/fonts/icons.ttf differ
diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff
new file mode 100644
index 000000000..a6676b0db
Binary files /dev/null and b/app/assets/fonts/icons.woff differ
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 2f0f5f47b..6ae9b1ecc 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1,4 +1,4 @@
@import "foundation_and_overrides";
-@import "foundation_icons";
@import "fonts";
+@import "icons";
@import "debates";
\ No newline at end of file
diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss
index 6e251d6dd..9e991d89b 100644
--- a/app/assets/stylesheets/debates.scss
+++ b/app/assets/stylesheets/debates.scss
@@ -1,6 +1,8 @@
// Table of Contents
//
// 01. Variables
+// 01.1. Fonts
+// 01.2. Colors
// 02. Global styles
// 03. Header
// 04. Footer
@@ -17,174 +19,170 @@
// 01. Variables
// - - - - - - - - - - - - - - - - - - - - - - - - -
+// 01.1. Fonts
+// - - - - - - - - - - - -
+
$font-family-sans-serif: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif;
$line-height: rem-calc(24);
+// 01.2. Colors
+// - - - - - - - - - - - -
+
$background: #E9E9E9;
$border: #DEE0E3;
-$brand: #0077B9;
+$brand: #0077B9;
$debates: #008CCF;
-$comments-bg: #FAF9F8;
+$comments-bg: #F1F1F1;//FAF9F8;
$comments-info: #A5B2B9;
$comments-text: #3F4549;
-$header-color: #292B33;
+$header-color: #292B33;
$link: #0077B9;
$tags-bg: #FAFAFA;
$tags-border: #F0F0F0;
$tags-color: #8F8F8F;
-$text-color: #919399;
+$text-color: #222222;
$text-medium: #999999;
-$text-light: #a3a6ad;
+$text-light: #A3A6AD;
-$votes-background: #EDEDED;
-$votes-border: #DEE0E3;
-$votes-dislike: #EF8585;
-$votes-dislike-b: #D26463;//FF7978;
+$votes: #A0AEC4;
+$votes-background: #F0F0F0;
+$votes-border: #D8D8D8;
+$votes-unlike: #EF8585;
$votes-like: #7BD2A8;
-$votes-like-b: #56A47D;
+$votes-text: #54627C;
// 02. Global styles
// - - - - - - - - - - - - - - - - - - - - - - - - -
*, html {
- margin: 0;
- padding: 0;
+ margin: 0;
+ padding: 0;
}
body {
- background: white;
- font-family: $font-family-sans-serif;
- font-size: rem-calc(13);
- font-weight: normal;
-
- p {
- font-weight: normal;
- }
+ background: white;
+ font-family: $font-family-sans-serif;
+ font-size: rem-calc(13);
+ font-weight: normal;
+ text-rendering: optimizeLegibility;
}
.row {
- max-width: 1170px;
+ max-width: 1170px;
}
.row-full {
- max-width: 100% !important;
+ max-width: 100% !important;
}
.clear {
- clear: both;
+ clear: both;
}
.inline-block {
- display: inline-block;
+ display: inline-block;
}
-::selection {
- background: $brand;
- color: white;
-}
-
-::-moz-selection {
- background: $brand;
- color: white;
+::selection, ::-moz-selection {
+ background: $brand;
+ color: white;
}
// 03. Header
// - - - - - - - - - - - - - - - - - - - - - - - - -
header {
- background: url('home_header_bg.jpg');
- background-position: 50% 50%;
- background-size: cover;
- min-height: $line-height*20;
+ background: url('home_header_bg.jpg');
+ background-position: 50% 50%;
+ background-size: cover;
+ min-height: $line-height*20;
- &.results {
- min-height: $line-height*8;
- }
+ &.results {
+ min-height: $line-height*8;
+ }
- h1 {
- color: white;
- font-size: rem-calc(45);
- font-weight: bolder;
- line-height: $line-height*3;
- margin: $line-height 0 0 0;
- padding: 0;
- }
+ h1 {
+ color: white;
+ font-size: rem-calc(45);
+ font-weight: bolder;
+ line-height: $line-height*3;
+ margin: $line-height 0 0 0;
+ padding: 0;
+ }
- h2 {
- @extend h1;
- font-size: rem-calc(24);
- font-weight: normal;
- line-height: $line-height*2;
- margin: 0;
- }
+ h2 {
+ @extend h1;
+ font-size: rem-calc(24);
+ font-weight: normal;
+ line-height: $line-height*2;
+ margin: 0;
+ }
- .button {
- background: none;
- border: 2px solid white;
- color: white;
- margin-top: $line-height*2;
- }
+ .button {
+ color: white;
+ margin-top: $line-height*2;
+ }
}
.contain-to-grid {
- background: none;
+ background: none;
}
.top-bar {
- background: white;
- color: $header-color;
- height: $line-height*4;
- max-width: 1170px !important;
+ background: white;
+ color: $header-color;
+ height: $line-height*4;
+ max-width: 1170px !important;
- .name a {
- color: black;
- font-family: 'Lato';
- font-size: rem-calc(36);
- font-weight: lighter;
- line-height: $line-height*4;
- padding-left: 0;
+ .name a {
+ color: black;
+ font-family: 'Lato';
+ font-size: rem-calc(36);
+ font-weight: lighter;
+ line-height: $line-height*4;
+ padding-left: 0;
- span {
- color: $brand;
- font-size: rem-calc(24);
- font-weight: normal;
- }
-
- img {
- margin-right: $line-height/2;
- }
+ span {
+ color: $brand;
+ font-size: rem-calc(24);
+ font-weight: normal;
}
+
+ img {
+ margin-right: $line-height/2;
+ }
+ }
}
.top-bar-section {
- li:not(.has-form) a:not(.button) {
- background: white;
- color: $brand;
- line-height: $line-height*4;
- }
+ li:not(.has-form) a:not(.button) {
+ background: white;
+ color: $brand;
+ line-height: $line-height*4;
+ }
- li.active:not(.has-form) a:not(.button) {
- height: $line-height*4;
- line-height: $line-height*4;
- }
+ li.active:not(.has-form) a:not(.button) {
+ height: $line-height*4;
+ line-height: $line-height*4;
+ }
}
.top-links {
- color: white;
- font-size: rem-calc(14);
- height: $line-height*2;
- padding: $line-height/2 0;
+ color: white;
+ font-size: rem-calc(14);
+ height: $line-height*2;
+ padding: $line-height/2 0;
- a {
- color: white;
- }
+ a {
+ color: white;
+ }
}
// 04. Footer
@@ -197,315 +195,448 @@ header {
// 05. Debates
// - - - - - - - - - - - - - - - - - - - - - - - - -
+aside {
+ .button {
+ margin-top: $line-height;
+ }
+}
+
// 05.1. Debates Index
// - - - - - - - - - - - -
-.debates-index {
- margin-top: $line-height;
+.debates-list {
+ margin-top: $line-height;
}
-.debate {
+.debates-featured {
+
+ .debate {
.panel {
- background: white;
- box-shadow: 0 2px 0 rgba(0,0,0,.1);
+ background: white;
+ box-shadow: 0 2px 0 rgba(0,0,0,.1);
+ padding: rem-calc(20) rem-calc(20) 0 rem-calc(20);
- .fi-comment-quotes {
- color: $debates;
- font-size: rem-calc(36);
- line-height: $line-height;
- margin-bottom: $line-height*0.77;
+ .debate-content {
+ min-height: $line-height*11;
+ }
+
+ .label {
+ background: none;
+ clear: both;
+ color: $debates;
+ display: block;
+ font-weight: bold;
+ text-transform: uppercase;
+ padding: 0;
+ }
+
+ .icon-quote-right {
+ color: $debates;
+ font-size: rem-calc(30);
+ line-height: $line-height;
+ position: absolute;
+ right: $line-height;
+ top: $line-height/2;
+ }
+
+ .icon-chat-bubble-two {
+ vertical-align: middle;
+ }
+
+ h3 {
+ margin: rem-calc(12) 0 0 0;
+ font-weight: bold;
+
+ a {
+ clear: both;
+ color: $header-color;
+ display: block;
+ font-size: rem-calc(16);
+ line-height: $line-height;
}
+ }
- .fi-price-tag {
- color: $text-color;
- font-size: rem-calc(18);
- line-height: $line-height;
+ .debate-info {
+ color: $text-light;
+ font-weight: lighter;
+ margin-bottom: 0;
+
+ .icon-chat-bubble-two {
+ font-size: rem-calc(16);
}
+ }
- .label {
- margin-top: $line-height/4;
- }
-
- h3 {
- margin: 0;
- font-weight: bold;
-
- a {
- clear: both;
- color: $header-color;
- display: block;
- font-size: rem-calc(16);
- line-height: $line-height;
- }
- }
-
- p {
- color: $text-color;
- font-size: rem-calc(13);
- line-height: $line-height;
- margin-bottom: $line-height;
- }
+ p {
+ color: $text-color;
+ font-size: rem-calc(13);
+ line-height: $line-height;
+ margin-bottom: $line-height/2;
+ }
}
.votes {
+ border-top: 1px solid $votes-border;
+ padding: $line-height/2 0;
+
+ .icon-like {
background: $votes-background;
- margin: -5px -20px -20px -20px;
- padding: 1.25rem 1.25rem 0 1.25rem;
+ border: 1px solid $votes-border;
+ border-radius: rem-calc(3);
+ color: $votes;
+ display: inline-block;
+ font-size: rem-calc(30);
+ line-height: rem-calc(30);
+ padding: rem-calc(6) rem-calc(12);
+ //when active => color: $votes-like;
- .fi-like {
- color: $votes-like;
- font-size: rem-calc(48);
- line-height: $line-height*2;
+ &:hover {
+ background: white;
+ color: $brand;
}
+ }
- .fi-dislike {
- color: $votes-dislike;
- display: inline-block;
- font-size: rem-calc(48);
- line-height: $line-height*2;
- padding-top: $line-height/3;
+ .icon-unlike {
+ background: $votes-background;
+ border: 1px solid $votes-border;
+ border-radius: rem-calc(3);
+ color: $votes;
+ display: inline-block;
+ font-size: rem-calc(30);
+ line-height: rem-calc(30);
+ padding: rem-calc(6) rem-calc(12);
+ //when active => color: $votes-unlike;
+
+ &:hover {
+ background: white;
+ color: $brand;
}
+ }
- .in-favor {
- color: $votes-like;
- line-height: rem-calc(48);
- vertical-align: top;
+ .like {
+ line-height: rem-calc(48);
+ vertical-align: super;
- span {
- display: inline-block;
- line-height: 48px;
- padding-top: 5px;
- vertical-align: top;
- }
+ span {
+ color: $votes-text;
+ display: inline-block;
+ font-size: rem-calc(18);
+ font-weight: bold;
+ line-height: $line-height*2;
+ padding-left: rem-calc(6);
+ vertical-align: top;
}
+ }
- .against {
- @extend .in-favor;
- color: $votes-dislike;
- display: inline-block;
- }
+ .unlike {
+ @extend .like;
+ }
- .total-votes {
- font-size: rem-calc(12);
- line-height: $line-height*2;
- }
+ .total-votes {
+ color: $votes-text;
+ line-height: $line-height*2;
+ }
- .divider {
- background: rgba(0,0,0, .1);
- display: inline-block;
- height: 3rem;
- margin: 0 .5rem;
- width: 1px;
- }
+ .divider {
+ margin: 0 rem-calc(3);
+ }
}
+ }
+}
+
+.debates-index {
+ @extend .debates-featured;
+
+ .debate {
+ margin-bottom: rem-calc(6);
+
+ .panel {
+ border: 0;
+ box-shadow: none;
+ margin-bottom: 0;
+ padding: 0 rem-calc(6);
+
+ p {
+ text-align: justify;
+ }
+
+ .debate-content {
+ min-height: 0;
+ }
+
+ .icon-quote-right {
+ font-size: rem-calc(14);
+ position: initial;
+ vertical-align: bottom;
+ }
+
+ .label {
+ line-height: $line-height;
+ margin-right: rem-calc(5);
+ }
+ }
+
+ .votes {
+ border: 0;
+ margin-top: $line-height;
+
+ .like {
+
+ span {
+ color: $votes-text;
+ display: block;
+ font-size: rem-calc(18);
+ font-weight: bold;
+ line-height: $line-height*1.5;
+ }
+ }
+ }
+ }
}
// 05.2. Debates Show
// - - - - - - - - - - - -
.debate-show {
- color: $text-medium;
- margin-top: $line-height;
- margin-bottom: $line-height*2;
- padding: 0 $line-height/2;
+ margin-top: $line-height;
+ padding: 0 rem-calc(12);
- .back {
- color: $text-light;
- font-size: rem-calc(13);
- line-height: $line-height;
+ .back {
+ color: $text-light;
+ font-size: rem-calc(13);
+ line-height: $line-height;
+ }
+
+ .icon-angle-left {
+ @extend .back;
+ }
+
+ h1 {
+ clear: both;
+ font-size: rem-calc(24);
+ font-weight: bold;
+ line-height: $line-height*2;
+ margin: 0;
+ }
+
+ .debate-info {
+ clear: both;
+ color: $text-light;
+ font-weight: lighter;
+ line-height: $line-height*2;
+ text-align: justify;
+
+ .bullet {
+ color: $border;
}
- h1 {
- clear: both;
- font-size: rem-calc(24);
+ p {
+ font-size: rem-calc(14);
+ line-height: $line-height;
+ margin-bottom: 0;
+ }
+ }
+
+ .author-photo {
+ border-radius: 2px;
+ display: inline-block;
+ height: 32px;
+ line-height: $line-height*2;
+ margin-right: $line-height/4;
+ vertical-align: middle;
+ width: 32px;
+ }
+
+ .author {
+ color: $text-color;
+ font-weight: bold;
+ }
+
+ .votes {
+ padding-top: 0;
+
+ @media (min-width: 480px) {
+ padding-top: $line-height*1.5;
+ }
+
+ h3 {
+ border-bottom: 1px solid $border;
+ font-size: rem-calc(18);
+ margin: 0 0 $line-height 0;
+ text-transform: uppercase;
+ }
+
+ .icon-like {
+ background: $votes-background;
+ border: 1px solid $votes-border;
+ border-radius: rem-calc(3);
+ color: $votes;
+ display: inline-block;
+ font-size: rem-calc(30);
+ line-height: rem-calc(30);
+ padding: rem-calc(6) rem-calc(12);
+ //when active => color: $votes-like;
+
+ &:hover {
+ background: white;
+ color: $brand;
+ }
+ }
+
+ .icon-unlike {
+ background: $votes-background;
+ border: 1px solid $votes-border;
+ border-radius: rem-calc(3);
+ color: $votes;
+ display: inline-block;
+ font-size: rem-calc(30);
+ line-height: rem-calc(30);
+ padding: rem-calc(6) rem-calc(12);
+ //when active => color: $votes-unlike;
+
+ &:hover {
+ background: white;
+ color: $brand;
+ }
+ }
+
+ .like {
+
+ span {
+ color: $votes-text;
+ display: block;
+ font-size: rem-calc(18);
font-weight: bold;
- line-height: $line-height*1.3333;
- margin: 0;
- padding-top: $line-height/2;
+ line-height: $line-height*1.5;
+ }
}
- .debate-info {
- color: $text-light;
- font-weight: lighter;
- line-height: $line-height*2;
- margin-bottom: $line-height*0.5;
- text-align: justify;
-
- span {
- color: $border;
- }
-
- p {
- font-size: rem-calc(14);
- line-height: $line-height;
- margin-bottom: 0;
- }
+ .unlike {
+ @extend .like;
}
- .author-photo {
- border-radius: 2px;
- display: inline-block;
- height: 32px;
- line-height: $line-height*2;
- margin-right: $line-height/4;
- vertical-align: middle;
- width: 32px;
+ .total-votes {
+ color: $votes-text;
+ font-size: rem-calc(14);
+ line-height: $line-height;
}
- .votes {
- border: 1px solid $votes-border;
- box-shadow: 0 2px 0 rgba(0,0,0,.1);
- border-radius: 3px;
- padding: $line-height/2;
-
- .fi-like {
- background: $votes-like;
- border: 1px solid $votes-like-b;
- border-radius: $line-height*2.5;
- color: white;
- display: block;
- font-size: rem-calc(48);
- height: $line-height*2.5;
- line-height: $line-height*2.5;
- width: $line-height*2.5;
- }
-
- .fi-dislike {
- background: $votes-dislike;
- border: 1px solid $votes-dislike-b;
- border-radius: $line-height*2.5;
- color: white;
- display: block;
- font-size: rem-calc(48);
- height: $line-height*2.5;
- line-height: $line-height*2.5;
- width: $line-height*2.5;
- }
-
- .in-favor {
- color: $votes-like;
- line-height: rem-calc(48);
-
- span {
- display: inline-block;
- font-size: rem-calc(18);
- font-weight: bold;
- line-height: $line-height;
- padding-top: $line-height/4;
- vertical-align: top;
- }
- }
-
- .against {
- @extend .in-favor;
- color: $votes-dislike;
- }
-
- .total-votes {
- font-size: rem-calc(14);
- margin: 0;
- }
-
- .divider {
- background: rgba(0,0,0,.05);
- display: inline-block;
- height: $line-height*4;
- margin: 0 $line-height;
- width: 1px;
- }
+ .divider {
+ margin: 0 rem-calc(12);
}
+ }
- .publish-comment {
- margin-top: $line-height;
- }
+ .leave-comment {
+ display: inline-block;
+ margin-top: $line-height;
+ }
}
// 06. Comments
// - - - - - - - - - - - - - - - - - - - - - - - - -
.comments {
- background: $comments-bg;
- background-image: url('comments_divider.png');
- background-repeat: repeat-x;
- padding-top: $line-height;
- padding-bottom: $line-height*4;
+ background: $comments-bg;
+ background-image: url('comments_divider.png');
+ background-repeat: repeat-x;
+ padding-top: $line-height;
+ padding-bottom: $line-height*4;
- h2 {
- margin: 0;
- font-weight: bold;
+ h2 {
+ margin: 0;
+ font-weight: bold;
+ }
+
+ .comment {
+ margin: $line-height/4 0;
+
+ p {
+ color: $comments-text;
+ font-size: rem-calc(15);
+ margin-bottom: 0;
}
- .comment {
- margin: $line-height/4 0;
-
- p {
- color: $comments-text;
- font-size: rem-calc(15);
- margin-bottom: 0;
- }
-
- a {
- color: $comments-info;
- }
-
- .user-photo {
- border-radius: 2px;
- display: inline-block;
- height: 32px;
- line-height: $line-height*2;
- margin-right: $line-height/4;
- vertical-align: top;
- width: 32px;
- }
-
- .comment-body {
- margin-left: $line-height*1.6;
-
- .reply {
- font-size: rem-calc(12);
- font-weight: lighter;
- }
- }
-
- .comment-children {
- border-left: 1px dotted $border;
- margin-left: $line-height*1.6;
- padding-left: $line-height/4;
-
- @media only screen and (max-width: 40em) {
- margin-left: $line-height/1.5;
- }
- }
-
- .comment-info {
- color: $comments-info;
- font-size: rem-calc(13);
- font-weight: lighter;
- vertical-align: middle;
- }
+ a {
+ color: $comments-info;
}
+
+ .user-photo {
+ border-radius: 2px;
+ display: inline-block;
+ height: 32px;
+ line-height: $line-height*2;
+ margin-right: $line-height/4;
+ vertical-align: top;
+ width: 32px;
+ }
+
+ .comment-body {
+ margin-left: $line-height*1.6;
+
+ .reply {
+ font-size: rem-calc(12);
+ font-weight: lighter;
+ }
+ }
+
+ .comment-children {
+ border-left: 1px dotted $border;
+ margin-left: $line-height*1.6;
+ padding-left: $line-height/4;
+
+ @media only screen and (max-width: 40em) {
+ margin-left: $line-height/1.5;
+ }
+ }
+
+ .comment-info {
+ color: $comments-info;
+ font-size: rem-calc(13);
+ font-weight: lighter;
+ vertical-align: middle;
+ }
+ }
}
// 07. Tags
// - - - - - - - - - - - - - - - - - - - - - - - - -
-.tags a {
+.tags {
+
+ a {
background: $tags-bg;
border: 1px solid $tags-border;
border-radius: 3px;
color: $tags-color;
+ display: inline-block;
font-size: rem-calc(13);
- margin-bottom: 8px;
- margin-right: $line-height/3;
- padding: $line-height/4 $line-height/3;
+ margin-bottom: rem-calc(8);
+ margin-right: rem-calc(8);
+ padding: 0 rem-calc(6);
+
&:hover {
- color: $link;
- cursor: pointer;
- background: #e5f1f8;
- border: 1px solid $brand;
+ color: $link;
+ cursor: pointer;
+ background: #e5f1f8;
+ border: 1px solid $brand;
}
+ }
+}
+
+.tag-cloud {
+ @extend .tags;
+
+ h3 {
+ font-size: rem-calc(24);
+ font-weight: bold;
+ line-height: $line-height*2;
+ margin: 0;
+ }
+
+ a {
+ padding: $line-height/4 $line-height/3;
+ }
}
// 08. Login and Sign Up
@@ -515,57 +646,22 @@ header {
// - - - - - - - - - - - -
.auth {
- background: $background;
- box-shadow: 0px -4px 5px $background;
- min-height: $line-height*20;
+ background: $background;
+ box-shadow: 0px -4px 5px $background;
+ min-height: $line-height*20;
- .panel {
- background: white;
- margin-top: $line-height*2;
+ .panel {
+ background: white;
+ margin-top: $line-height*2;
- h1 {
- font-size: rem-calc(30);
- font-weight: bolder;
- }
+ h1 {
+ font-size: rem-calc(30);
+ font-weight: bolder;
}
+ }
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/assets/stylesheets/foundation_icons.scss b/app/assets/stylesheets/foundation_icons.scss
deleted file mode 100644
index 2b6855c55..000000000
--- a/app/assets/stylesheets/foundation_icons.scss
+++ /dev/null
@@ -1,594 +0,0 @@
-/*
- * Foundation Icons v 3.0
- * Made by ZURB 2013 http://zurb.com/playground/foundation-icon-fonts-3
- * MIT License
- */
-
-@font-face {
- font-family: 'foundation-icons';
- src: font-url('foundation-icons.eot');
- src: font-url('foundation-icons.eot?#iefix') format('embedded-opentype'),
- font-url('foundation-icons.woff') format('woff'),
- font-url('foundation-icons.ttf') format('truetype'),
- font-url('foundation-icons.svg#fontcustom') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-
-.fi-address-book:before,
-.fi-alert:before,
-.fi-align-center:before,
-.fi-align-justify:before,
-.fi-align-left:before,
-.fi-align-right:before,
-.fi-anchor:before,
-.fi-annotate:before,
-.fi-archive:before,
-.fi-arrow-down:before,
-.fi-arrow-left:before,
-.fi-arrow-right:before,
-.fi-arrow-up:before,
-.fi-arrows-compress:before,
-.fi-arrows-expand:before,
-.fi-arrows-in:before,
-.fi-arrows-out:before,
-.fi-asl:before,
-.fi-asterisk:before,
-.fi-at-sign:before,
-.fi-background-color:before,
-.fi-battery-empty:before,
-.fi-battery-full:before,
-.fi-battery-half:before,
-.fi-bitcoin-circle:before,
-.fi-bitcoin:before,
-.fi-blind:before,
-.fi-bluetooth:before,
-.fi-bold:before,
-.fi-book-bookmark:before,
-.fi-book:before,
-.fi-bookmark:before,
-.fi-braille:before,
-.fi-burst-new:before,
-.fi-burst-sale:before,
-.fi-burst:before,
-.fi-calendar:before,
-.fi-camera:before,
-.fi-check:before,
-.fi-checkbox:before,
-.fi-clipboard-notes:before,
-.fi-clipboard-pencil:before,
-.fi-clipboard:before,
-.fi-clock:before,
-.fi-closed-caption:before,
-.fi-cloud:before,
-.fi-comment-minus:before,
-.fi-comment-quotes:before,
-.fi-comment-video:before,
-.fi-comment:before,
-.fi-comments:before,
-.fi-compass:before,
-.fi-contrast:before,
-.fi-credit-card:before,
-.fi-crop:before,
-.fi-crown:before,
-.fi-css3:before,
-.fi-database:before,
-.fi-die-five:before,
-.fi-die-four:before,
-.fi-die-one:before,
-.fi-die-six:before,
-.fi-die-three:before,
-.fi-die-two:before,
-.fi-dislike:before,
-.fi-dollar-bill:before,
-.fi-dollar:before,
-.fi-download:before,
-.fi-eject:before,
-.fi-elevator:before,
-.fi-euro:before,
-.fi-eye:before,
-.fi-fast-forward:before,
-.fi-female-symbol:before,
-.fi-female:before,
-.fi-filter:before,
-.fi-first-aid:before,
-.fi-flag:before,
-.fi-folder-add:before,
-.fi-folder-lock:before,
-.fi-folder:before,
-.fi-foot:before,
-.fi-foundation:before,
-.fi-graph-bar:before,
-.fi-graph-horizontal:before,
-.fi-graph-pie:before,
-.fi-graph-trend:before,
-.fi-guide-dog:before,
-.fi-hearing-aid:before,
-.fi-heart:before,
-.fi-home:before,
-.fi-html5:before,
-.fi-indent-less:before,
-.fi-indent-more:before,
-.fi-info:before,
-.fi-italic:before,
-.fi-key:before,
-.fi-laptop:before,
-.fi-layout:before,
-.fi-lightbulb:before,
-.fi-like:before,
-.fi-link:before,
-.fi-list-bullet:before,
-.fi-list-number:before,
-.fi-list-thumbnails:before,
-.fi-list:before,
-.fi-lock:before,
-.fi-loop:before,
-.fi-magnifying-glass:before,
-.fi-mail:before,
-.fi-male-female:before,
-.fi-male-symbol:before,
-.fi-male:before,
-.fi-map:before,
-.fi-marker:before,
-.fi-megaphone:before,
-.fi-microphone:before,
-.fi-minus-circle:before,
-.fi-minus:before,
-.fi-mobile-signal:before,
-.fi-mobile:before,
-.fi-monitor:before,
-.fi-mountains:before,
-.fi-music:before,
-.fi-next:before,
-.fi-no-dogs:before,
-.fi-no-smoking:before,
-.fi-page-add:before,
-.fi-page-copy:before,
-.fi-page-csv:before,
-.fi-page-delete:before,
-.fi-page-doc:before,
-.fi-page-edit:before,
-.fi-page-export-csv:before,
-.fi-page-export-doc:before,
-.fi-page-export-pdf:before,
-.fi-page-export:before,
-.fi-page-filled:before,
-.fi-page-multiple:before,
-.fi-page-pdf:before,
-.fi-page-remove:before,
-.fi-page-search:before,
-.fi-page:before,
-.fi-paint-bucket:before,
-.fi-paperclip:before,
-.fi-pause:before,
-.fi-paw:before,
-.fi-paypal:before,
-.fi-pencil:before,
-.fi-photo:before,
-.fi-play-circle:before,
-.fi-play-video:before,
-.fi-play:before,
-.fi-plus:before,
-.fi-pound:before,
-.fi-power:before,
-.fi-previous:before,
-.fi-price-tag:before,
-.fi-pricetag-multiple:before,
-.fi-print:before,
-.fi-prohibited:before,
-.fi-projection-screen:before,
-.fi-puzzle:before,
-.fi-quote:before,
-.fi-record:before,
-.fi-refresh:before,
-.fi-results-demographics:before,
-.fi-results:before,
-.fi-rewind-ten:before,
-.fi-rewind:before,
-.fi-rss:before,
-.fi-safety-cone:before,
-.fi-save:before,
-.fi-share:before,
-.fi-sheriff-badge:before,
-.fi-shield:before,
-.fi-shopping-bag:before,
-.fi-shopping-cart:before,
-.fi-shuffle:before,
-.fi-skull:before,
-.fi-social-500px:before,
-.fi-social-adobe:before,
-.fi-social-amazon:before,
-.fi-social-android:before,
-.fi-social-apple:before,
-.fi-social-behance:before,
-.fi-social-bing:before,
-.fi-social-blogger:before,
-.fi-social-delicious:before,
-.fi-social-designer-news:before,
-.fi-social-deviant-art:before,
-.fi-social-digg:before,
-.fi-social-dribbble:before,
-.fi-social-drive:before,
-.fi-social-dropbox:before,
-.fi-social-evernote:before,
-.fi-social-facebook:before,
-.fi-social-flickr:before,
-.fi-social-forrst:before,
-.fi-social-foursquare:before,
-.fi-social-game-center:before,
-.fi-social-github:before,
-.fi-social-google-plus:before,
-.fi-social-hacker-news:before,
-.fi-social-hi5:before,
-.fi-social-instagram:before,
-.fi-social-joomla:before,
-.fi-social-lastfm:before,
-.fi-social-linkedin:before,
-.fi-social-medium:before,
-.fi-social-myspace:before,
-.fi-social-orkut:before,
-.fi-social-path:before,
-.fi-social-picasa:before,
-.fi-social-pinterest:before,
-.fi-social-rdio:before,
-.fi-social-reddit:before,
-.fi-social-skillshare:before,
-.fi-social-skype:before,
-.fi-social-smashing-mag:before,
-.fi-social-snapchat:before,
-.fi-social-spotify:before,
-.fi-social-squidoo:before,
-.fi-social-stack-overflow:before,
-.fi-social-steam:before,
-.fi-social-stumbleupon:before,
-.fi-social-treehouse:before,
-.fi-social-tumblr:before,
-.fi-social-twitter:before,
-.fi-social-vimeo:before,
-.fi-social-windows:before,
-.fi-social-xbox:before,
-.fi-social-yahoo:before,
-.fi-social-yelp:before,
-.fi-social-youtube:before,
-.fi-social-zerply:before,
-.fi-social-zurb:before,
-.fi-sound:before,
-.fi-star:before,
-.fi-stop:before,
-.fi-strikethrough:before,
-.fi-subscript:before,
-.fi-superscript:before,
-.fi-tablet-landscape:before,
-.fi-tablet-portrait:before,
-.fi-target-two:before,
-.fi-target:before,
-.fi-telephone-accessible:before,
-.fi-telephone:before,
-.fi-text-color:before,
-.fi-thumbnails:before,
-.fi-ticket:before,
-.fi-torso-business:before,
-.fi-torso-female:before,
-.fi-torso:before,
-.fi-torsos-all-female:before,
-.fi-torsos-all:before,
-.fi-torsos-female-male:before,
-.fi-torsos-male-female:before,
-.fi-torsos:before,
-.fi-trash:before,
-.fi-trees:before,
-.fi-trophy:before,
-.fi-underline:before,
-.fi-universal-access:before,
-.fi-unlink:before,
-.fi-unlock:before,
-.fi-upload-cloud:before,
-.fi-upload:before,
-.fi-usb:before,
-.fi-video:before,
-.fi-volume-none:before,
-.fi-volume-strike:before,
-.fi-volume:before,
-.fi-web:before,
-.fi-wheelchair:before,
-.fi-widget:before,
-.fi-wrench:before,
-.fi-x-circle:before,
-.fi-x:before,
-.fi-yen:before,
-.fi-zoom-in:before,
-.fi-zoom-out:before {
- font-family: "foundation-icons";
- font-style: normal;
- font-weight: normal;
- font-variant: normal;
- text-transform: none;
- line-height: 1;
- -webkit-font-smoothing: antialiased;
- display: inline-block;
- text-decoration: inherit;
-}
-
-.fi-address-book:before { content: "\f100"; }
-.fi-alert:before { content: "\f101"; }
-.fi-align-center:before { content: "\f102"; }
-.fi-align-justify:before { content: "\f103"; }
-.fi-align-left:before { content: "\f104"; }
-.fi-align-right:before { content: "\f105"; }
-.fi-anchor:before { content: "\f106"; }
-.fi-annotate:before { content: "\f107"; }
-.fi-archive:before { content: "\f108"; }
-.fi-arrow-down:before { content: "\f109"; }
-.fi-arrow-left:before { content: "\f10a"; }
-.fi-arrow-right:before { content: "\f10b"; }
-.fi-arrow-up:before { content: "\f10c"; }
-.fi-arrows-compress:before { content: "\f10d"; }
-.fi-arrows-expand:before { content: "\f10e"; }
-.fi-arrows-in:before { content: "\f10f"; }
-.fi-arrows-out:before { content: "\f110"; }
-.fi-asl:before { content: "\f111"; }
-.fi-asterisk:before { content: "\f112"; }
-.fi-at-sign:before { content: "\f113"; }
-.fi-background-color:before { content: "\f114"; }
-.fi-battery-empty:before { content: "\f115"; }
-.fi-battery-full:before { content: "\f116"; }
-.fi-battery-half:before { content: "\f117"; }
-.fi-bitcoin-circle:before { content: "\f118"; }
-.fi-bitcoin:before { content: "\f119"; }
-.fi-blind:before { content: "\f11a"; }
-.fi-bluetooth:before { content: "\f11b"; }
-.fi-bold:before { content: "\f11c"; }
-.fi-book-bookmark:before { content: "\f11d"; }
-.fi-book:before { content: "\f11e"; }
-.fi-bookmark:before { content: "\f11f"; }
-.fi-braille:before { content: "\f120"; }
-.fi-burst-new:before { content: "\f121"; }
-.fi-burst-sale:before { content: "\f122"; }
-.fi-burst:before { content: "\f123"; }
-.fi-calendar:before { content: "\f124"; }
-.fi-camera:before { content: "\f125"; }
-.fi-check:before { content: "\f126"; }
-.fi-checkbox:before { content: "\f127"; }
-.fi-clipboard-notes:before { content: "\f128"; }
-.fi-clipboard-pencil:before { content: "\f129"; }
-.fi-clipboard:before { content: "\f12a"; }
-.fi-clock:before { content: "\f12b"; }
-.fi-closed-caption:before { content: "\f12c"; }
-.fi-cloud:before { content: "\f12d"; }
-.fi-comment-minus:before { content: "\f12e"; }
-.fi-comment-quotes:before { content: "\f12f"; }
-.fi-comment-video:before { content: "\f130"; }
-.fi-comment:before { content: "\f131"; }
-.fi-comments:before { content: "\f132"; }
-.fi-compass:before { content: "\f133"; }
-.fi-contrast:before { content: "\f134"; }
-.fi-credit-card:before { content: "\f135"; }
-.fi-crop:before { content: "\f136"; }
-.fi-crown:before { content: "\f137"; }
-.fi-css3:before { content: "\f138"; }
-.fi-database:before { content: "\f139"; }
-.fi-die-five:before { content: "\f13a"; }
-.fi-die-four:before { content: "\f13b"; }
-.fi-die-one:before { content: "\f13c"; }
-.fi-die-six:before { content: "\f13d"; }
-.fi-die-three:before { content: "\f13e"; }
-.fi-die-two:before { content: "\f13f"; }
-.fi-dislike:before { content: "\f140"; }
-.fi-dollar-bill:before { content: "\f141"; }
-.fi-dollar:before { content: "\f142"; }
-.fi-download:before { content: "\f143"; }
-.fi-eject:before { content: "\f144"; }
-.fi-elevator:before { content: "\f145"; }
-.fi-euro:before { content: "\f146"; }
-.fi-eye:before { content: "\f147"; }
-.fi-fast-forward:before { content: "\f148"; }
-.fi-female-symbol:before { content: "\f149"; }
-.fi-female:before { content: "\f14a"; }
-.fi-filter:before { content: "\f14b"; }
-.fi-first-aid:before { content: "\f14c"; }
-.fi-flag:before { content: "\f14d"; }
-.fi-folder-add:before { content: "\f14e"; }
-.fi-folder-lock:before { content: "\f14f"; }
-.fi-folder:before { content: "\f150"; }
-.fi-foot:before { content: "\f151"; }
-.fi-foundation:before { content: "\f152"; }
-.fi-graph-bar:before { content: "\f153"; }
-.fi-graph-horizontal:before { content: "\f154"; }
-.fi-graph-pie:before { content: "\f155"; }
-.fi-graph-trend:before { content: "\f156"; }
-.fi-guide-dog:before { content: "\f157"; }
-.fi-hearing-aid:before { content: "\f158"; }
-.fi-heart:before { content: "\f159"; }
-.fi-home:before { content: "\f15a"; }
-.fi-html5:before { content: "\f15b"; }
-.fi-indent-less:before { content: "\f15c"; }
-.fi-indent-more:before { content: "\f15d"; }
-.fi-info:before { content: "\f15e"; }
-.fi-italic:before { content: "\f15f"; }
-.fi-key:before { content: "\f160"; }
-.fi-laptop:before { content: "\f161"; }
-.fi-layout:before { content: "\f162"; }
-.fi-lightbulb:before { content: "\f163"; }
-.fi-like:before { content: "\f164"; }
-.fi-link:before { content: "\f165"; }
-.fi-list-bullet:before { content: "\f166"; }
-.fi-list-number:before { content: "\f167"; }
-.fi-list-thumbnails:before { content: "\f168"; }
-.fi-list:before { content: "\f169"; }
-.fi-lock:before { content: "\f16a"; }
-.fi-loop:before { content: "\f16b"; }
-.fi-magnifying-glass:before { content: "\f16c"; }
-.fi-mail:before { content: "\f16d"; }
-.fi-male-female:before { content: "\f16e"; }
-.fi-male-symbol:before { content: "\f16f"; }
-.fi-male:before { content: "\f170"; }
-.fi-map:before { content: "\f171"; }
-.fi-marker:before { content: "\f172"; }
-.fi-megaphone:before { content: "\f173"; }
-.fi-microphone:before { content: "\f174"; }
-.fi-minus-circle:before { content: "\f175"; }
-.fi-minus:before { content: "\f176"; }
-.fi-mobile-signal:before { content: "\f177"; }
-.fi-mobile:before { content: "\f178"; }
-.fi-monitor:before { content: "\f179"; }
-.fi-mountains:before { content: "\f17a"; }
-.fi-music:before { content: "\f17b"; }
-.fi-next:before { content: "\f17c"; }
-.fi-no-dogs:before { content: "\f17d"; }
-.fi-no-smoking:before { content: "\f17e"; }
-.fi-page-add:before { content: "\f17f"; }
-.fi-page-copy:before { content: "\f180"; }
-.fi-page-csv:before { content: "\f181"; }
-.fi-page-delete:before { content: "\f182"; }
-.fi-page-doc:before { content: "\f183"; }
-.fi-page-edit:before { content: "\f184"; }
-.fi-page-export-csv:before { content: "\f185"; }
-.fi-page-export-doc:before { content: "\f186"; }
-.fi-page-export-pdf:before { content: "\f187"; }
-.fi-page-export:before { content: "\f188"; }
-.fi-page-filled:before { content: "\f189"; }
-.fi-page-multiple:before { content: "\f18a"; }
-.fi-page-pdf:before { content: "\f18b"; }
-.fi-page-remove:before { content: "\f18c"; }
-.fi-page-search:before { content: "\f18d"; }
-.fi-page:before { content: "\f18e"; }
-.fi-paint-bucket:before { content: "\f18f"; }
-.fi-paperclip:before { content: "\f190"; }
-.fi-pause:before { content: "\f191"; }
-.fi-paw:before { content: "\f192"; }
-.fi-paypal:before { content: "\f193"; }
-.fi-pencil:before { content: "\f194"; }
-.fi-photo:before { content: "\f195"; }
-.fi-play-circle:before { content: "\f196"; }
-.fi-play-video:before { content: "\f197"; }
-.fi-play:before { content: "\f198"; }
-.fi-plus:before { content: "\f199"; }
-.fi-pound:before { content: "\f19a"; }
-.fi-power:before { content: "\f19b"; }
-.fi-previous:before { content: "\f19c"; }
-.fi-price-tag:before { content: "\f19d"; }
-.fi-pricetag-multiple:before { content: "\f19e"; }
-.fi-print:before { content: "\f19f"; }
-.fi-prohibited:before { content: "\f1a0"; }
-.fi-projection-screen:before { content: "\f1a1"; }
-.fi-puzzle:before { content: "\f1a2"; }
-.fi-quote:before { content: "\f1a3"; }
-.fi-record:before { content: "\f1a4"; }
-.fi-refresh:before { content: "\f1a5"; }
-.fi-results-demographics:before { content: "\f1a6"; }
-.fi-results:before { content: "\f1a7"; }
-.fi-rewind-ten:before { content: "\f1a8"; }
-.fi-rewind:before { content: "\f1a9"; }
-.fi-rss:before { content: "\f1aa"; }
-.fi-safety-cone:before { content: "\f1ab"; }
-.fi-save:before { content: "\f1ac"; }
-.fi-share:before { content: "\f1ad"; }
-.fi-sheriff-badge:before { content: "\f1ae"; }
-.fi-shield:before { content: "\f1af"; }
-.fi-shopping-bag:before { content: "\f1b0"; }
-.fi-shopping-cart:before { content: "\f1b1"; }
-.fi-shuffle:before { content: "\f1b2"; }
-.fi-skull:before { content: "\f1b3"; }
-.fi-social-500px:before { content: "\f1b4"; }
-.fi-social-adobe:before { content: "\f1b5"; }
-.fi-social-amazon:before { content: "\f1b6"; }
-.fi-social-android:before { content: "\f1b7"; }
-.fi-social-apple:before { content: "\f1b8"; }
-.fi-social-behance:before { content: "\f1b9"; }
-.fi-social-bing:before { content: "\f1ba"; }
-.fi-social-blogger:before { content: "\f1bb"; }
-.fi-social-delicious:before { content: "\f1bc"; }
-.fi-social-designer-news:before { content: "\f1bd"; }
-.fi-social-deviant-art:before { content: "\f1be"; }
-.fi-social-digg:before { content: "\f1bf"; }
-.fi-social-dribbble:before { content: "\f1c0"; }
-.fi-social-drive:before { content: "\f1c1"; }
-.fi-social-dropbox:before { content: "\f1c2"; }
-.fi-social-evernote:before { content: "\f1c3"; }
-.fi-social-facebook:before { content: "\f1c4"; }
-.fi-social-flickr:before { content: "\f1c5"; }
-.fi-social-forrst:before { content: "\f1c6"; }
-.fi-social-foursquare:before { content: "\f1c7"; }
-.fi-social-game-center:before { content: "\f1c8"; }
-.fi-social-github:before { content: "\f1c9"; }
-.fi-social-google-plus:before { content: "\f1ca"; }
-.fi-social-hacker-news:before { content: "\f1cb"; }
-.fi-social-hi5:before { content: "\f1cc"; }
-.fi-social-instagram:before { content: "\f1cd"; }
-.fi-social-joomla:before { content: "\f1ce"; }
-.fi-social-lastfm:before { content: "\f1cf"; }
-.fi-social-linkedin:before { content: "\f1d0"; }
-.fi-social-medium:before { content: "\f1d1"; }
-.fi-social-myspace:before { content: "\f1d2"; }
-.fi-social-orkut:before { content: "\f1d3"; }
-.fi-social-path:before { content: "\f1d4"; }
-.fi-social-picasa:before { content: "\f1d5"; }
-.fi-social-pinterest:before { content: "\f1d6"; }
-.fi-social-rdio:before { content: "\f1d7"; }
-.fi-social-reddit:before { content: "\f1d8"; }
-.fi-social-skillshare:before { content: "\f1d9"; }
-.fi-social-skype:before { content: "\f1da"; }
-.fi-social-smashing-mag:before { content: "\f1db"; }
-.fi-social-snapchat:before { content: "\f1dc"; }
-.fi-social-spotify:before { content: "\f1dd"; }
-.fi-social-squidoo:before { content: "\f1de"; }
-.fi-social-stack-overflow:before { content: "\f1df"; }
-.fi-social-steam:before { content: "\f1e0"; }
-.fi-social-stumbleupon:before { content: "\f1e1"; }
-.fi-social-treehouse:before { content: "\f1e2"; }
-.fi-social-tumblr:before { content: "\f1e3"; }
-.fi-social-twitter:before { content: "\f1e4"; }
-.fi-social-vimeo:before { content: "\f1e5"; }
-.fi-social-windows:before { content: "\f1e6"; }
-.fi-social-xbox:before { content: "\f1e7"; }
-.fi-social-yahoo:before { content: "\f1e8"; }
-.fi-social-yelp:before { content: "\f1e9"; }
-.fi-social-youtube:before { content: "\f1ea"; }
-.fi-social-zerply:before { content: "\f1eb"; }
-.fi-social-zurb:before { content: "\f1ec"; }
-.fi-sound:before { content: "\f1ed"; }
-.fi-star:before { content: "\f1ee"; }
-.fi-stop:before { content: "\f1ef"; }
-.fi-strikethrough:before { content: "\f1f0"; }
-.fi-subscript:before { content: "\f1f1"; }
-.fi-superscript:before { content: "\f1f2"; }
-.fi-tablet-landscape:before { content: "\f1f3"; }
-.fi-tablet-portrait:before { content: "\f1f4"; }
-.fi-target-two:before { content: "\f1f5"; }
-.fi-target:before { content: "\f1f6"; }
-.fi-telephone-accessible:before { content: "\f1f7"; }
-.fi-telephone:before { content: "\f1f8"; }
-.fi-text-color:before { content: "\f1f9"; }
-.fi-thumbnails:before { content: "\f1fa"; }
-.fi-ticket:before { content: "\f1fb"; }
-.fi-torso-business:before { content: "\f1fc"; }
-.fi-torso-female:before { content: "\f1fd"; }
-.fi-torso:before { content: "\f1fe"; }
-.fi-torsos-all-female:before { content: "\f1ff"; }
-.fi-torsos-all:before { content: "\f200"; }
-.fi-torsos-female-male:before { content: "\f201"; }
-.fi-torsos-male-female:before { content: "\f202"; }
-.fi-torsos:before { content: "\f203"; }
-.fi-trash:before { content: "\f204"; }
-.fi-trees:before { content: "\f205"; }
-.fi-trophy:before { content: "\f206"; }
-.fi-underline:before { content: "\f207"; }
-.fi-universal-access:before { content: "\f208"; }
-.fi-unlink:before { content: "\f209"; }
-.fi-unlock:before { content: "\f20a"; }
-.fi-upload-cloud:before { content: "\f20b"; }
-.fi-upload:before { content: "\f20c"; }
-.fi-usb:before { content: "\f20d"; }
-.fi-video:before { content: "\f20e"; }
-.fi-volume-none:before { content: "\f20f"; }
-.fi-volume-strike:before { content: "\f210"; }
-.fi-volume:before { content: "\f211"; }
-.fi-web:before { content: "\f212"; }
-.fi-wheelchair:before { content: "\f213"; }
-.fi-widget:before { content: "\f214"; }
-.fi-wrench:before { content: "\f215"; }
-.fi-x-circle:before { content: "\f216"; }
-.fi-x:before { content: "\f217"; }
-.fi-yen:before { content: "\f218"; }
-.fi-zoom-in:before { content: "\f219"; }
-.fi-zoom-out:before { content: "\f21a"; }
diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss
new file mode 100644
index 000000000..b7b4a820f
--- /dev/null
+++ b/app/assets/stylesheets/icons.scss
@@ -0,0 +1,75 @@
+@charset "UTF-8";
+
+@font-face {
+ font-family: 'icons';
+ src: font-url('icons.eot');
+ src: font-url('icons.eot?#iefix') format('embedded-opentype'),
+ font-url('icons.woff') format('woff'),
+ font-url('icons.ttf') format('truetype'),
+ font-url('icons.svg#icons') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
+[data-icon]:before {
+ font-family: "icons" !important;
+ content: attr(data-icon);
+ font-style: normal !important;
+ font-weight: normal !important;
+ font-variant: normal !important;
+ text-transform: none !important;
+ speak: none;
+ line-height: 1;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+[class^="icon-"]:before,
+[class*=" icon-"]:before {
+ font-family: "icons" !important;
+ font-style: normal !important;
+ font-weight: normal !important;
+ font-variant: normal !important;
+ text-transform: none !important;
+ speak: none;
+ line-height: 1;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-angle-down:before {
+ content: "a";
+}
+.icon-angle-left:before {
+ content: "b";
+}
+.icon-angle-right:before {
+ content: "c";
+}
+.icon-angle-up:before {
+ content: "d";
+}
+.icon-chat-bubble-two:before {
+ content: "e";
+}
+.icon-like:before {
+ content: "f";
+}
+.icon-unlike:before {
+ content: "g";
+}
+.icon-twitter:before {
+ content: "h";
+}
+.icon-quote-left:before {
+ content: "l";
+}
+.icon-quote-right:before {
+ content: "i";
+}
+.icon-calendar:before {
+ content: "j";
+}
+.icon-lightbulb:before {
+ content: "k";
+}
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6779d223a..ccf812e34 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -21,4 +21,9 @@ class ApplicationController < ActionController::Base
I18n.locale = session[:locale]
end
+
+ def verify_captcha?(resource)
+ return true unless recaptcha_keys?
+ verify_recaptcha(model: resource)
+ end
end
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 00fd20653..409bb7c9b 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,6 +1,6 @@
class CommentsController < ApplicationController
before_action :authenticate_user!
- before_action :set_debate, :set_parent
+ before_action :set_debate, :set_parent, only: :create
respond_to :html, :js
def create
@@ -10,6 +10,12 @@ class CommentsController < ApplicationController
respond_with @comment
end
+ def vote
+ @comment = Comment.find(params[:id])
+ @comment.vote_by(voter: current_user, vote: params[:value])
+ respond_with @comment
+ end
+
private
def comment_params
params.require(:comments).permit(:commentable_type, :commentable_id, :body)
diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index 672f41d20..8ccf33f6a 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -1,15 +1,16 @@
class DebatesController < ApplicationController
- include RecaptchaHelper
- before_action :set_debate, only: [:show, :edit, :update]
- before_action :authenticate_user!, except: [:show, :index]
+ include RecaptchaHelper
+ before_action :set_debate, only: [:show, :edit, :update, :vote]
+ before_action :authenticate_user!, except: [:index, :show]
before_action :validate_ownership, only: [:edit, :update]
def index
if params[:tag]
- @debates = Debate.tagged_with(params[:tag])
+ @debates = Debate.tagged_with(params[:tag]).order("created_at DESC")
else
- @debates = Debate.all
+ @debates = Debate.all.order("created_at DESC")
end
+ @featured_debates = @debates.to_a.shift(3)
end
def show
@@ -25,7 +26,7 @@ class DebatesController < ApplicationController
def create
@debate = Debate.new(debate_params)
@debate.author = current_user
- if verify_captcha? and @debate.save
+ if verify_captcha?(@debate) and @debate.save
redirect_to @debate, notice: t('flash.actions.create.notice', resource_name: 'Debate')
else
render :new
@@ -37,6 +38,10 @@ class DebatesController < ApplicationController
respond_with @debate
end
+ def vote
+ @debate.vote_by(voter: current_user, vote: params[:value])
+ end
+
private
def set_debate
@@ -50,10 +55,4 @@ class DebatesController < ApplicationController
def validate_ownership
raise ActiveRecord::RecordNotFound unless @debate.editable_by?(current_user)
end
-
- def verify_captcha?
- return true unless recaptcha_keys?
- verify_recaptcha(model: @debate)
- end
-
end
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 07b347cdc..c0113de42 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -1,15 +1,16 @@
class RegistrationsController < Devise::RegistrationsController
+ include RecaptchaHelper
def create
- if verify_recaptcha
+ if verify_captcha?(resource)
super
else
build_resource(sign_up_params)
flash.now[:alert] = t('recaptcha.errors.verification_failed')
render :new
- end
+ end
end
-
+
private
diff --git a/app/controllers/votes_controller.rb b/app/controllers/votes_controller.rb
deleted file mode 100644
index e93968f35..000000000
--- a/app/controllers/votes_controller.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-class VotesController < ApplicationController
- before_action :set_debate
- before_action :authenticate_user!
- respond_to :html, :js
-
- def create
- register_vote
- notice = @debate.vote_registered? ? I18n.t("votes.notice_thanks") : I18n.t("votes.notice_already_registered")
- respond_with @debate
- end
-
- private
-
- def set_debate
- @debate = Debate.find(params[:debate_id])
- end
-
- def register_vote
- @debate.vote_by voter: current_user, vote: params[:value]
- end
-end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 91d7447c0..e99ef15e3 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,6 @@
class Comment < ActiveRecord::Base
acts_as_nested_set scope: [:commentable_id, :commentable_type]
+ acts_as_votable
validates :body, presence: true
validates :user, presence: true
diff --git a/app/models/debate.rb b/app/models/debate.rb
index 0c98d9274..836e3bf34 100644
--- a/app/models/debate.rb
+++ b/app/models/debate.rb
@@ -13,6 +13,7 @@ class Debate < ActiveRecord::Base
validates :terms_of_service, acceptance: { allow_nil: false }, on: :create
before_validation :sanitize_description
+ before_validation :sanitize_tag_list
def likes
get_likes.size
@@ -34,10 +35,18 @@ class Debate < ActiveRecord::Base
editable? && author == user
end
+ def description
+ super.try :html_safe
+ end
+
protected
def sanitize_description
self.description = WYSIWYGSanitizer.new.sanitize(description)
end
+ def sanitize_tag_list
+ self.tag_list = TagSanitizer.new.sanitize_tag_list(self.tag_list)
+ end
+
end
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index 0d152d928..6e4e02f19 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -7,12 +7,19 @@
- <%= comment.body %>
- <%= render 'comments/form', parent: comment %>
-
+ <%= comment.body %>
-
+
+
+ <% if user_signed_in? %>
+ <%= render 'comments/form', {parent: comment, toggeable: true} %>
+ <% end %>
+
+
+
\ No newline at end of file
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index 01661221f..da2b3bb61 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -1,6 +1,6 @@
-<%= link_to comment_link_text(parent), "", class: "js-add-comment-link", data: {'id': dom_id(parent)} %>
+<%= link_to(comment_link_text(parent), "", class: "js-add-comment-link", data: {'id': dom_id(parent)}) if toggeable %>
-