diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot
index 72be3d3a4..166eca82e 100644
Binary files a/app/assets/fonts/icons.eot and b/app/assets/fonts/icons.eot differ
diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg
index 90fd49050..498eb27a7 100644
--- a/app/assets/fonts/icons.svg
+++ b/app/assets/fonts/icons.svg
@@ -20,4 +20,5 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/assets/fonts/lato-bolditalic.ttf b/app/assets/fonts/lato-bolditalic.ttf
deleted file mode 100755
index 63b573b43..000000000
Binary files a/app/assets/fonts/lato-bolditalic.ttf and /dev/null differ
diff --git a/app/assets/fonts/lato-bolditalic.woff b/app/assets/fonts/lato-bolditalic.woff
deleted file mode 100755
index 4f6eb79d5..000000000
Binary files a/app/assets/fonts/lato-bolditalic.woff and /dev/null differ
diff --git a/app/assets/fonts/lato-bolditalic.woff2 b/app/assets/fonts/lato-bolditalic.woff2
deleted file mode 100755
index b58f714a7..000000000
Binary files a/app/assets/fonts/lato-bolditalic.woff2 and /dev/null differ
diff --git a/app/assets/fonts/lato-italic.eot b/app/assets/fonts/lato-italic.eot
deleted file mode 100755
index 1e8e5ffa2..000000000
Binary files a/app/assets/fonts/lato-italic.eot and /dev/null differ
diff --git a/app/assets/fonts/lato-italic.svg b/app/assets/fonts/lato-italic.svg
deleted file mode 100755
index 86a227f50..000000000
--- a/app/assets/fonts/lato-italic.svg
+++ /dev/null
@@ -1,4072 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/assets/fonts/lato-italic.ttf b/app/assets/fonts/lato-italic.ttf
deleted file mode 100755
index f850f5da2..000000000
Binary files a/app/assets/fonts/lato-italic.ttf and /dev/null differ
diff --git a/app/assets/fonts/lato-italic.woff b/app/assets/fonts/lato-italic.woff
deleted file mode 100755
index ae8840693..000000000
Binary files a/app/assets/fonts/lato-italic.woff and /dev/null differ
diff --git a/app/assets/fonts/lato-italic.woff2 b/app/assets/fonts/lato-italic.woff2
deleted file mode 100755
index e5757d96c..000000000
Binary files a/app/assets/fonts/lato-italic.woff2 and /dev/null differ
diff --git a/app/assets/fonts/lato-lightitalic.eot b/app/assets/fonts/lato-lightitalic.eot
deleted file mode 100755
index b81a79b7d..000000000
Binary files a/app/assets/fonts/lato-lightitalic.eot and /dev/null differ
diff --git a/app/assets/fonts/lato-lightitalic.svg b/app/assets/fonts/lato-lightitalic.svg
deleted file mode 100755
index d284a05a5..000000000
--- a/app/assets/fonts/lato-lightitalic.svg
+++ /dev/null
@@ -1,4072 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/assets/fonts/lato-lightitalic.ttf b/app/assets/fonts/lato-lightitalic.ttf
deleted file mode 100755
index 691ba4d08..000000000
Binary files a/app/assets/fonts/lato-lightitalic.ttf and /dev/null differ
diff --git a/app/assets/fonts/lato-lightitalic.woff b/app/assets/fonts/lato-lightitalic.woff
deleted file mode 100755
index b52daecdb..000000000
Binary files a/app/assets/fonts/lato-lightitalic.woff and /dev/null differ
diff --git a/app/assets/fonts/lato-lightitalic.woff2 b/app/assets/fonts/lato-lightitalic.woff2
deleted file mode 100755
index 5f22f733e..000000000
Binary files a/app/assets/fonts/lato-lightitalic.woff2 and /dev/null differ
diff --git a/app/assets/fonts/opensans-bold.eot b/app/assets/fonts/opensans-bold.eot
new file mode 100755
index 000000000..385d67f8e
Binary files /dev/null and b/app/assets/fonts/opensans-bold.eot differ
diff --git a/app/assets/fonts/opensans-bold.svg b/app/assets/fonts/opensans-bold.svg
new file mode 100755
index 000000000..1b5c1ccb7
--- /dev/null
+++ b/app/assets/fonts/opensans-bold.svg
@@ -0,0 +1,1824 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/assets/fonts/opensans-bold.ttf b/app/assets/fonts/opensans-bold.ttf
new file mode 100755
index 000000000..875ce9339
Binary files /dev/null and b/app/assets/fonts/opensans-bold.ttf differ
diff --git a/app/assets/fonts/opensans-bold.woff b/app/assets/fonts/opensans-bold.woff
new file mode 100755
index 000000000..d7eb013bc
Binary files /dev/null and b/app/assets/fonts/opensans-bold.woff differ
diff --git a/app/assets/fonts/opensans-bold.woff2 b/app/assets/fonts/opensans-bold.woff2
new file mode 100755
index 000000000..3ff34eb9b
Binary files /dev/null and b/app/assets/fonts/opensans-bold.woff2 differ
diff --git a/app/assets/fonts/opensans-bolditalic.eot b/app/assets/fonts/opensans-bolditalic.eot
new file mode 100755
index 000000000..e9da57fb0
Binary files /dev/null and b/app/assets/fonts/opensans-bolditalic.eot differ
diff --git a/app/assets/fonts/opensans-bolditalic.svg b/app/assets/fonts/opensans-bolditalic.svg
new file mode 100755
index 000000000..7d483577f
--- /dev/null
+++ b/app/assets/fonts/opensans-bolditalic.svg
@@ -0,0 +1,1824 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/assets/fonts/opensans-bolditalic.ttf b/app/assets/fonts/opensans-bolditalic.ttf
new file mode 100755
index 000000000..66f65d8a5
Binary files /dev/null and b/app/assets/fonts/opensans-bolditalic.ttf differ
diff --git a/app/assets/fonts/opensans-bolditalic.woff b/app/assets/fonts/opensans-bolditalic.woff
new file mode 100755
index 000000000..d5a238eb8
Binary files /dev/null and b/app/assets/fonts/opensans-bolditalic.woff differ
diff --git a/app/assets/fonts/opensans-bolditalic.woff2 b/app/assets/fonts/opensans-bolditalic.woff2
new file mode 100755
index 000000000..0373e9ca5
Binary files /dev/null and b/app/assets/fonts/opensans-bolditalic.woff2 differ
diff --git a/app/assets/fonts/opensans-italic.eot b/app/assets/fonts/opensans-italic.eot
new file mode 100755
index 000000000..1a515d895
Binary files /dev/null and b/app/assets/fonts/opensans-italic.eot differ
diff --git a/app/assets/fonts/opensans-italic.svg b/app/assets/fonts/opensans-italic.svg
new file mode 100755
index 000000000..930528f49
--- /dev/null
+++ b/app/assets/fonts/opensans-italic.svg
@@ -0,0 +1,1824 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/assets/fonts/opensans-italic.ttf b/app/assets/fonts/opensans-italic.ttf
new file mode 100755
index 000000000..2d2d2c004
Binary files /dev/null and b/app/assets/fonts/opensans-italic.ttf differ
diff --git a/app/assets/fonts/opensans-italic.woff b/app/assets/fonts/opensans-italic.woff
new file mode 100755
index 000000000..3e6c20b19
Binary files /dev/null and b/app/assets/fonts/opensans-italic.woff differ
diff --git a/app/assets/fonts/opensans-italic.woff2 b/app/assets/fonts/opensans-italic.woff2
new file mode 100755
index 000000000..7a2be4074
Binary files /dev/null and b/app/assets/fonts/opensans-italic.woff2 differ
diff --git a/app/assets/fonts/opensans-light.eot b/app/assets/fonts/opensans-light.eot
new file mode 100755
index 000000000..e451e38ef
Binary files /dev/null and b/app/assets/fonts/opensans-light.eot differ
diff --git a/app/assets/fonts/opensans-light.svg b/app/assets/fonts/opensans-light.svg
new file mode 100755
index 000000000..b3e3faabc
--- /dev/null
+++ b/app/assets/fonts/opensans-light.svg
@@ -0,0 +1,1824 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/assets/fonts/opensans-light.ttf b/app/assets/fonts/opensans-light.ttf
new file mode 100755
index 000000000..e5a8089f1
Binary files /dev/null and b/app/assets/fonts/opensans-light.ttf differ
diff --git a/app/assets/fonts/opensans-light.woff b/app/assets/fonts/opensans-light.woff
new file mode 100755
index 000000000..b348ed271
Binary files /dev/null and b/app/assets/fonts/opensans-light.woff differ
diff --git a/app/assets/fonts/opensans-light.woff2 b/app/assets/fonts/opensans-light.woff2
new file mode 100755
index 000000000..d81c25250
Binary files /dev/null and b/app/assets/fonts/opensans-light.woff2 differ
diff --git a/app/assets/fonts/opensans-lightitalic.eot b/app/assets/fonts/opensans-lightitalic.eot
new file mode 100755
index 000000000..cc8ab68e6
Binary files /dev/null and b/app/assets/fonts/opensans-lightitalic.eot differ
diff --git a/app/assets/fonts/opensans-lightitalic.svg b/app/assets/fonts/opensans-lightitalic.svg
new file mode 100755
index 000000000..8cf6f5213
--- /dev/null
+++ b/app/assets/fonts/opensans-lightitalic.svg
@@ -0,0 +1,1824 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/assets/fonts/opensans-lightitalic.ttf b/app/assets/fonts/opensans-lightitalic.ttf
new file mode 100755
index 000000000..8c75ec79b
Binary files /dev/null and b/app/assets/fonts/opensans-lightitalic.ttf differ
diff --git a/app/assets/fonts/opensans-lightitalic.woff b/app/assets/fonts/opensans-lightitalic.woff
new file mode 100755
index 000000000..3dc4e7307
Binary files /dev/null and b/app/assets/fonts/opensans-lightitalic.woff differ
diff --git a/app/assets/fonts/opensans-lightitalic.woff2 b/app/assets/fonts/opensans-lightitalic.woff2
new file mode 100755
index 000000000..b91b6f807
Binary files /dev/null and b/app/assets/fonts/opensans-lightitalic.woff2 differ
diff --git a/app/assets/fonts/opensans-regular.eot b/app/assets/fonts/opensans-regular.eot
new file mode 100755
index 000000000..18331ec52
Binary files /dev/null and b/app/assets/fonts/opensans-regular.eot differ
diff --git a/app/assets/fonts/opensans-regular.svg b/app/assets/fonts/opensans-regular.svg
new file mode 100755
index 000000000..3e5d0ac37
--- /dev/null
+++ b/app/assets/fonts/opensans-regular.svg
@@ -0,0 +1,1824 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/assets/fonts/opensans-regular.ttf b/app/assets/fonts/opensans-regular.ttf
new file mode 100755
index 000000000..12c9ba009
Binary files /dev/null and b/app/assets/fonts/opensans-regular.ttf differ
diff --git a/app/assets/fonts/opensans-regular.woff b/app/assets/fonts/opensans-regular.woff
new file mode 100755
index 000000000..ce026ebbb
Binary files /dev/null and b/app/assets/fonts/opensans-regular.woff differ
diff --git a/app/assets/fonts/opensans-regular.woff2 b/app/assets/fonts/opensans-regular.woff2
new file mode 100755
index 000000000..90d4d672d
Binary files /dev/null and b/app/assets/fonts/opensans-regular.woff2 differ
diff --git a/app/assets/fonts/roboto-blackitalic.eot b/app/assets/fonts/roboto-blackitalic.eot
deleted file mode 100755
index a2aebfb7d..000000000
Binary files a/app/assets/fonts/roboto-blackitalic.eot and /dev/null differ
diff --git a/app/assets/fonts/roboto-blackitalic.svg b/app/assets/fonts/roboto-blackitalic.svg
deleted file mode 100755
index c9cc3cdb7..000000000
--- a/app/assets/fonts/roboto-blackitalic.svg
+++ /dev/null
@@ -1,642 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/assets/fonts/roboto-blackitalic.ttf b/app/assets/fonts/roboto-blackitalic.ttf
deleted file mode 100755
index 2020dcbc9..000000000
Binary files a/app/assets/fonts/roboto-blackitalic.ttf and /dev/null differ
diff --git a/app/assets/fonts/roboto-blackitalic.woff b/app/assets/fonts/roboto-blackitalic.woff
deleted file mode 100755
index 1875c0b95..000000000
Binary files a/app/assets/fonts/roboto-blackitalic.woff and /dev/null differ
diff --git a/app/assets/fonts/roboto-bold.eot b/app/assets/fonts/roboto-bold.eot
deleted file mode 100755
index b73776ee3..000000000
Binary files a/app/assets/fonts/roboto-bold.eot and /dev/null differ
diff --git a/app/assets/fonts/roboto-bold.svg b/app/assets/fonts/roboto-bold.svg
deleted file mode 100755
index 43b5ed222..000000000
--- a/app/assets/fonts/roboto-bold.svg
+++ /dev/null
@@ -1,593 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/assets/fonts/roboto-bold.ttf b/app/assets/fonts/roboto-bold.ttf
deleted file mode 100755
index 1da72769a..000000000
Binary files a/app/assets/fonts/roboto-bold.ttf and /dev/null differ
diff --git a/app/assets/fonts/roboto-bold.woff b/app/assets/fonts/roboto-bold.woff
deleted file mode 100755
index 0c6994871..000000000
Binary files a/app/assets/fonts/roboto-bold.woff and /dev/null differ
diff --git a/app/assets/fonts/roboto-bolditalic.eot b/app/assets/fonts/roboto-bolditalic.eot
deleted file mode 100755
index b803ec168..000000000
Binary files a/app/assets/fonts/roboto-bolditalic.eot and /dev/null differ
diff --git a/app/assets/fonts/roboto-bolditalic.svg b/app/assets/fonts/roboto-bolditalic.svg
deleted file mode 100755
index f877a3c82..000000000
--- a/app/assets/fonts/roboto-bolditalic.svg
+++ /dev/null
@@ -1,642 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/assets/fonts/roboto-bolditalic.ttf b/app/assets/fonts/roboto-bolditalic.ttf
deleted file mode 100755
index 78bab05c8..000000000
Binary files a/app/assets/fonts/roboto-bolditalic.ttf and /dev/null differ
diff --git a/app/assets/fonts/roboto-bolditalic.woff b/app/assets/fonts/roboto-bolditalic.woff
deleted file mode 100755
index 99de61af5..000000000
Binary files a/app/assets/fonts/roboto-bolditalic.woff and /dev/null differ
diff --git a/app/assets/fonts/roboto-italic.eot b/app/assets/fonts/roboto-italic.eot
deleted file mode 100755
index b708f047f..000000000
Binary files a/app/assets/fonts/roboto-italic.eot and /dev/null differ
diff --git a/app/assets/fonts/roboto-italic.svg b/app/assets/fonts/roboto-italic.svg
deleted file mode 100755
index 49ddd4ab7..000000000
--- a/app/assets/fonts/roboto-italic.svg
+++ /dev/null
@@ -1,642 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/assets/fonts/roboto-italic.ttf b/app/assets/fonts/roboto-italic.ttf
deleted file mode 100755
index ae258e841..000000000
Binary files a/app/assets/fonts/roboto-italic.ttf and /dev/null differ
diff --git a/app/assets/fonts/roboto-italic.woff b/app/assets/fonts/roboto-italic.woff
deleted file mode 100755
index dd7424438..000000000
Binary files a/app/assets/fonts/roboto-italic.woff and /dev/null differ
diff --git a/app/assets/fonts/roboto-light b/app/assets/fonts/roboto-light
deleted file mode 100755
index 072cdc480..000000000
Binary files a/app/assets/fonts/roboto-light and /dev/null differ
diff --git a/app/assets/fonts/roboto-light.svg b/app/assets/fonts/roboto-light.svg
deleted file mode 100755
index db6a6171e..000000000
--- a/app/assets/fonts/roboto-light.svg
+++ /dev/null
@@ -1,641 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/assets/fonts/roboto-light.ttf b/app/assets/fonts/roboto-light.ttf
deleted file mode 100755
index 3b2fea0ac..000000000
Binary files a/app/assets/fonts/roboto-light.ttf and /dev/null differ
diff --git a/app/assets/fonts/roboto-light.woff b/app/assets/fonts/roboto-light.woff
deleted file mode 100755
index cc534a381..000000000
Binary files a/app/assets/fonts/roboto-light.woff and /dev/null differ
diff --git a/app/assets/fonts/roboto-lightitalic b/app/assets/fonts/roboto-lightitalic
deleted file mode 100755
index 77396a1ff..000000000
Binary files a/app/assets/fonts/roboto-lightitalic and /dev/null differ
diff --git a/app/assets/fonts/roboto-lightitalic.svg b/app/assets/fonts/roboto-lightitalic.svg
deleted file mode 100755
index 4bd14bcca..000000000
--- a/app/assets/fonts/roboto-lightitalic.svg
+++ /dev/null
@@ -1,641 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/assets/fonts/roboto-lightitalic.ttf b/app/assets/fonts/roboto-lightitalic.ttf
deleted file mode 100755
index b9b38118a..000000000
Binary files a/app/assets/fonts/roboto-lightitalic.ttf and /dev/null differ
diff --git a/app/assets/fonts/roboto-lightitalic.woff b/app/assets/fonts/roboto-lightitalic.woff
deleted file mode 100755
index 3071ff4f2..000000000
Binary files a/app/assets/fonts/roboto-lightitalic.woff and /dev/null differ
diff --git a/app/assets/fonts/roboto-regular.eot b/app/assets/fonts/roboto-regular.eot
deleted file mode 100755
index 9b5e8e413..000000000
Binary files a/app/assets/fonts/roboto-regular.eot and /dev/null differ
diff --git a/app/assets/fonts/roboto-regular.svg b/app/assets/fonts/roboto-regular.svg
deleted file mode 100755
index de7d77fea..000000000
--- a/app/assets/fonts/roboto-regular.svg
+++ /dev/null
@@ -1,621 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/assets/fonts/roboto-regular.ttf b/app/assets/fonts/roboto-regular.ttf
deleted file mode 100755
index 44dd78d5e..000000000
Binary files a/app/assets/fonts/roboto-regular.ttf and /dev/null differ
diff --git a/app/assets/fonts/roboto-regular.woff b/app/assets/fonts/roboto-regular.woff
deleted file mode 100755
index bfa05d53f..000000000
Binary files a/app/assets/fonts/roboto-regular.woff and /dev/null differ
diff --git a/app/assets/images/comments_divider.png b/app/assets/images/comments_divider.png
deleted file mode 100644
index 1d2bffd9b..000000000
Binary files a/app/assets/images/comments_divider.png and /dev/null differ
diff --git a/app/assets/images/footer.jpg b/app/assets/images/footer.jpg
deleted file mode 100644
index 5364cc233..000000000
Binary files a/app/assets/images/footer.jpg and /dev/null differ
diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss
index 3aaa26b75..f242e8757 100644
--- a/app/assets/stylesheets/debates.scss
+++ b/app/assets/stylesheets/debates.scss
@@ -13,7 +13,7 @@
@mixin votes {
background: $votes-bg;
border-top: 1px solid $votes-border;
- margin: 0 -12px;
+ margin: 0 rem-calc(-12);
padding: rem-calc(14) rem-calc(12);
position: relative;
@@ -21,7 +21,7 @@
background: white;
border: 2px solid $votes-border;
border-radius: rem-calc(3);
- color: $votes-neutral;
+ color: $text-light;
display: inline-block;
font-size: rem-calc(30);
line-height: rem-calc(30);
@@ -45,7 +45,7 @@
background: white;
border: 2px solid $votes-border;
border-radius: rem-calc(3);
- color: $votes-neutral;
+ color: $text-light;
display: inline-block;
font-size: rem-calc(30);
line-height: rem-calc(30);
@@ -70,7 +70,7 @@
vertical-align: super;
span {
- color: $votes-text;
+ color: white;
display: inline-block;
font-size: rem-calc(16);
font-weight: lighter;
@@ -107,7 +107,7 @@
}
.total-votes {
- color: $votes-text;
+ color: white;
float: right;
line-height: $line-height*2;
}
@@ -117,12 +117,12 @@
}
.not-logged {
- background: $not-logged-bg;
+ background: rgba(22,99,135,.9);
color: white;
height: 100%;
left: 0;
line-height: $line-height*2;
- padding-top: $line-height/2;
+ padding-top: rem-calc(12);
position: absolute;
text-align: center;
top: 0;
@@ -149,11 +149,11 @@
border: 1px solid;
border-color: #e5e6e9 #dfe0e4 #d0d1d5;
border-radius: rem-calc(3);
- margin-bottom: $line-height;
+ margin-bottom: rem-calc(24);
padding: rem-calc(24) rem-calc(12) 0 rem-calc(12);
.debate-content {
- min-height: $line-height*14.71;
+ min-height: rem-calc(353);
}
.label {
@@ -173,7 +173,7 @@
line-height: $line-height;
position: absolute;
right: rem-calc(18);
- top: rem-calc(24);
+ top: rem-calc(12);
}
h3 {
@@ -183,7 +183,7 @@
a {
clear: both;
- color: $header-color;
+ color: $text;
display: block;
font-size: rem-calc(16);
line-height: $line-height;
@@ -191,7 +191,7 @@
}
.debate-info {
- color: $text-light;
+ color: $text-medium;
font-weight: lighter;
margin-bottom: 0;
@@ -201,22 +201,22 @@
}
a {
- color: $text-light;
+ color: $text-medium;
}
}
.debate-description {
- color: $text-color;
+ color: $text;
font-size: rem-calc(13);
- height: $line-height*6.5;
+ height: rem-calc(156);
line-height: $line-height;
- margin-bottom: $line-height/2;
- margin-top: $line-height;
+ margin-bottom: rem-calc(12);
+ margin-top: rem-calc(24);
overflow: hidden;
position: relative;
a {
- color: $text-color;
+ color: $text;
}
}
@@ -230,10 +230,10 @@
}
p {
- color: $text-color;
+ color: $text;
font-size: rem-calc(13);
line-height: $line-height;
- margin-bottom: $line-height/2;
+ margin-bottom: rem-calc(12);
}
}
@@ -243,8 +243,8 @@
}
.debates-list {
- margin-bottom: $line-height*2;
- margin-top: $line-height;
+ margin-bottom: rem-calc(48);
+ margin-top: rem-calc(24);
}
.debate {
@@ -253,12 +253,13 @@
margin-top: 0;
.panel {
+ border: 0;
margin-bottom: 0;
- min-height: $line-height*8;
+ min-height: rem-calc(192);
padding: 0 rem-calc(12) rem-calc(2) rem-calc(12);
&:first-child {
- padding-top: $line-height;
+ padding-top: rem-calc(24);
}
.label {
@@ -268,7 +269,7 @@
h3 {
margin-top: 0;
- min-height: $line-height*2;
+ min-height: rem-calc(48);
}
p {
@@ -291,13 +292,29 @@
}
.debate-description {
- height: $line-height*3;
+ height: rem-calc(72);
margin-top: 0;
}
}
.votes {
- border: 0;
+ border: 1px solid $votes-border;
+ border-top-left-radius: 3px;
+ border-bottom-left-radius: 3px;
+ margin: 0 rem-calc(-24) 0 rem-calc(12);
+
+ &:after {
+ content: "";
+ position: absolute;
+ display: block;
+ border-style: solid;
+ border-color: #166387 transparent transparent transparent;
+ bottom: rem-calc(-14);
+ border-left-width: 0;
+ border-right-color: transparent;
+ right: rem-calc(-1);
+ border-width: 1em 1em 0 0;
+ }
.total-votes {
display: block;
@@ -308,7 +325,7 @@
.like {
span {
- color: $votes-text;
+ color: white;
display: block;
line-height: $line-height/2;
}
@@ -316,21 +333,17 @@
.not-logged {
line-height: $line-height;
- padding-top: $line-height*1.5;
+ padding-top: rem-calc(36);
}
}
}
-.sidebar {
- margin-top: $line-height;
-}
-
// 03. Show
// - - - - - - - - - - - - - - - - - - - - - - - - -
.debate-show {
background: white;
- padding: rem-calc(24) rem-calc(12) rem-calc(48);
+ padding: rem-calc(24) rem-calc(12) 0;
.back {
@include back;
@@ -344,19 +357,18 @@
clear: both;
font-size: rem-calc(24);
font-weight: bold;
- line-height: $line-height*2;
margin: 0;
}
.debate-info {
clear: both;
- color: $text-light;
+ color: $text-medium;
font-weight: lighter;
line-height: $line-height*2;
text-align: justify;
a {
- color: $text-light;
+ color: $text-medium;
}
.bullet {
@@ -372,27 +384,19 @@
.author-photo {
line-height: $line-height*2;
- margin-right: $line-height/4;
+ margin-right: rem-calc(6);
+ vertical-align: middle;
+ width: 32px;
}
.author {
- color: $text-color;
+ color: $text;
font-weight: bold;
}
- .sidebar-divider {
- border-top: 1px solid $border;
- margin-top: $line-height;
-
- &:first-child {
- margin-top: 0;
- }
- }
-
h3 {
border-top: 1px solid $votes-border;
display: inline-block;
- font-family: $font-family-sans-serif;
font-size: rem-calc(16);
margin: -1px 0 rem-calc(12);
padding-top: rem-calc(6);
@@ -401,7 +405,8 @@
.votes {
@include votes;
- border: 0;
+ border: 1px solid $votes-border;
+ border-radius: rem-calc(3);
margin: 0;
.total-votes {
@@ -412,18 +417,22 @@
.not-logged {
line-height: $line-height;
- padding: $line-height;
+ padding: rem-calc(24);
}
}
.leave-comment {
display: inline-block;
- margin-top: $line-height;
+ margin-top: rem-calc(24);
}
.tags {
display: block;
- margin-top: $line-height;
+ margin-top: rem-calc(24);
+
+ a {
+ margin-right: rem-calc(6);
+ }
}
}
@@ -432,7 +441,7 @@
.debate-new {
background: white;
- padding-top: $line-height;
+ padding-top: rem-calc(24);
.back {
@include back;
@@ -443,7 +452,7 @@
font-size: rem-calc(36);
font-weight: bold;
line-height: $line-height*2;
- margin-bottom: $line-height;
+ margin-bottom: rem-calc(24);
}
.icon-comment-quotes {
@@ -464,7 +473,7 @@
.recommendations {
list-style-type: none;
margin-left: 0;
- margin-top: $line-height;
+ margin-top: rem-calc(24);
li {
font-size: rem-calc(12);
@@ -483,34 +492,42 @@
// - - - - - - - - - - - - - - - - - - - - - - - - -
.comments {
- background: $comments-bg;
- background-image: url('comments_divider.png');
+ background: $white;
background-repeat: repeat-x;
- padding-top: $line-height;
- padding-bottom: $line-height*4;
+ padding-top: rem-calc(24);
+ padding-bottom: rem-calc(96);
h2 {
margin: 0;
font-weight: bold;
+
+ span {
+ font-size: rem-calc(14);
+ font-weight: normal;
+ opacity: .8;
+ }
}
.comment {
- margin: $line-height/4 0;
+ margin: rem-calc(6) 0;
p {
- color: $comments-text;
margin-bottom: 0;
}
.comment-votes {
- color: $comments-info;
+ color: $text-medium;
font-weight: lighter;
margin: rem-calc(15) rem-calc(6) 0;
a {
- color: $comments-info;
+ color: $text-light;
display: inline-block;
vertical-align: top;
+
+ &:hover {
+ color: $text-medium;
+ }
}
[class^="icon-"] {
@@ -520,7 +537,7 @@
}
.comment-body {
- margin-left: $line-height*1.6;
+ margin-left: rem-calc(36);
.reply {
background: white;
@@ -534,22 +551,22 @@
.comment-children {
border-left: 1px dashed $border;
- margin-left: $line-height*1.6;
- padding-left: $line-height/4;
+ margin-left: rem-calc(36);
+ padding-left: rem-calc(6);
@media only screen and (max-width: 40em) {
- margin-left: $line-height/1.5;
+ margin-left: rem-calc(16);
}
}
.comment-info {
- color: $comments-info;
+ color: $text-light;
font-size: rem-calc(13);
font-weight: lighter;
vertical-align: middle;
span {
- color: $text-color;
+ color: $text;
font-weight: bold;
}
}
diff --git a/app/assets/stylesheets/fonts.scss b/app/assets/stylesheets/fonts.scss
index b6fc2d973..80d1259a9 100644
--- a/app/assets/stylesheets/fonts.scss
+++ b/app/assets/stylesheets/fonts.scss
@@ -1,160 +1,119 @@
-// List of fonts
+// List of fonts
+//
+// 01. Open Sans (http://www.fontsquirrel.com/fonts/open-sans)
+// 02. Lato (http://www.fontsquirrel.com/fonts/lato)
//
-// 01. Roboto (https://www.google.com/fonts/specimen/Roboto)
-// 02. Lato (https://www.google.com/fonts/specimen/Lato)
-
-// 01. Roboto
+// 01. Open Sans
// - - - - - - - - - - - - - - - - - - - - - - - - -
@font-face {
- font-family: 'Roboto';
- src: font-url('roboto-light.eot');
- src: font-url('roboto-light.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-light.woff') format('woff'),
- font-url('roboto-light.ttf') format('truetype'),
- font-url('roboto-light.svg#latolight') format('svg');
- font-weight: 300;
- font-style: normal;
+ font-family: 'Open Sans';
+ src: font-url('opensans-light.eot');
+ src: font-url('opensans-light.eot?#iefix') format('embedded-opentype'),
+ font-url('opensans-light.woff2') format('woff2'),
+ font-url('opensans-light.woff') format('woff'),
+ font-url('opensans-light.ttf') format('truetype'),
+ font-url('opensans-light.svg#open_sanslight') format('svg');
+ font-weight: lighter;
+ font-style: normal;
}
@font-face {
- font-family: 'Roboto';
- src: font-url('roboto-lightitalic.eot');
- src: font-url('roboto-lightitalic.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-lightitalic.woff') format('woff'),
- font-url('roboto-lightitalic.ttf') format('truetype'),
- font-url('roboto-lightitalic.svg#latolight_italic') format('svg');
- font-weight: 300;
- font-style: italic;
+ font-family: 'Open Sans';
+ src: font-url('opensans-lightitalic.eot');
+ src: font-url('opensans-lightitalic.eot?#iefix') format('embedded-opentype'),
+ font-url('opensans-lightitalic.woff2') format('woff2'),
+ font-url('opensans-lightitalic.woff') format('woff'),
+ font-url('opensans-lightitalic.ttf') format('truetype'),
+ font-url('opensans-lightitalic.svg#open_sanslight_italic') format('svg');
+ font-weight: lighter;
+ font-style: italic;
}
@font-face {
- font-family: 'Roboto';
- src: font-url('roboto-regular.eot');
- src: font-url('roboto-regular.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-regular.woff') format('woff'),
- font-url('roboto-regular.ttf') format('truetype'),
- font-url('roboto-regular.svg#latoregular') format('svg');
- font-weight: 400;
- font-style: normal;
+ font-family: 'Open Sans';
+ src: font-url('opensans-regular.eot');
+ src: font-url('opensans-regular.eot?#iefix') format('embedded-opentype'),
+ font-url('opensans-regular.woff2') format('woff2'),
+ font-url('opensans-regular.woff') format('woff'),
+ font-url('opensans-regular.ttf') format('truetype'),
+ font-url('opensans-regular.svg#open_sansregular') format('svg');
+ font-weight: normal;
+ font-style: normal;
}
@font-face {
- font-family: 'Roboto';
- src: font-url('roboto-italic.eot');
- src: font-url('roboto-italic.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-italic.woff') format('woff'),
- font-url('roboto-italic.ttf') format('truetype'),
- font-url('roboto-italic.svg#latoitalic') format('svg');
- font-weight: 400;
- font-style: italic;
+ font-family: 'Open Sans';
+ src: url('opensans-italic.eot');
+ src: url('opensans-italic.eot?#iefix') format('embedded-opentype'),
+ url('opensans-italic.woff2') format('woff2'),
+ url('opensans-italic.woff') format('woff'),
+ url('opensans-italic.ttf') format('truetype'),
+ url('opensans-italic.svg#open_sansitalic') format('svg');
+ font-weight: normal;
+ font-style: italic;
}
@font-face {
- font-family: 'Roboto';
- src: font-url('roboto-bold.eot');
- src: font-url('roboto-bold.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-bold.woff') format('woff'),
- font-url('roboto-bold.ttf') format('truetype'),
- font-url('roboto-bold.svg#latobold') format('svg');
- font-weight: bold;
- font-style: normal;
+ font-family: 'Open Sans';
+ src: font-url('opensans-bold.eot');
+ src: font-url('opensans-bold.eot?#iefix') format('embedded-opentype'),
+ font-url('opensans-bold.woff2') format('woff2'),
+ font-url('opensans-bold.woff') format('woff'),
+ font-url('opensans-bold.ttf') format('truetype'),
+ font-url('opensans-bold.svg#open_sansbold') format('svg');
+ font-weight: bold;
+ font-style: normal;
}
@font-face {
- font-family: 'Roboto';
- src: font-url('roboto-bolditalic.eot');
- src: font-url('roboto-bolditalic.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-bolditalic.woff') format('woff'),
- font-url('roboto-bolditalic.ttf') format('truetype'),
- font-url('roboto-bolditalic.svg#latobold_italic') format('svg');
- font-weight: bold;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Roboto';
- src: font-url('roboto-blackitalic.eot');
- src: font-url('roboto-blackitalic.eot?#iefix') format('embedded-opentype'),
- font-url('roboto-blackitalic.woff') format('woff'),
- font-url('roboto-blackitalic.ttf') format('truetype'),
- font-url('roboto-blackitalic.svg#latobold_italic') format('svg');
- font-weight: bolder;
- font-style: italic;
+ font-family: 'Open Sans';
+ src: url('opensans-bolditalic.eot');
+ src: url('opensans-bolditalic.eot?#iefix') format('embedded-opentype'),
+ url('opensans-bolditalic.woff2') format('woff2'),
+ url('opensans-bolditalic.woff') format('woff'),
+ url('opensans-bolditalic.ttf') format('truetype'),
+ url('opensans-bolditalic.svg#open_sansbold_italic') format('svg');
+ font-weight: bold;
+ font-style: italic;
}
// 02. Lato
// - - - - - - - - - - - - - - - - - - - - - - - - -
@font-face {
- font-family: 'Lato';
- src: font-url('lato-light.eot');
- src: font-url('lato-light.eot?#iefix') format('embedded-opentype'),
- font-url('lato-light.woff2') format('woff2'),
- font-url('lato-light.woff') format('woff'),
- font-url('lato-light.ttf') format('truetype'),
- font-url('lato-light.svg#latolight') format('svg');
- font-weight: 300;
- font-style: normal;
+ font-family: 'Lato';
+ src: font-url('lato-light.eot');
+ src: font-url('lato-light.eot?#iefix') format('embedded-opentype'),
+ font-url('lato-light.woff2') format('woff2'),
+ font-url('lato-light.woff') format('woff'),
+ font-url('lato-light.ttf') format('truetype'),
+ font-url('lato-light.svg#latolight') format('svg');
+ font-weight: lighter;
+ font-style: normal;
}
@font-face {
- font-family: 'Lato';
- src: font-url('lato-lightitalic.eot');
- src: font-url('lato-lightitalic.eot?#iefix') format('embedded-opentype'),
- font-url('lato-lightitalic.woff2') format('woff2'),
- font-url('lato-lightitalic.woff') format('woff'),
- font-url('lato-lightitalic.ttf') format('truetype'),
- font-url('lato-lightitalic.svg#latolight_italic') format('svg');
- font-weight: 300;
- font-style: italic;
+ font-family: 'Lato';
+ src: font-url('lato-regular.eot');
+ src: font-url('lato-regular.eot?#iefix') format('embedded-opentype'),
+ font-url('lato-regular.woff2') format('woff2'),
+ font-url('lato-regular.woff') format('woff'),
+ font-url('lato-regular.ttf') format('truetype'),
+ font-url('lato-regular.svg#latoregular') format('svg');
+ font-weight: normal;
+ font-style: normal;
}
@font-face {
- font-family: 'Lato';
- src: font-url('lato-regular.eot');
- src: font-url('lato-regular.eot?#iefix') format('embedded-opentype'),
- font-url('lato-regular.woff2') format('woff2'),
- font-url('lato-regular.woff') format('woff'),
- font-url('lato-regular.ttf') format('truetype'),
- font-url('lato-regular.svg#latoregular') format('svg');
- font-weight: normal;
- font-style: normal;
+ font-family: 'Lato';
+ src: font-url('lato-bold.eot');
+ src: font-url('lato-bold.eot?#iefix') format('embedded-opentype'),
+ font-url('lato-bold.woff2') format('woff2'),
+ font-url('lato-bold.woff') format('woff'),
+ font-url('lato-bold.ttf') format('truetype'),
+ font-url('lato-bold.svg#latobold') format('svg');
+ font-weight: bold;
+ font-style: normal;
}
-
-@font-face {
- font-family: 'Lato';
- src: font-url('lato-italic.eot');
- src: font-url('lato-italic.eot?#iefix') format('embedded-opentype'),
- font-url('lato-italic.woff2') format('woff2'),
- font-url('lato-italic.woff') format('woff'),
- font-url('lato-italic.ttf') format('truetype'),
- font-url('lato-italic.svg#latoitalic') format('svg');
- font-weight: normal;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Lato';
- src: font-url('lato-bold.eot');
- src: font-url('lato-bold.eot?#iefix') format('embedded-opentype'),
- font-url('lato-bold.woff2') format('woff2'),
- font-url('lato-bold.woff') format('woff'),
- font-url('lato-bold.ttf') format('truetype'),
- font-url('lato-bold.svg#latobold') format('svg');
- font-weight: bold;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Lato';
- src: font-url('lato-bolditalic.eot');
- src: font-url('lato-bolditalic.eot?#iefix') format('embedded-opentype'),
- font-url('lato-bolditalic.woff2') format('woff2'),
- font-url('lato-bolditalic.woff') format('woff'),
- font-url('lato-bolditalic.ttf') format('truetype'),
- font-url('lato-bolditalic.svg#latobold_italic') format('svg');
- font-weight: bold;
- font-style: italic;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss
index 0f7f75bd0..cfebe4e83 100644
--- a/app/assets/stylesheets/icons.scss
+++ b/app/assets/stylesheets/icons.scss
@@ -75,4 +75,7 @@
}
.icon-edit:before {
content: "m";
-}
\ No newline at end of file
+}
+.icon-star:before {
+ content: "n";
+}
diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index e2fb5f041..6e5ad3d7b 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -2,7 +2,7 @@
//
// 01. Variables
// 02. Mixins
-// 02. Global styles
+// 03. Global styles
// 04. Header
// 05. Footer
// 06. Tags
@@ -30,7 +30,7 @@
a {
color: white;
- font-family: 'Lato';
+ font-family: 'Lato' !important;
font-size: rem-calc(20);
font-weight: lighter;
line-height: $line-height*4;
@@ -43,7 +43,7 @@
}
@media (min-width: 480px) {
- font-size: rem-calc(30);
+ font-size: rem-calc(28);
span {
font-size: rem-calc(20);
}
@@ -60,17 +60,22 @@
}
body {
- background: $background;
+ background: $body;
font-family: $font-family-sans-serif;
font-size: rem-calc(13);
font-weight: normal;
text-rendering: optimizeLegibility;
+
+ &::selection, ::-moz-selection {
+ background: $brand !important;
+ color: white !important;
+ }
}
p {
font-size: rem-calc(13);
line-height: $line-height;
- margin-bottom: $line-height/2;
+ margin-bottom: rem-calc(12);
}
a {
@@ -81,6 +86,10 @@ a {
}
}
+h1, h2, h3, h4, h5, h6 {
+ font-family: $font-family-sans-serif;
+}
+
.button {
padding: rem-calc(15) rem-calc(32);
}
@@ -101,9 +110,18 @@ a {
max-width: 100% !important;
}
-::selection, ::-moz-selection {
- background: $brand;
- color: white;
+.sidebar {
+ margin-top: rem-calc(24);
+ margin-bottom: rem-calc(48);
+}
+
+.sidebar-divider {
+ border-top: 1px solid $border;
+ margin-top: rem-calc(24);
+
+ &:first-child {
+ margin-top: 0;
+ }
}
// 04. Header
@@ -113,10 +131,10 @@ header {
background: url('home_header_bg.jpg');
background-position: 50% 50%;
background-size: cover;
- min-height: $line-height*20;
+ min-height: rem-calc(480);
&.results {
- min-height: $line-height*8;
+ min-height: rem-calc(192);
}
h1 {
@@ -124,7 +142,7 @@ header {
font-size: rem-calc(45);
font-weight: bolder;
line-height: $line-height*3;
- margin: $line-height 0 0 0;
+ margin: rem-calc(24) 0 0 0;
padding: 0;
}
@@ -139,14 +157,14 @@ header {
.button {
color: white;
font-family: inherit;
- margin-top: $line-height;
+ margin-top: rem-calc(24);
}
.home-page {
.button {
color: white;
font-family: inherit;
- margin-top: $line-height*2;
+ margin-top: rem-calc(48);
}
}
@@ -192,7 +210,7 @@ header {
.top-bar {
background: rgba(0,0,0,.5);
color: white;
- height: $line-height*4;
+ height: rem-calc(96);
max-width: 1170px !important;
.name a {
@@ -209,13 +227,13 @@ header {
}
img {
- margin-right: $line-height/2;
+ margin-right: rem-calc(12);
}
}
}
.top-bar-section {
- margin-right: $line-height;
+ margin-right: rem-calc(24);
ul li > a {
font-size: rem-calc(14);
@@ -238,7 +256,7 @@ header {
li.active:not(.has-form) a:not(.button) {
background: none;
- height: $line-height*4;
+ height: rem-calc(96);
line-height: $line-height*4;
}
}
@@ -246,11 +264,11 @@ header {
.top-links {
color: white;
font-size: rem-calc(14);
- height: $line-height*3;
- padding: $line-height/2 0;
+ height: rem-calc(72);
+ padding: rem-calc(12) 0;
@media (min-width: 480px) {
- height: $line-height*2;
+ height: rem-calc(48);
}
a {
@@ -289,28 +307,26 @@ footer {
padding-top: $line-height;
}
-
// 06. Tags
// - - - - - - - - - - - - - - - - - - - - - - - - -
.tags {
a {
- background: $tags-bg;
- border: 1px solid $tags-border;
+ background: $background;
+ border: 1px solid $border;
border-radius: 3px;
- color: $tags-color;
+ color: $text-medium;
display: inline-block;
font-size: rem-calc(13);
line-height: rem-calc(22);
margin-bottom: rem-calc(8);
- margin-right: rem-calc(8);
padding: 0 rem-calc(6);
&:hover {
color: $link;
cursor: pointer;
- background: $tags-bg-hover;
+ background: #E5F1F8;
border: 1px solid $brand;
}
}
@@ -320,14 +336,17 @@ footer {
@extend .tags;
h3 {
- font-size: rem-calc(24);
- font-weight: bold;
- line-height: $line-height*2;
- margin: 0;
+ border-top: 1px solid $votes-border;
+ display: inline-block;
+ font-family: $font-family-sans-serif;
+ font-size: rem-calc(16);
+ margin: -1px 0 rem-calc(12);
+ padding-top: rem-calc(6);
+ text-transform: uppercase;
}
a {
- padding: $line-height/4 $line-height/3;
+ padding: rem-calc(6) rem-calc(8);
.label {
color: white;
@@ -347,10 +366,10 @@ footer {
.auth-page {
background: url('auth_bg.jpg');
- margin-top: $line-height;
+ margin-top: rem-calc(24);
@media (min-width: 480px) {
- margin-top: $line-height*2;
+ margin-top: rem-calc(48);
}
h1 {
@@ -359,7 +378,7 @@ footer {
}
.auth {
- min-height: $line-height*20;
+ min-height: rem-calc(480);
h2 {
clear: both;
@@ -372,10 +391,6 @@ footer {
@include back;
}
- .simple_captcha {
- margin-bottom: $line-height/2;
- }
-
.panel {
background: white;
border: 0;
@@ -399,10 +414,15 @@ form {
input[type]:not([type=submit]):not([type=file]) {
background: $input-bg;
- height: $line-height*2;
+ height: rem-calc(48);
margin-bottom: rem-calc(16);
}
+ input[type="checkbox"] {
+ height: rem-calc(24) !important;
+ margin: 0 !important;
+ }
+
input[type=file] {
margin: rem-calc(12) 0;
}
@@ -414,18 +434,31 @@ form {
}
.ckeditor {
- margin-bottom: $line-height;
- min-height: $line-height*14;
+ margin-bottom: rem-calc(24);
+ min-height: rem-calc(336);
}
.checkbox {
display: inline-block;
font-size: rem-calc(14);
font-weight: normal;
- line-height: $line-height*2;
+ line-height: $line-height;
margin: 0 0 0 rem-calc(6);
vertical-align: top;
}
+
+ .captcha {
+ border: 0;
+ padding: rem-calc(12) 0;
+
+ input {
+ margin-bottom: 0 !important;
+ }
+ }
+
+ .button {
+ margin-top: rem-calc(24);
+ }
}
// 09. Alerts
@@ -463,18 +496,14 @@ form {
.account {
background: white;
- padding-top: $line-height;
-
- input[type="checkbox"], .checkbox {
- margin-top: -(rem-calc(12));
- }
+ padding-top: rem-calc(24);
h1 {
clear: both;
font-size: rem-calc(36);
font-weight: bold;
line-height: $line-height*2;
- margin-bottom: $line-height;
+ margin-bottom: rem-calc(24);
}
.icon-comment-quotes {
@@ -484,6 +513,10 @@ form {
opacity: .5;
}
+ .avatar {
+ margin-bottom: rem-calc(24);
+ }
+
.initialjs-avatar {
margin-bottom: $line-height;
}
@@ -494,7 +527,7 @@ form {
font-weight: bold;
line-height: $line-height;
margin: 0;
- margin-bottom: $line-height/2;
+ margin-bottom: rem-calc(12);
}
h3 {
@@ -503,13 +536,13 @@ form {
font-weight: bold;
line-height: $line-height;
margin: 0;
- margin-bottom: $line-height/2;
+ margin-bottom: rem-calc(12);
}
.recommendations {
list-style-type: none;
margin-left: 0;
- margin-top: $line-height;
+ margin-top: rem-calc(24);
li {
font-size: rem-calc(12);
diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss
index 3fc104785..ca40c4e53 100644
--- a/app/assets/stylesheets/variables.scss
+++ b/app/assets/stylesheets/variables.scss
@@ -9,46 +9,34 @@
// 01. Fonts
// - - - - - - - - - - - - - - - - - - - - - - - - -
-$font-family-sans-serif: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+$font-family-sans-serif: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
$line-height: rem-calc(24);
// 02. Colors
// - - - - - - - - - - - - - - - - - - - - - - - - -
+$body: #E9E9E9;
$background: #EDEFF0;
$border: #DEE0E3;
$brand: #0077B9;
-$check: #46DB91;
-$debates: #008CCF;
-$comments-bg: #F1F1F1;
-$comments-info: #A5B2B9;
-$comments-text: #3F4549;
-
-$header-color: #292B33;
-$link: #2895F1;
-$link-hover: #2178BF;
-
-$tags-bg: #FAFAFA;
-$tags-bg-hover: #E5F1F8;
-$tags-border: #F0F0F0;
-$tags-color: #8F8F8F;
-
-$text-color: #222222;
+$text: #222222;
$text-medium: #999999;
-$text-light: #A3A6AD;
+$text-light: #CCCCCC;
-$votes: #31708f;
+$link: #2895F1;
+$link-hover: #2178BF;
+
+$debates: #008CCF;
$votes-bg: #26AEEE;
$votes-border: #1F94CB;
+
$votes-like: #7BD2A8;
$votes-like-act: #5D9E7F;
-$votes-neutral: #CCCCCC;
-$votes-text: #FFFFFF;
$votes-unlike: #EF8585;
$votes-unlike-act: #BD6A6A;
-$not-logged-bg: rgba(22,99,135,.9);
+$check: #46DB91;
// 03. Forms
// - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/app/views/debates/_form.html.erb b/app/views/debates/_form.html.erb
index 56af80136..58cff79aa 100644
--- a/app/views/debates/_form.html.erb
+++ b/app/views/debates/_form.html.erb
@@ -14,7 +14,7 @@
<%= f.label :title, t("debates.form.debate_title") %>
<%= t("debates.form.title_instructions") %>
- <%= f.text_field :title, maxlength: Debate::TITLE_LENGTH %>
+ <%= f.text_field :title, maxlength: Debate::TITLE_LENGTH, placeholder: t("debates.form.debate_title") %>
@@ -40,8 +40,8 @@
<%= f.simple_captcha %>
-
+
<%= f.submit(class: "button radius") %>
<%= t("debates.show.comments_title") %>
+ ++ <%= t("debates.show.comments_title") %> + (<%= t("debates.show.comments", count: @debate.comment_threads.count) %>) +
<% if user_signed_in? %>