From 7012d0c901c16b6ea61b77e25ccf12f8e6991c8c Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Thu, 8 Oct 2015 17:19:37 +0200 Subject: [PATCH 1/7] Refactors css for comments and flags --- app/assets/stylesheets/application.scss | 2 +- app/assets/stylesheets/debates.scss | 171 ------------------ .../{participacion.scss => layout.scss} | 171 ++++++++++++++++++ app/assets/stylesheets/proposals.scss | 171 ------------------ 4 files changed, 172 insertions(+), 343 deletions(-) rename app/assets/stylesheets/{participacion.scss => layout.scss} (89%) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 4bf184c2c..94ddf4867 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -4,7 +4,7 @@ @import "icons"; @import "variables"; @import "admin"; -@import "participacion"; +@import "layout"; @import "debates"; @import "proposals"; @import "c3"; \ No newline at end of file diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index 560c16664..1155382dc 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -6,8 +6,6 @@ // 02.2. List // 03. Show // 04. New -// 05. Comments -// 06. Flags // // 01. Debates @@ -615,172 +613,3 @@ .debate-edit { @extend .debate-new; } - -// 05. Comments -// - - - - - - - - - - - - - - - - - - - - - - - - - - -.comments { - background: $white; - background-repeat: repeat-x; - padding-top: rem-calc(24); - padding-bottom: rem-calc(96); - - h2 { - margin: 0; - font-weight: bold; - - span { - font-size: rem-calc(18); - font-weight: normal; - opacity: .8; - } - } - - .comment { - margin: rem-calc(6) 0; - - p { - margin-bottom: 0; - } - - .comment-votes { - color: $text-medium; - font-weight: lighter; - line-height: rem-calc(24); - margin: rem-calc(10) rem-calc(12) rem-calc(6) 0; - - a { - color: $text-light; - display: inline-block; - vertical-align: top; - - &:hover { - color: $text-medium; - } - } - - [class^="icon-"] { - font-size: rem-calc(20); - vertical-align: middle; - } - } - - .comment-body { - margin-left: rem-calc(42); - - p { - font-size: rem-calc(14); - } - - .reply { - background: white; - border: 1px solid $border; - font-size: rem-calc(12); - margin: rem-calc(6) 0; - padding: rem-calc(6); - - .divider { - color: $text-light; - } - } - - .comment-user { - margin-top: rem-calc(6); - padding: rem-calc(6) 0; - overflow: hidden; - - @each $n in ("1", "2", "3","4", "5") { - &.level-#{$n} { - @if $n == "5" { - background: $comment-level-5; - padding: rem-calc(6) rem-calc(12); - } - @elseif $n == "1" { - background: none; - padding: rem-calc(6) rem-calc(12); - } - @else { - background: $comment-official; - padding: rem-calc(6) rem-calc(12); - } - } - } - - &.is-author { - background: $comment-author; - padding: rem-calc(6) rem-calc(12); - } - - &.is-admin { - background: $comment-admin; - padding: rem-calc(6) rem-calc(12); - } - - &.is-moderator { - @extend .is-admin; - } - - &.level-5 { - background: $comment-level-5; - padding: rem-calc(6) rem-calc(12); - } - } - } - - .is-deleted { - background: $deleted; - margin-left: rem-calc(42); - padding: rem-calc(6) rem-calc(12); - } - - .comment-children { - border-left: 1px dashed $border; - margin-left: rem-calc(42); - padding-left: rem-calc(6); - - @media only screen and (max-width: 40em) { - margin-left: rem-calc(16); - } - } - - .comment-info { - color: $text-light; - font-size: rem-calc(13); - font-weight: lighter; - margin-top: rem-calc(6); - vertical-align: middle; - - span.user-name { - color: $text; - font-weight: bold; - } - } - } -} - -.faded { - opacity: 0.4; -} - -// 06. Flags -// - - - - - - - - - - - - - - - - - - - - - - - - - - -.flag-content { - - .button { - background: none; - margin-bottom: 0; - padding: 0; - } -} - -.flag-disable { - color: $text-medium; - line-height: rem-calc(24); - vertical-align: middle; -} - -.flag-active { - @extend .flag-disable; - color: $delete; -} diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/layout.scss similarity index 89% rename from app/assets/stylesheets/participacion.scss rename to app/assets/stylesheets/layout.scss index 520a836aa..28e53b5b3 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/layout.scss @@ -17,6 +17,8 @@ // 15. Social // 16. Pages // 17. Verification +// 18. Comments +// 19. Flags // // 01. Variables @@ -1727,3 +1729,172 @@ table { } } } + +// 18. Comments +// - - - - - - - - - - - - - - - - - - - - - - - - - + +.comments { + background: $white; + background-repeat: repeat-x; + padding-top: rem-calc(24); + padding-bottom: rem-calc(96); + + h2 { + margin: 0; + font-weight: bold; + + span { + font-size: rem-calc(18); + font-weight: normal; + opacity: .8; + } + } + + .comment { + margin: rem-calc(6) 0; + + p { + margin-bottom: 0; + } + + .comment-votes { + color: $text-medium; + font-weight: lighter; + line-height: rem-calc(24); + margin: rem-calc(10) rem-calc(12) rem-calc(6) 0; + + a { + color: $text-light; + display: inline-block; + vertical-align: top; + + &:hover { + color: $text-medium; + } + } + + [class^="icon-"] { + font-size: rem-calc(20); + vertical-align: middle; + } + } + + .comment-body { + margin-left: rem-calc(42); + + p { + font-size: rem-calc(14); + } + + .reply { + background: white; + border: 1px solid $border; + font-size: rem-calc(12); + margin: rem-calc(6) 0; + padding: rem-calc(6); + + .divider { + color: $text-light; + } + } + + .comment-user { + margin-top: rem-calc(6); + padding: rem-calc(6) 0; + overflow: hidden; + + @each $n in ("1", "2", "3","4", "5") { + &.level-#{$n} { + @if $n == "5" { + background: $comment-level-5; + padding: rem-calc(6) rem-calc(12); + } + @elseif $n == "1" { + background: none; + padding: rem-calc(6) rem-calc(12); + } + @else { + background: $comment-official; + padding: rem-calc(6) rem-calc(12); + } + } + } + + &.is-author { + background: $comment-author; + padding: rem-calc(6) rem-calc(12); + } + + &.is-admin { + background: $comment-admin; + padding: rem-calc(6) rem-calc(12); + } + + &.is-moderator { + @extend .is-admin; + } + + &.level-5 { + background: $comment-level-5; + padding: rem-calc(6) rem-calc(12); + } + } + } + + .is-deleted { + background: $deleted; + margin-left: rem-calc(42); + padding: rem-calc(6) rem-calc(12); + } + + .comment-children { + border-left: 1px dashed $border; + margin-left: rem-calc(42); + padding-left: rem-calc(6); + + @media only screen and (max-width: 40em) { + margin-left: rem-calc(16); + } + } + + .comment-info { + color: $text-light; + font-size: rem-calc(13); + font-weight: lighter; + margin-top: rem-calc(6); + vertical-align: middle; + + span.user-name { + color: $text; + font-weight: bold; + } + } + } +} + +.faded { + opacity: 0.4; +} + +// 19. Flags +// - - - - - - - - - - - - - - - - - - - - - - - - - + +.flag-content { + + .button { + background: none; + margin-bottom: 0; + padding: 0; + } +} + +.flag-disable { + color: $text-medium; + line-height: rem-calc(24); + vertical-align: middle; +} + +.flag-active { + @extend .flag-disable; + color: $delete; +} diff --git a/app/assets/stylesheets/proposals.scss b/app/assets/stylesheets/proposals.scss index 7689e93dd..92db612b7 100644 --- a/app/assets/stylesheets/proposals.scss +++ b/app/assets/stylesheets/proposals.scss @@ -6,8 +6,6 @@ // 02.2. List // 03. Show // 04. New -// 05. Comments -// 06. Flags // // 01. Proposals @@ -605,172 +603,3 @@ .proposal-edit { @extend .proposal-new; } - -// 05. Comments -// - - - - - - - - - - - - - - - - - - - - - - - - - - -.comments { - background: $white; - background-repeat: repeat-x; - padding-top: rem-calc(24); - padding-bottom: rem-calc(96); - - h2 { - margin: 0; - font-weight: bold; - - span { - font-size: rem-calc(18); - font-weight: normal; - opacity: .8; - } - } - - .comment { - margin: rem-calc(6) 0; - - p { - margin-bottom: 0; - } - - .comment-votes { - color: $text-medium; - font-weight: lighter; - line-height: rem-calc(24); - margin: rem-calc(10) rem-calc(12) rem-calc(6) 0; - - a { - color: $text-light; - display: inline-block; - vertical-align: top; - - &:hover { - color: $text-medium; - } - } - - [class^="icon-"] { - font-size: rem-calc(20); - vertical-align: middle; - } - } - - .comment-body { - margin-left: rem-calc(42); - - p { - font-size: rem-calc(14); - } - - .reply { - background: white; - border: 1px solid $border; - font-size: rem-calc(12); - margin: rem-calc(6) 0; - padding: rem-calc(6); - - .divider { - color: $text-light; - } - } - - .comment-user { - margin-top: rem-calc(6); - padding: rem-calc(6) 0; - overflow: hidden; - - @each $n in ("1", "2", "3","4", "5") { - &.level-#{$n} { - @if $n == "5" { - background: $comment-level-5; - padding: rem-calc(6) rem-calc(12); - } - @elseif $n == "1" { - background: none; - padding: rem-calc(6) rem-calc(12); - } - @else { - background: $comment-official; - padding: rem-calc(6) rem-calc(12); - } - } - } - - &.is-author { - background: $comment-author; - padding: rem-calc(6) rem-calc(12); - } - - &.is-admin { - background: $comment-admin; - padding: rem-calc(6) rem-calc(12); - } - - &.is-moderator { - @extend .is-admin; - } - - &.level-5 { - background: $comment-level-5; - padding: rem-calc(6) rem-calc(12); - } - } - } - - .is-deleted { - background: $deleted; - margin-left: rem-calc(42); - padding: rem-calc(6) rem-calc(12); - } - - .comment-children { - border-left: 1px dashed $border; - margin-left: rem-calc(42); - padding-left: rem-calc(6); - - @media only screen and (max-width: 40em) { - margin-left: rem-calc(16); - } - } - - .comment-info { - color: $text-light; - font-size: rem-calc(13); - font-weight: lighter; - margin-top: rem-calc(6); - vertical-align: middle; - - span.user-name { - color: $text; - font-weight: bold; - } - } - } -} - -.faded { - opacity: 0.4; -} - -// 06. Flags -// - - - - - - - - - - - - - - - - - - - - - - - - - - -.flag-content { - - .button { - background: none; - margin-bottom: 0; - padding: 0; - } -} - -.flag-disable { - color: $text-medium; - line-height: rem-calc(24); - vertical-align: middle; -} - -.flag-active { - @extend .flag-disable; - color: $delete; -} From df5a5ae7eb8e14431df89901a152c046b82f8ff8 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 9 Oct 2015 10:43:14 +0200 Subject: [PATCH 2/7] Cleans CSS for debates --- app/assets/stylesheets/debates.scss | 102 ++++++++++++++++++++++++---- 1 file changed, 88 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index 1155382dc..eff65e01a 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -66,7 +66,7 @@ } } - .like { + .like, .unlike { line-height: rem-calc(48); vertical-align: super; @@ -81,10 +81,6 @@ } } - .unlike { - @extend .like; - } - .voted { .icon-like { @extend .icon-like; @@ -297,16 +293,18 @@ } .debate { - @extend .debate-featured; margin-bottom: 0; margin-top: 0; .panel { + background: white; + border: 1px solid; + border-color: #e5e6e9 #dfe0e4 #d0d1d5; border-radius: 0; box-shadow: 0px 1px 3px 0 $border; margin-bottom: rem-calc(12); min-height: rem-calc(192); - padding-top: rem-calc(12); + padding: rem-calc(12) rem-calc(12) 0 rem-calc(12); @media (min-width: $small-breakpoint) { margin-bottom: rem-calc(-1); @@ -314,13 +312,36 @@ } .label-debate { + background: none; + clear: both; + color: $debates; + display: block; + font-size: rem-calc(12); + font-weight: bold; line-height: $line-height; padding-bottom: 0; + padding-left: 0; + padding-top: 0; + text-transform: uppercase; } h3 { - margin-top: 0; + font-weight: bold; + margin: 0; min-height: rem-calc(48); + + a { + clear: both; + color: $text; + display: block; + font-size: rem-calc(16); + line-height: $line-height; + text-transform: lowercase; + + &:first-letter { + text-transform: uppercase; + } + } } .debate-content { @@ -333,18 +354,75 @@ } .icon-debates { + color: $debates; font-size: rem-calc(18); left: rem-calc(60); + line-height: $line-height; + position: absolute; top: 0; } + .debate-info { + color: $text-medium; + font-weight: lighter; + margin-bottom: 0; + + .icon-comments { + font-size: rem-calc(16); + vertical-align: top; + } + + a { + color: $text-medium; + } + } + .debate-description { + color: $text; + font-size: rem-calc(13); height: rem-calc(72); + line-height: $line-height; + margin-bottom: rem-calc(12); margin-top: 0; + overflow: hidden; + position: relative; + + a { + color: $text; + } + + ul, ol { + + li { + font-size: rem-calc(13); + margin-bottom: rem-calc(12); + } + } + } + + .truncate { + background: image-url('truncate.png'); + background-repeat: repeat-x; + bottom: 0; + height: 24px; + position: absolute; + width: 100%; + } + + p { + color: $text; + font-size: rem-calc(14); + line-height: $line-height; + margin-bottom: rem-calc(12); + + &.debate-info { + font-size: rem-calc(13); + } } } .votes { + @include votes; border: 1px solid $votes-border; margin: 0 rem-calc(-12); @@ -388,7 +466,7 @@ } @media (min-width: $small-breakpoint) { - .like { + .like, .unlike { span { display: block; @@ -561,7 +639,7 @@ // 04. New // - - - - - - - - - - - - - - - - - - - - - - - - - -.debate-new { +.debate-new, .debate-edit { background: white; padding-top: rem-calc(24); @@ -609,7 +687,3 @@ } } } - -.debate-edit { - @extend .debate-new; -} From 72adf987419f0c8e21b6487ec6b5974a08b6ac6d Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 9 Oct 2015 11:20:57 +0200 Subject: [PATCH 3/7] Adds participation scss --- app/assets/stylesheets/application.scss | 1 + app/assets/stylesheets/debates.scss | 541 ++++------------- app/assets/stylesheets/participation.scss | 690 ++++++++++++++++++++++ app/assets/stylesheets/proposals.scss | 550 ++++------------- 4 files changed, 889 insertions(+), 893 deletions(-) create mode 100644 app/assets/stylesheets/participation.scss diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 94ddf4867..9cda8cab1 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -5,6 +5,7 @@ @import "variables"; @import "admin"; @import "layout"; +@import "participation"; @import "debates"; @import "proposals"; @import "c3"; \ No newline at end of file diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index eff65e01a..547d57a9b 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -5,282 +5,131 @@ // 02.1. Featured // 02.2. List // 03. Show -// 04. New // -// 01. Debates -// - - - - - - - - - - - - - - - - - - - - - - - - - - -@mixin votes { - background: $votes-bg; - border-top: 1px solid $votes-border; - margin: 0 rem-calc(-12); - padding: rem-calc(14) rem-calc(12); - position: relative; - - .icon-like { - background: white; - border: 2px solid $votes-border; - border-radius: rem-calc(3); - color: $text-light; - display: inline-block; - font-size: rem-calc(30); - line-height: rem-calc(30); - padding: rem-calc(3) rem-calc(6); - position: relative; - - &:hover { - background: $votes-like; - border-color: white; - color: white; - cursor: pointer; - opacity: 1 !important; - } - - &:active { - border-color: $votes-like-act; - } - } - - .icon-unlike { - background: white; - border: 2px solid $votes-border; - border-radius: rem-calc(3); - color: $text-light; - display: inline-block; - font-size: rem-calc(30); - line-height: rem-calc(30); - padding: rem-calc(3) rem-calc(6); - position: relative; - - &:hover { - background: $votes-unlike; - border-color: white; - color: white; - cursor: pointer; - opacity: 1 !important; - } - - &:active { - border-color: $votes-unlike-act; - } - } - - .like, .unlike { - line-height: rem-calc(48); - vertical-align: super; - - span { - color: white; - display: inline-block; - font-size: rem-calc(16); - font-weight: lighter; - line-height: $line-height*2; - padding-left: rem-calc(8); - vertical-align: top; - } - } - - .voted { - .icon-like { - @extend .icon-like; - background: $votes-like; - border-color: white; - color: white; - } - - .icon-unlike { - @extend .icon-unlike; - background: $votes-unlike; - border-color: white; - color: white; - } - } - - .no-voted { - .icon-like, .icon-unlike { - opacity: .5; - } - } - - .total-votes { - color: white; - float: right; - line-height: $line-height*2; - } - - .divider { - margin: 0 rem-calc(6); - } - - .not-logged { - background: rgba(22,99,135,.9); - color: white; - height: 100%; - left: 0; - line-height: $line-height*2; - padding-top: rem-calc(12); - position: absolute; - text-align: center; - top: 0; - width: 100%; - filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#222222', endColorstr='#222222'); /* IE */ - - a { - color: white; - text-decoration: underline; - } - } - - .anonymous-votes, .organizations-votes { - background: $warning-bg; - color: $warning-color; - height: 100%; - left: 0; - line-height: $line-height; - padding-top: rem-calc(12); - position: absolute; - text-align: center; - top: 0; - width: 100%; - - p { - color: $warning-color; - margin: 0 rem-calc(12); - text-align: left; - } - - a { - color: $warning-color; - font-weight: bold; - text-decoration: underline; - } - } -} - // 02. Index // - - - - - - - - - - - - - - - - - - - - - - - - - // 02.1. Featured // - - - - - - - - - - - - - -.debate-featured { +// .debate-featured { - .panel { - background: white; - border: 1px solid; - border-color: #e5e6e9 #dfe0e4 #d0d1d5; - border-radius: rem-calc(3); - margin-bottom: rem-calc(24); - padding: rem-calc(24) rem-calc(12) 0 rem-calc(12); +// .panel { +// background: white; +// border: 1px solid; +// border-color: #e5e6e9 #dfe0e4 #d0d1d5; +// border-radius: rem-calc(3); +// margin-bottom: rem-calc(24); +// padding: rem-calc(24) rem-calc(12) 0 rem-calc(12); - .debate-content { - min-height: rem-calc(353); - } +// .debate-content { +// min-height: rem-calc(353); +// } - .label-debate { - background: none; - clear: both; - color: $debates; - display: block; - font-size: rem-calc(12); - font-weight: bold; - text-transform: uppercase; - padding-left: 0; - padding-top: 0; - } +// .label-debate { +// background: none; +// clear: both; +// color: $debates; +// display: block; +// font-size: rem-calc(12); +// font-weight: bold; +// text-transform: uppercase; +// padding-left: 0; +// padding-top: 0; +// } - .icon-debates { - color: $debates; - font-size: rem-calc(36); - line-height: $line-height; - position: absolute; - right: rem-calc(18); - top: rem-calc(12); - } +// .icon-debates { +// color: $debates; +// font-size: rem-calc(36); +// line-height: $line-height; +// position: absolute; +// right: rem-calc(18); +// top: rem-calc(12); +// } - h3 { - font-weight: bold; - margin: rem-calc(8) 0 0 0; - min-height: rem-calc(65); +// h3 { +// font-weight: bold; +// margin: rem-calc(8) 0 0 0; +// min-height: rem-calc(65); - a { - clear: both; - color: $text; - display: block; - font-size: rem-calc(16); - line-height: $line-height; - text-transform: lowercase; +// a { +// clear: both; +// color: $text; +// display: block; +// font-size: rem-calc(16); +// line-height: $line-height; +// text-transform: lowercase; - &:first-letter { - text-transform: uppercase; - } - } - } +// &:first-letter { +// text-transform: uppercase; +// } +// } +// } - .debate-info { - color: $text-medium; - font-weight: lighter; - margin-bottom: 0; +// .debate-info { +// color: $text-medium; +// font-weight: lighter; +// margin-bottom: 0; - .icon-comments { - font-size: rem-calc(16); - vertical-align: top; - } +// .icon-comments { +// font-size: rem-calc(16); +// vertical-align: top; +// } - a { - color: $text-medium; - } - } +// a { +// color: $text-medium; +// } +// } - .debate-description { - color: $text; - font-size: rem-calc(13); - height: rem-calc(156); - line-height: $line-height; - margin-bottom: rem-calc(12); - margin-top: rem-calc(24); - overflow: hidden; - position: relative; +// .debate-description { +// color: $text; +// font-size: rem-calc(13); +// height: rem-calc(156); +// line-height: $line-height; +// margin-bottom: rem-calc(12); +// margin-top: rem-calc(24); +// overflow: hidden; +// position: relative; - a { - color: $text; - } +// a { +// color: $text; +// } - ul, ol { +// ul, ol { - li { - font-size: rem-calc(13); - margin-bottom: rem-calc(12); - } - } - } +// li { +// font-size: rem-calc(13); +// margin-bottom: rem-calc(12); +// } +// } +// } - .truncate { - background: image-url('truncate.png'); - background-repeat: repeat-x; - bottom: 0; - height: 24px; - position: absolute; - width: 100%; - } +// .truncate { +// background: image-url('truncate.png'); +// background-repeat: repeat-x; +// bottom: 0; +// height: 24px; +// position: absolute; +// width: 100%; +// } - p { - color: $text; - font-size: rem-calc(14); - line-height: $line-height; - margin-bottom: rem-calc(12); +// p { +// color: $text; +// font-size: rem-calc(14); +// line-height: $line-height; +// margin-bottom: rem-calc(12); - &.debate-info { - font-size: rem-calc(13); - } - } - } +// &.debate-info { +// font-size: rem-calc(13); +// } +// } +// } - .votes { - @include votes; - } -} +// .votes { +// @include votes; +// } +// } // 02.2. List // - - - - - - - - - - - - - @@ -495,195 +344,3 @@ } } } - -// 03. Show -// - - - - - - - - - - - - - - - - - - - - - - - - - - -.debate-show { - padding-top: rem-calc(12); - - .back { - @include back; - } - - .icon-angle-left { - @extend .back; - } - - h1 { - clear: both; - font-size: rem-calc(30); - font-weight: bold; - margin: 0; - text-transform: lowercase; - - &:first-letter { - text-transform: uppercase; - } - } - - .edit-debate { - margin-bottom: 0; - } - - .debate-info { - clear: both; - color: $text-medium; - font-weight: lighter; - line-height: $line-height*2; - text-align: justify; - - a { - color: $text-medium; - } - - p { - font-size: rem-calc(15); - line-height: $line-height; - margin-bottom: 0; - } - } - - .debate-description { - font-size: rem-calc(15); - line-height: rem-calc(30); - } - - ul, ol { - margin: rem-calc(12) 0; - - li { - font-size: rem-calc(15); - margin-bottom: rem-calc(15); - } - } - - .author-photo { - line-height: $line-height*2; - margin-right: rem-calc(6); - vertical-align: middle; - width: 32px; - } - - .author { - color: $text; - font-weight: bold; - } - - aside { - - h3 { - border-top: 2px solid $brand; - display: inline-block; - font-size: rem-calc(16); - margin: -1px 0 rem-calc(12); - padding-top: rem-calc(6); - text-transform: uppercase; - } - } - - .votes { - @include votes; - border: 0; - border-radius: 0; - margin: 0; - - .total-votes { - display: block; - float: none; - line-height: $line-height; - } - - .not-logged { - line-height: $line-height; - padding: rem-calc(24); - } - - @media (min-width: $small-breakpoint + em-calc(1)) and (max-width:$medium-breakpoint) { - .in-favor, .against { - text-align: left; - width: rem-calc(100); - } - } - - .divider { - display: none; - } - - @media (min-width: $medium-breakpoint) { - .divider { - display: inline-block; - } - } - } - - .leave-comment { - display: inline-block; - margin-top: rem-calc(24); - } - - .tags { - display: block; - margin: rem-calc(24) 0; - - a { - margin-right: rem-calc(6); - } - } -} - -.bullet { - color: $border; -} - -// 04. New -// - - - - - - - - - - - - - - - - - - - - - - - - - - -.debate-new, .debate-edit { - background: white; - padding-top: rem-calc(24); - - .back { - @include back; - } - - h1 { - clear: both; - font-size: rem-calc(36); - font-weight: bold; - line-height: $line-height*2; - margin-bottom: rem-calc(24); - } - - .icon-debates { - color: $debates; - font-size: rem-calc(60); - line-height: $line-height; - opacity: .5; - } - - h2 { - clear: both; - font-size: rem-calc(20); - font-weight: bold; - line-height: $line-height; - margin: 0; - } - - .recommendations { - list-style-type: none; - margin-left: 0; - margin-top: rem-calc(24); - - li { - font-size: rem-calc(12); - margin: rem-calc(12) 0; - - &:before { - color: $debates; - content: "l "; - font-family: "icons" !important; - } - } - } -} diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss new file mode 100644 index 000000000..deb13635a --- /dev/null +++ b/app/assets/stylesheets/participation.scss @@ -0,0 +1,690 @@ +// Table of Contents +// +// Styles for debates and proposals +// 01. Votes and supports +// 02. New participation +// 03. Show participation +// 04. Featured +// 05. +// + +// 01. Votes and supports +// - - - - - - - - - - - - - - - - - - - - - - - - - + +@mixin votes { + background: $votes-bg; + border-top: 1px solid $votes-border; + margin: 0 rem-calc(-12); + padding: rem-calc(14) rem-calc(12); + position: relative; + + .icon-like { + background: white; + border: 2px solid $votes-border; + border-radius: rem-calc(3); + color: $text-light; + display: inline-block; + font-size: rem-calc(30); + line-height: rem-calc(30); + padding: rem-calc(3) rem-calc(6); + position: relative; + + &:hover { + background: $votes-like; + border-color: white; + color: white; + cursor: pointer; + opacity: 1 !important; + } + + &:active { + border-color: $votes-like-act; + } + } + + .icon-unlike { + background: white; + border: 2px solid $votes-border; + border-radius: rem-calc(3); + color: $text-light; + display: inline-block; + font-size: rem-calc(30); + line-height: rem-calc(30); + padding: rem-calc(3) rem-calc(6); + position: relative; + + &:hover { + background: $votes-unlike; + border-color: white; + color: white; + cursor: pointer; + opacity: 1 !important; + } + + &:active { + border-color: $votes-unlike-act; + } + } + + .like, .unlike { + line-height: rem-calc(48); + vertical-align: super; + + span { + color: white; + display: inline-block; + font-size: rem-calc(16); + font-weight: lighter; + line-height: $line-height*2; + padding-left: rem-calc(8); + vertical-align: top; + } + } + + .voted { + .icon-like { + @extend .icon-like; + background: $votes-like; + border-color: white; + color: white; + } + + .icon-unlike { + @extend .icon-unlike; + background: $votes-unlike; + border-color: white; + color: white; + } + } + + .no-voted { + .icon-like, .icon-unlike { + opacity: .5; + } + } + + .total-votes { + color: white; + float: right; + line-height: $line-height*2; + } + + .divider { + margin: 0 rem-calc(6); + } + + .not-logged { + background: rgba(22,99,135,.9); + color: white; + height: 100%; + left: 0; + line-height: $line-height*2; + padding-top: rem-calc(12); + position: absolute; + text-align: center; + top: 0; + width: 100%; + filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#222222', endColorstr='#222222'); /* IE */ + + a { + color: white; + text-decoration: underline; + } + } + + .anonymous-votes, .organizations-votes { + background: $warning-bg; + color: $warning-color; + height: 100%; + left: 0; + line-height: $line-height; + padding-top: rem-calc(12); + position: absolute; + text-align: center; + top: 0; + width: 100%; + + p { + color: $warning-color; + margin: 0 rem-calc(12); + text-align: left; + } + + a { + color: $warning-color; + font-weight: bold; + text-decoration: underline; + } + } +} + +@mixin supports { + background: $proposals; + border-top: 1px solid $proposals-border; + margin: 0 rem-calc(-12); + padding: rem-calc(14) rem-calc(12); + position: relative; + + .progress { + background-color: rgba(255,255,255,.8); + height: rem-calc(12); + margin-bottom: rem-calc(6); + margin-top: rem-calc(4); + + .meter { + background: $votes-like; + } + } + + .percentage { + font-size: rem-calc(10); + color: $brand; + vertical-align: top; + position: absolute; + top: 17px; + right: 18px; + } + + abbr { + color: white; + + &[title] { + border-bottom: 1px dotted white; + } + } + + .button-support { + background: white; + color: $proposals; + display: inline-block; + font-size: rem-calc(14); + margin-top: rem-calc(12); + + &:hover { + background: $proposals-border; + color: white; + cursor: pointer; + } + + &:active { + opacity: .75; + } + } + + .total-supports { + color: white; + text-align: center; + font-size: rem-calc(14); + + span { + display: block; + font-size: rem-calc(11); + opacity: .75; + } + } + + .divider { + margin: 0 rem-calc(6); + } + + .not-logged { + background: rgba(255,164,45,.9); + color: white; + height: 100%; + left: 0; + line-height: $line-height*2; + padding-top: rem-calc(12); + position: absolute; + text-align: center; + top: 0; + width: 100%; + filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#222222', endColorstr='#222222'); /* IE */ + + a { + color: white; + text-decoration: underline; + } + } + + .anonymous-votes, .organizations-votes { + background: $warning-bg; + color: $warning-color; + height: 100%; + left: 0; + line-height: $line-height; + padding-top: rem-calc(12); + position: absolute; + text-align: center; + top: 0; + width: 100%; + + p { + color: $warning-color; + margin: 0 rem-calc(12); + text-align: left; + } + + a { + color: $warning-color; + font-weight: bold; + text-decoration: underline; + } + } + + .supported { + color: white; + margin-top: rem-calc(12); + } +} + +// 02. New participation +// - - - - - - - - - - - - - - - - - - - - - - - - - + +.debate-new, .debate-edit, .proposal-new, .proposal-edit, { + background: white; + padding-top: rem-calc(24); + + .back { + @include back; + } + + h1 { + clear: both; + font-size: rem-calc(36); + font-weight: bold; + line-height: $line-height*2; + margin-bottom: rem-calc(24); + } + + .icon-debates { + color: $debates; + font-size: rem-calc(60); + line-height: $line-height; + opacity: .5; + } + + .icon-proposals { + color: $proposals; + font-size: rem-calc(50); + line-height: $line-height; + opacity: .5; + } + + h2 { + clear: both; + font-size: rem-calc(20); + font-weight: bold; + line-height: $line-height; + margin: 0; + } + + .recommendations { + list-style-type: none; + margin-left: 0; + margin-top: rem-calc(24); + + li { + font-size: rem-calc(12); + margin: rem-calc(12) 0; + + &:before { + content: "l "; + font-family: "icons" !important; + } + } + } +} + +.debate-new, .debate-edit { + + .recommendations li:before { + color: $debates; + } +} + +.proposal-new, .proposal-edit { + + .recommendations li:before { + color: $proposals; + } +} + +// 02. Show participation +// - - - - - - - - - - - - - - - - - - - - - - - - - + +.debate-show, .proposal-show { + padding-top: rem-calc(12); + + .back, .icon-angle-left { + @include back; + } + + h1 { + clear: both; + font-size: rem-calc(30); + font-weight: bold; + margin: 0; + text-transform: lowercase; + + &:first-letter { + text-transform: uppercase; + } + } + + h4 { + margin: rem-calc(12) 0; + } + + .edit-debate, .edit-proposal { + margin-bottom: 0; + } + + .debate-info, .proposal-info { + clear: both; + color: $text-medium; + font-weight: lighter; + line-height: $line-height*2; + text-align: justify; + + a { + color: $text-medium; + } + + p { + font-size: rem-calc(15); + line-height: $line-height; + margin-bottom: 0; + } + } + + .debate-description, .proposal-description { + font-size: rem-calc(15); + line-height: rem-calc(30); + } + + ul, ol { + margin: rem-calc(12) 0; + + li { + font-size: rem-calc(15); + margin-bottom: rem-calc(15); + } + } + + .author-photo { + line-height: $line-height*2; + margin-right: rem-calc(6); + vertical-align: middle; + width: 32px; + } + + .author { + color: $text; + font-weight: bold; + } + + aside { + + h3 { + border-top: 2px solid $brand; + display: inline-block; + font-size: rem-calc(16); + margin: -1px 0 rem-calc(12); + padding-top: rem-calc(6); + text-transform: uppercase; + } + } + + blockquote { + margin-top: rem-calc(12); + padding-top: 0; + font-size: rem-calc(15); + line-height: rem-calc(30); + } + + .document-link { + border: 1px solid $border; + display: block; + margin-top: rem-calc(12); + padding: rem-calc(12); + position: relative; + + a { + padding-left: rem-calc(24); + } + + :before { + color: #007BB7; + content: "G"; + font-family: "icons" !important; + font-size: rem-calc(24); + left: rem-calc(6); + padding-top: rem-calc(3); + position: absolute; + top: 0; + } + } + + .video-link { + @extend .document-link; + + :before { + color: #CC181E; + content: "D"; + } + } + + .votes { + @include votes; + border: 0; + border-radius: 0; + margin: 0; + + .total-votes { + display: block; + float: none; + line-height: $line-height; + } + + .not-logged { + line-height: $line-height; + padding: rem-calc(24); + } + + @media (min-width: $small-breakpoint + em-calc(1)) and (max-width:$medium-breakpoint) { + .in-favor, .against { + text-align: left; + width: rem-calc(100); + } + } + + .divider { + display: none; + } + + @media (min-width: $medium-breakpoint) { + .divider { + display: inline-block; + } + } + } + + .supports { + @include supports; + border: 0; + border-radius: 0; + margin: 0; + + .total-supports { + display: block; + float: none; + line-height: $line-height; + } + + .not-logged { + line-height: $line-height; + padding: rem-calc(24); + } + } + + .leave-comment { + display: inline-block; + margin-top: rem-calc(24); + } + + .tags { + display: block; + margin: rem-calc(24) 0; + + a { + margin-right: rem-calc(6); + } + } +} + +.bullet { + color: $border; +} + +// 04. Featured +// - - - - - - - - - - - - - - - - - - - - - - - - - + +.debate-featured, .proposal-featured { + + .panel { + background: white; + border: 1px solid; + border-color: #E5E6E9 #DFE0E4 #D0D1D5; + border-radius: rem-calc(3); + margin-bottom: rem-calc(24); + padding: rem-calc(24) rem-calc(12) 0 rem-calc(12); + + .debate-content, .proposal-content { + min-height: rem-calc(353); + } + + .label-debate, .label-proposal { + background: none; + clear: both; + display: block; + font-size: rem-calc(12); + font-weight: bold; + text-transform: uppercase; + padding-left: 0; + padding-top: 0; + } + + .label-debate { + color: $debates; + } + + .label-proposal { + color: $proposals; + } + + .icon-debates, .icon-proposals { + font-size: rem-calc(36); + line-height: $line-height; + position: absolute; + right: rem-calc(18); + top: rem-calc(12); + } + + .icon-debates { + color: $debates; + } + + .icon-proposals { + color: $proposals; + } + + h3 { + font-weight: bold; + margin: rem-calc(8) 0 0 0; + min-height: rem-calc(65); + + a { + clear: both; + color: $text; + display: block; + font-size: rem-calc(16); + line-height: $line-height; + text-transform: lowercase; + + &:first-letter { + text-transform: uppercase; + } + } + } + + .debate-info, .proposal-info { + color: $text-medium; + font-weight: lighter; + margin-bottom: 0; + + .icon-comments { + font-size: rem-calc(16); + vertical-align: top; + } + + a { + color: $text-medium; + } + } + + .debate-description, .proposal-description { + color: $text; + font-size: rem-calc(13); + height: rem-calc(156); + line-height: $line-height; + margin-bottom: rem-calc(12); + margin-top: rem-calc(24); + overflow: hidden; + position: relative; + + a { + color: $text; + } + + ul, ol { + + li { + font-size: rem-calc(13); + margin-bottom: rem-calc(12); + } + } + } + + .truncate { + background: image-url('truncate.png'); + background-repeat: repeat-x; + bottom: 0; + height: 24px; + position: absolute; + width: 100%; + } + + p { + color: $text; + font-size: rem-calc(14); + line-height: $line-height; + margin-bottom: rem-calc(12); + + &.debate-info { + font-size: rem-calc(13); + } + } + } + + .supports { + @include supports; + } + + .votes { + @include votes; + } +} + + + + diff --git a/app/assets/stylesheets/proposals.scss b/app/assets/stylesheets/proposals.scss index 92db612b7..d2cdac183 100644 --- a/app/assets/stylesheets/proposals.scss +++ b/app/assets/stylesheets/proposals.scss @@ -5,138 +5,8 @@ // 02.1. Featured // 02.2. List // 03. Show -// 04. New // -// 01. Proposals -// - - - - - - - - - - - - - - - - - - - - - - - - - - -.button-proposal { - background: $proposals; - - &:hover { - background: $proposals-border; - } -} - -@mixin supports { - background: $proposals; - border-top: 1px solid $proposals-border; - margin: 0 rem-calc(-12); - padding: rem-calc(14) rem-calc(12); - position: relative; - - .progress { - background-color: rgba(255,255,255,.8); - height: rem-calc(12); - margin-bottom: rem-calc(6); - margin-top: rem-calc(4); - - .meter { - background: $votes-like; - } - } - - .percentage { - font-size: rem-calc(10); - color: $brand; - vertical-align: top; - position: absolute; - top: 17px; - right: 18px; - } - - abbr { - color: white; - - &[title] { - border-bottom: 1px dotted white; - } - } - - .button-support { - background: white; - color: $proposals; - display: inline-block; - font-size: rem-calc(14); - margin-top: rem-calc(12); - - &:hover { - background: $proposals-border; - color: white; - cursor: pointer; - } - - &:active { - opacity: .75; - } - } - - .total-supports { - color: white; - text-align: center; - font-size: rem-calc(14); - - span { - display: block; - font-size: rem-calc(11); - opacity: .75; - } - } - - .divider { - margin: 0 rem-calc(6); - } - - .not-logged { - background: rgba(255,164,45,.9); - color: white; - height: 100%; - left: 0; - line-height: $line-height*2; - padding-top: rem-calc(12); - position: absolute; - text-align: center; - top: 0; - width: 100%; - filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#222222', endColorstr='#222222'); /* IE */ - - a { - color: white; - text-decoration: underline; - } - } - - .anonymous-votes, .organizations-votes { - background: $warning-bg; - color: $warning-color; - height: 100%; - left: 0; - line-height: $line-height; - padding-top: rem-calc(12); - position: absolute; - text-align: center; - top: 0; - width: 100%; - - p { - color: $warning-color; - margin: 0 rem-calc(12); - text-align: left; - } - - a { - color: $warning-color; - font-weight: bold; - text-decoration: underline; - } - } - - .supported { - color: white; - margin-top: rem-calc(12); - } -} // 02. Index // - - - - - - - - - - - - - - - - - - - - - - - - - @@ -144,123 +14,123 @@ // 02.1. Featured // - - - - - - - - - - - - - -.proposal-featured { +// .proposal-featured { - .panel { - background: white; - border: 1px solid; - border-color: #e5e6e9 #dfe0e4 #d0d1d5; - border-radius: rem-calc(3); - margin-bottom: rem-calc(24); - padding: rem-calc(24) rem-calc(12) 0 rem-calc(12); +// .panel { +// background: white; +// border: 1px solid; +// border-color: #e5e6e9 #dfe0e4 #d0d1d5; +// border-radius: rem-calc(3); +// margin-bottom: rem-calc(24); +// padding: rem-calc(24) rem-calc(12) 0 rem-calc(12); - .proposal-content { - min-height: rem-calc(353); - } +// .proposal-content { +// min-height: rem-calc(353); +// } - .label-proposal { - background: none; - clear: both; - color: $proposals; - display: block; - font-size: rem-calc(12); - font-weight: bold; - text-transform: uppercase; - padding-left: 0; - padding-top: 0; - } +// .label-proposal { +// background: none; +// clear: both; +// color: $proposals; +// display: block; +// font-size: rem-calc(12); +// font-weight: bold; +// text-transform: uppercase; +// padding-left: 0; +// padding-top: 0; +// } - .icon-proposals { - color: $proposals; - font-size: rem-calc(36); - line-height: $line-height; - position: absolute; - right: rem-calc(18); - top: rem-calc(12); - } +// .icon-proposals { +// color: $proposals; +// font-size: rem-calc(36); +// line-height: $line-height; +// position: absolute; +// right: rem-calc(18); +// top: rem-calc(12); +// } - h3 { - font-weight: bold; - margin: rem-calc(8) 0 0 0; - min-height: rem-calc(65); +// h3 { +// font-weight: bold; +// margin: rem-calc(8) 0 0 0; +// min-height: rem-calc(65); - a { - clear: both; - color: $text; - display: block; - font-size: rem-calc(16); - line-height: $line-height; - text-transform: lowercase; +// a { +// clear: both; +// color: $text; +// display: block; +// font-size: rem-calc(16); +// line-height: $line-height; +// text-transform: lowercase; - &:first-letter { - text-transform: uppercase; - } - } - } +// &:first-letter { +// text-transform: uppercase; +// } +// } +// } - .proposal-info { - color: $text-medium; - font-weight: lighter; - margin-bottom: 0; +// .proposal-info { +// color: $text-medium; +// font-weight: lighter; +// margin-bottom: 0; - .icon-comments { - font-size: rem-calc(16); - vertical-align: top; - } +// .icon-comments { +// font-size: rem-calc(16); +// vertical-align: top; +// } - a { - color: $text-medium; - } - } +// a { +// color: $text-medium; +// } +// } - .proposal-description { - color: $text; - font-size: rem-calc(13); - height: rem-calc(156); - line-height: $line-height; - margin-bottom: rem-calc(12); - margin-top: rem-calc(24); - overflow: hidden; - position: relative; +// .proposal-description { +// color: $text; +// font-size: rem-calc(13); +// height: rem-calc(156); +// line-height: $line-height; +// margin-bottom: rem-calc(12); +// margin-top: rem-calc(24); +// overflow: hidden; +// position: relative; - a { - color: $text; - } +// a { +// color: $text; +// } - ul, ol { +// ul, ol { - li { - font-size: rem-calc(13); - margin-bottom: rem-calc(12); - } - } - } +// li { +// font-size: rem-calc(13); +// margin-bottom: rem-calc(12); +// } +// } +// } - .truncate { - background: image-url('truncate.png'); - background-repeat: repeat-x; - bottom: 0; - height: 24px; - position: absolute; - width: 100%; - } +// .truncate { +// background: image-url('truncate.png'); +// background-repeat: repeat-x; +// bottom: 0; +// height: 24px; +// position: absolute; +// width: 100%; +// } - p { - color: $text; - font-size: rem-calc(14); - line-height: $line-height; - margin-bottom: rem-calc(12); +// p { +// color: $text; +// font-size: rem-calc(14); +// line-height: $line-height; +// margin-bottom: rem-calc(12); - &.debate-info { - font-size: rem-calc(13); - } - } - } +// &.debate-info { +// font-size: rem-calc(13); +// } +// } +// } - .supports { - @include supports; - } -} +// .supports { +// @include supports; +// } +// } // 02.2. List // - - - - - - - - - - - - - @@ -381,225 +251,3 @@ } } } - -// 03. Show -// - - - - - - - - - - - - - - - - - - - - - - - - - - -.proposal-show { - padding-top: rem-calc(12); - - .back { - @include back; - } - - .icon-angle-left { - @extend .back; - } - - h1 { - clear: both; - font-size: rem-calc(30); - font-weight: bold; - margin: 0; - text-transform: lowercase; - - &:first-letter { - text-transform: uppercase; - } - } - - h4 { - margin: rem-calc(12) 0; - } - - .edit-proposal { - margin-bottom: 0; - } - - .proposal-info { - clear: both; - color: $text-medium; - font-weight: lighter; - line-height: $line-height*2; - text-align: justify; - - a { - color: $text-medium; - } - - p { - font-size: rem-calc(15); - line-height: $line-height; - margin-bottom: 0; - } - } - - .proposal-description { - font-size: rem-calc(15); - line-height: rem-calc(30); - } - - ul, ol { - margin: rem-calc(12) 0; - - li { - font-size: rem-calc(15); - margin-bottom: rem-calc(15); - } - } - - .author-photo { - line-height: $line-height*2; - margin-right: rem-calc(6); - vertical-align: middle; - width: 32px; - } - - .author { - color: $text; - font-weight: bold; - } - - aside { - - h3 { - border-top: 2px solid $brand; - display: inline-block; - font-size: rem-calc(16); - margin: -1px 0 rem-calc(12); - padding-top: rem-calc(6); - text-transform: uppercase; - } - } - - blockquote { - margin-top: rem-calc(12); - padding-top: 0; - font-size: rem-calc(15); - line-height: rem-calc(30); - } - - .document-link { - border: 1px solid $border; - display: block; - margin-top: rem-calc(12); - padding: rem-calc(12); - position: relative; - - a { - padding-left: rem-calc(24); - } - - :before { - color: #007BB7; - content: "G"; - font-family: "icons" !important; - font-size: rem-calc(24); - left: rem-calc(6); - padding-top: rem-calc(3); - position: absolute; - top: 0; - } - } - - .video-link { - @extend .document-link; - - :before { - color: #CC181E; - content: "D"; - } - } - - .supports { - @include supports; - border: 0; - border-radius: 0; - margin: 0; - - .total-supports { - display: block; - float: none; - line-height: $line-height; - } - - .not-logged { - line-height: $line-height; - padding: rem-calc(24); - } - } - - .leave-comment { - display: inline-block; - margin-top: rem-calc(24); - } - - .tags { - display: block; - margin: rem-calc(24) 0; - - a { - margin-right: rem-calc(6); - } - } -} - -.bullet { - color: $border; -} - -// 04. New -// - - - - - - - - - - - - - - - - - - - - - - - - - - -.proposal-new { - background: white; - padding-top: rem-calc(24); - - .back { - @include back; - } - - h1 { - clear: both; - font-size: rem-calc(36); - font-weight: bold; - line-height: $line-height*2; - margin-bottom: rem-calc(24); - } - - .icon-proposals { - color: $proposals; - font-size: rem-calc(50); - line-height: $line-height; - opacity: .5; - } - - h2 { - clear: both; - font-size: rem-calc(20); - font-weight: bold; - line-height: $line-height; - margin: 0; - } - - .recommendations { - list-style-type: none; - margin-left: 0; - margin-top: rem-calc(24); - - li { - font-size: rem-calc(12); - margin: rem-calc(12) 0; - - &:before { - color: $proposals; - content: "l "; - font-family: "icons" !important; - } - } - } -} - -.proposal-edit { - @extend .proposal-new; -} From 1341fb449322a201462ebedb1eb1670d6c250aca Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 9 Oct 2015 13:14:06 +0200 Subject: [PATCH 4/7] Merges debates and proposals on participation.scss --- app/assets/stylesheets/application.scss | 2 - app/assets/stylesheets/debates.scss | 346 ---------------------- app/assets/stylesheets/participation.scss | 212 ++++++++++--- app/assets/stylesheets/proposals.scss | 253 ---------------- 4 files changed, 171 insertions(+), 642 deletions(-) delete mode 100644 app/assets/stylesheets/debates.scss delete mode 100644 app/assets/stylesheets/proposals.scss diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 9cda8cab1..b9f9ca39e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -6,6 +6,4 @@ @import "admin"; @import "layout"; @import "participation"; -@import "debates"; -@import "proposals"; @import "c3"; \ No newline at end of file diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss deleted file mode 100644 index 547d57a9b..000000000 --- a/app/assets/stylesheets/debates.scss +++ /dev/null @@ -1,346 +0,0 @@ -// Table of Contents -// -// 01. Debates -// 02. Index -// 02.1. Featured -// 02.2. List -// 03. Show -// - -// 02. Index -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// 02.1. Featured -// - - - - - - - - - - - - - - -// .debate-featured { - -// .panel { -// background: white; -// border: 1px solid; -// border-color: #e5e6e9 #dfe0e4 #d0d1d5; -// border-radius: rem-calc(3); -// margin-bottom: rem-calc(24); -// padding: rem-calc(24) rem-calc(12) 0 rem-calc(12); - -// .debate-content { -// min-height: rem-calc(353); -// } - -// .label-debate { -// background: none; -// clear: both; -// color: $debates; -// display: block; -// font-size: rem-calc(12); -// font-weight: bold; -// text-transform: uppercase; -// padding-left: 0; -// padding-top: 0; -// } - -// .icon-debates { -// color: $debates; -// font-size: rem-calc(36); -// line-height: $line-height; -// position: absolute; -// right: rem-calc(18); -// top: rem-calc(12); -// } - -// h3 { -// font-weight: bold; -// margin: rem-calc(8) 0 0 0; -// min-height: rem-calc(65); - -// a { -// clear: both; -// color: $text; -// display: block; -// font-size: rem-calc(16); -// line-height: $line-height; -// text-transform: lowercase; - -// &:first-letter { -// text-transform: uppercase; -// } -// } -// } - -// .debate-info { -// color: $text-medium; -// font-weight: lighter; -// margin-bottom: 0; - -// .icon-comments { -// font-size: rem-calc(16); -// vertical-align: top; -// } - -// a { -// color: $text-medium; -// } -// } - -// .debate-description { -// color: $text; -// font-size: rem-calc(13); -// height: rem-calc(156); -// line-height: $line-height; -// margin-bottom: rem-calc(12); -// margin-top: rem-calc(24); -// overflow: hidden; -// position: relative; - -// a { -// color: $text; -// } - -// ul, ol { - -// li { -// font-size: rem-calc(13); -// margin-bottom: rem-calc(12); -// } -// } -// } - -// .truncate { -// background: image-url('truncate.png'); -// background-repeat: repeat-x; -// bottom: 0; -// height: 24px; -// position: absolute; -// width: 100%; -// } - -// p { -// color: $text; -// font-size: rem-calc(14); -// line-height: $line-height; -// margin-bottom: rem-calc(12); - -// &.debate-info { -// font-size: rem-calc(13); -// } -// } -// } - -// .votes { -// @include votes; -// } -// } - -// 02.2. List -// - - - - - - - - - - - - - - -.debates-list { - - @media (min-width: $small-breakpoint) { - margin-bottom: rem-calc(48); - } -} - -.debate { - margin-bottom: 0; - margin-top: 0; - - .panel { - background: white; - border: 1px solid; - border-color: #e5e6e9 #dfe0e4 #d0d1d5; - border-radius: 0; - box-shadow: 0px 1px 3px 0 $border; - margin-bottom: rem-calc(12); - min-height: rem-calc(192); - padding: rem-calc(12) rem-calc(12) 0 rem-calc(12); - - @media (min-width: $small-breakpoint) { - margin-bottom: rem-calc(-1); - padding-bottom: rem-calc(12); - } - - .label-debate { - background: none; - clear: both; - color: $debates; - display: block; - font-size: rem-calc(12); - font-weight: bold; - line-height: $line-height; - padding-bottom: 0; - padding-left: 0; - padding-top: 0; - text-transform: uppercase; - } - - h3 { - font-weight: bold; - margin: 0; - min-height: rem-calc(48); - - a { - clear: both; - color: $text; - display: block; - font-size: rem-calc(16); - line-height: $line-height; - text-transform: lowercase; - - &:first-letter { - text-transform: uppercase; - } - } - } - - .debate-content { - margin: 0; - min-height: rem-calc(180); - - .tags { - display: block; - } - } - - .icon-debates { - color: $debates; - font-size: rem-calc(18); - left: rem-calc(60); - line-height: $line-height; - position: absolute; - top: 0; - } - - .debate-info { - color: $text-medium; - font-weight: lighter; - margin-bottom: 0; - - .icon-comments { - font-size: rem-calc(16); - vertical-align: top; - } - - a { - color: $text-medium; - } - } - - .debate-description { - color: $text; - font-size: rem-calc(13); - height: rem-calc(72); - line-height: $line-height; - margin-bottom: rem-calc(12); - margin-top: 0; - overflow: hidden; - position: relative; - - a { - color: $text; - } - - ul, ol { - - li { - font-size: rem-calc(13); - margin-bottom: rem-calc(12); - } - } - } - - .truncate { - background: image-url('truncate.png'); - background-repeat: repeat-x; - bottom: 0; - height: 24px; - position: absolute; - width: 100%; - } - - p { - color: $text; - font-size: rem-calc(14); - line-height: $line-height; - margin-bottom: rem-calc(12); - - &.debate-info { - font-size: rem-calc(13); - } - } - } - - .votes { - @include votes; - border: 1px solid $votes-border; - margin: 0 rem-calc(-12); - - @media (min-width: $small-breakpoint) { - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; - margin: 0 rem-calc(-25) 0 rem-calc(12); - } - - &:after { - content: none; - 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; - - @media (min-width: $small-breakpoint) { - content: ""; - } - } - - .total-votes { - display: inline-block; - line-height: $line-height; - margin-left: rem-calc(24); - padding-top: rem-calc(12); - vertical-align: top; - - @media (min-width: $small-breakpoint) { - display: block; - float: none; - line-height: $line-height*2; - margin-left: 0; - padding-top: 0; - } - } - - @media (min-width: $small-breakpoint) { - .like, .unlike { - - span { - display: block; - line-height: $line-height/2; - } - } - } - - .not-logged { - line-height: $line-height; - padding-top: rem-calc(24); - } - - .anonymous-votes, .organizations-votes { - padding-top: rem-calc(24); - } - - .divider { - display: none; - } - - @media (min-width: $medium-breakpoint) { - .divider { - display: inline-block; - } - } - } -} diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index deb13635a..9aa06dd04 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1,11 +1,9 @@ -// Table of Contents +// Table of Contents - Styles for debates and proposals // -// Styles for debates and proposals // 01. Votes and supports // 02. New participation // 03. Show participation -// 04. Featured -// 05. +// 04. List participation // // 01. Votes and supports @@ -83,14 +81,12 @@ .voted { .icon-like { - @extend .icon-like; background: $votes-like; border-color: white; color: white; } .icon-unlike { - @extend .icon-unlike; background: $votes-unlike; border-color: white; color: white; @@ -442,7 +438,7 @@ line-height: rem-calc(30); } - .document-link { + .document-link, .video-link { border: 1px solid $border; display: block; margin-top: rem-calc(12); @@ -466,7 +462,6 @@ } .video-link { - @extend .document-link; :before { color: #CC181E; @@ -546,21 +541,33 @@ color: $border; } -// 04. Featured +// 04. List participation // - - - - - - - - - - - - - - - - - - - - - - - - - -.debate-featured, .proposal-featured { +.debates-list, .proposals-list { + + @media (min-width: $small-breakpoint) { + margin-bottom: rem-calc(48); + } +} + +.debate, .proposal { + margin-bottom: 0; + margin-top: 0; .panel { background: white; border: 1px solid; - border-color: #E5E6E9 #DFE0E4 #D0D1D5; - border-radius: rem-calc(3); - margin-bottom: rem-calc(24); - padding: rem-calc(24) rem-calc(12) 0 rem-calc(12); + border-color: #e5e6e9 #dfe0e4 #d0d1d5; + border-radius: 0; + box-shadow: 0px 1px 3px 0 $border; + margin-bottom: rem-calc(12); + min-height: rem-calc(192); + padding: rem-calc(12) rem-calc(12) 0 rem-calc(12); - .debate-content, .proposal-content { - min-height: rem-calc(353); + @media (min-width: $small-breakpoint) { + margin-bottom: rem-calc(-1); + padding-bottom: rem-calc(12); } .label-debate, .label-proposal { @@ -569,9 +576,11 @@ display: block; font-size: rem-calc(12); font-weight: bold; - text-transform: uppercase; + line-height: $line-height; + padding-bottom: 0; padding-left: 0; padding-top: 0; + text-transform: uppercase; } .label-debate { @@ -582,26 +591,10 @@ color: $proposals; } - .icon-debates, .icon-proposals { - font-size: rem-calc(36); - line-height: $line-height; - position: absolute; - right: rem-calc(18); - top: rem-calc(12); - } - - .icon-debates { - color: $debates; - } - - .icon-proposals { - color: $proposals; - } - h3 { font-weight: bold; - margin: rem-calc(8) 0 0 0; - min-height: rem-calc(65); + margin: 0; + min-height: rem-calc(48); a { clear: both; @@ -617,6 +610,32 @@ } } + .debate-content, .proposal-content { + margin: 0; + min-height: rem-calc(180); + + .tags { + display: block; + } + } + + .icon-debates, .icon-proposals { + font-size: rem-calc(18); + line-height: $line-height; + position: absolute; + top: 0; + } + + .icon-debates { + color: $debates; + left: rem-calc(60); + } + + .icon-proposals { + color: $proposals; + left: rem-calc(88); + } + .debate-info, .proposal-info { color: $text-medium; font-weight: lighter; @@ -635,10 +654,10 @@ .debate-description, .proposal-description { color: $text; font-size: rem-calc(13); - height: rem-calc(156); + height: rem-calc(72); line-height: $line-height; margin-bottom: rem-calc(12); - margin-top: rem-calc(24); + margin-top: 0; overflow: hidden; position: relative; @@ -676,15 +695,126 @@ } } - .supports { - @include supports; + .not-logged { + line-height: $line-height; + padding-top: rem-calc(24); } - .votes { - @include votes; + .anonymous-votes, .organizations-votes { + padding-top: rem-calc(24); + } + + .divider { + display: none; + } + + @media (min-width: $medium-breakpoint) { + .divider { + display: inline-block; + } } } +.debate { + .votes { + @include votes; + border: 1px solid $votes-border; + margin: 0 rem-calc(-12); + @media (min-width: $small-breakpoint) { + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; + margin: 0 rem-calc(-25) 0 rem-calc(12); + } + &:after { + content: none; + 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; + + @media (min-width: $small-breakpoint) { + content: ""; + } + } + + .total-votes { + display: inline-block; + line-height: $line-height; + margin-left: rem-calc(24); + padding-top: rem-calc(12); + vertical-align: top; + + @media (min-width: $small-breakpoint) { + display: block; + float: none; + line-height: $line-height*2; + margin-left: 0; + padding-top: 0; + } + } + + @media (min-width: $small-breakpoint) { + .like, .unlike { + + span { + display: block; + line-height: $line-height/2; + } + } + } + } +} + +.proposal { + + .supports { + @include supports; + border: 1px solid $proposals-border; + margin: 0 rem-calc(-12); + + @media (min-width: $small-breakpoint) { + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; + margin: 0 rem-calc(-25) 0 rem-calc(12); + } + + &:after { + content: none; + position: absolute; + display: block; + border-style: solid; + border-color: #664212 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; + + @media (min-width: $small-breakpoint) { + content: ""; + } + } + + .total-supports { + display: inline-block; + line-height: $line-height; + padding-top: rem-calc(12); + vertical-align: top; + + @media (min-width: $small-breakpoint) { + display: block; + float: none; + margin-left: 0; + padding-top: 0; + } + } + } +} diff --git a/app/assets/stylesheets/proposals.scss b/app/assets/stylesheets/proposals.scss deleted file mode 100644 index d2cdac183..000000000 --- a/app/assets/stylesheets/proposals.scss +++ /dev/null @@ -1,253 +0,0 @@ -// Table of Contents -// -// 01. Debates -// 02. Index -// 02.1. Featured -// 02.2. List -// 03. Show -// - - -// 02. Index -// - - - - - - - - - - - - - - - - - - - - - - - - - - -// 02.1. Featured -// - - - - - - - - - - - - - - -// .proposal-featured { - -// .panel { -// background: white; -// border: 1px solid; -// border-color: #e5e6e9 #dfe0e4 #d0d1d5; -// border-radius: rem-calc(3); -// margin-bottom: rem-calc(24); -// padding: rem-calc(24) rem-calc(12) 0 rem-calc(12); - -// .proposal-content { -// min-height: rem-calc(353); -// } - -// .label-proposal { -// background: none; -// clear: both; -// color: $proposals; -// display: block; -// font-size: rem-calc(12); -// font-weight: bold; -// text-transform: uppercase; -// padding-left: 0; -// padding-top: 0; -// } - -// .icon-proposals { -// color: $proposals; -// font-size: rem-calc(36); -// line-height: $line-height; -// position: absolute; -// right: rem-calc(18); -// top: rem-calc(12); -// } - -// h3 { -// font-weight: bold; -// margin: rem-calc(8) 0 0 0; -// min-height: rem-calc(65); - -// a { -// clear: both; -// color: $text; -// display: block; -// font-size: rem-calc(16); -// line-height: $line-height; -// text-transform: lowercase; - -// &:first-letter { -// text-transform: uppercase; -// } -// } -// } - -// .proposal-info { -// color: $text-medium; -// font-weight: lighter; -// margin-bottom: 0; - -// .icon-comments { -// font-size: rem-calc(16); -// vertical-align: top; -// } - -// a { -// color: $text-medium; -// } -// } - -// .proposal-description { -// color: $text; -// font-size: rem-calc(13); -// height: rem-calc(156); -// line-height: $line-height; -// margin-bottom: rem-calc(12); -// margin-top: rem-calc(24); -// overflow: hidden; -// position: relative; - -// a { -// color: $text; -// } - -// ul, ol { - -// li { -// font-size: rem-calc(13); -// margin-bottom: rem-calc(12); -// } -// } -// } - -// .truncate { -// background: image-url('truncate.png'); -// background-repeat: repeat-x; -// bottom: 0; -// height: 24px; -// position: absolute; -// width: 100%; -// } - -// p { -// color: $text; -// font-size: rem-calc(14); -// line-height: $line-height; -// margin-bottom: rem-calc(12); - -// &.debate-info { -// font-size: rem-calc(13); -// } -// } -// } - -// .supports { -// @include supports; -// } -// } - -// 02.2. List -// - - - - - - - - - - - - - - -.proposals-list { - - @media (min-width: $small-breakpoint) { - margin-bottom: rem-calc(48); - } -} - -.proposal { - @extend .proposal-featured; - margin-bottom: 0; - margin-top: 0; - - .panel { - border-radius: 0; - box-shadow: 0px 1px 3px 0 $border; - margin-bottom: rem-calc(12); - min-height: rem-calc(192); - padding-top: rem-calc(12); - - @media (min-width: $small-breakpoint) { - margin-bottom: rem-calc(-1); - padding-bottom: rem-calc(12); - } - - .label-proposal { - line-height: $line-height; - padding-bottom: 0; - } - - h3 { - margin-top: 0; - min-height: rem-calc(48); - } - - .proposal-content { - margin: 0; - min-height: rem-calc(180); - - .tags { - display: block; - } - } - - .icon-proposals { - font-size: rem-calc(18); - left: rem-calc(88); - top: 0; - } - - .proposal-description { - height: rem-calc(72); - margin-top: 0; - } - } - - .supports { - border: 1px solid $proposals-border; - margin: 0 rem-calc(-12); - - @media (min-width: $small-breakpoint) { - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; - margin: 0 rem-calc(-25) 0 rem-calc(12); - } - - &:after { - content: none; - position: absolute; - display: block; - border-style: solid; - border-color: #664212 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; - - @media (min-width: $small-breakpoint) { - content: ""; - } - } - - .total-supports { - display: inline-block; - line-height: $line-height; - padding-top: rem-calc(12); - vertical-align: top; - - @media (min-width: $small-breakpoint) { - display: block; - float: none; - margin-left: 0; - padding-top: 0; - } - } - - .not-logged { - line-height: $line-height; - padding-top: rem-calc(24); - } - - .anonymous-votes, .organizations-votes { - padding-top: rem-calc(24); - } - - .divider { - display: none; - } - - @media (min-width: $medium-breakpoint) { - .divider { - display: inline-block; - } - } - } -} From 7039c0d29427caaf90fd4de8619ffe3248f9a6b0 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 9 Oct 2015 13:14:31 +0200 Subject: [PATCH 5/7] Cleans layout CSS --- app/assets/stylesheets/layout.scss | 94 ++++++++++++++++++++---------- 1 file changed, 64 insertions(+), 30 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 28e53b5b3..f41831dcf 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -444,7 +444,7 @@ header { } .contain-to-grid { - background: rgba(0,0,0,.5); + background: #112E51; } .top-bar { @@ -774,15 +774,14 @@ footer { // 06. Tags // - - - - - - - - - - - - - - - - - - - - - - - - - -.tags { +.tags, .tag-cloud { a { background: $border; - border-radius: rem-calc(30); + border-radius: rem-calc(6); color: #4d4d4d; display: inline-block; font-size: rem-calc(13); - font-weight: bold; line-height: rem-calc(22); margin-bottom: rem-calc(8); padding: 0 rem-calc(8); @@ -796,7 +795,6 @@ footer { } .tag-cloud { - @extend .tags; h3 { border-top: 2px solid $brand; @@ -946,14 +944,13 @@ form { margin: rem-calc(12) 0 rem-calc(12) rem-calc(6); } - .note { + .note, .note-marked { display: block; font-size: rem-calc(13); margin-bottom: rem-calc(12); } .note-marked { - @extend .note; background: yellow; display: inline-block; @@ -1139,16 +1136,12 @@ label.error, label.error a { } } -img.avatar, img.admin-avatar, img.moderator-avatar { +img.avatar, img.admin-avatar, img.moderator-avatar, img.initialjs-avatar { border-radius: rem-calc(1000); position: relative; } -img.initialjs-avatar { - @extend .avatar; -} - -.author-deleted { +.author-deleted, .user-deleted { background-color: rgba(255,255,255,.5); color: rgba(0,0,0,.4); font-size: rem-calc(40); @@ -1158,7 +1151,6 @@ img.initialjs-avatar { } .user-deleted { - @extend .author-deleted; top: -9px; } @@ -1199,7 +1191,7 @@ img.initialjs-avatar { // 11. Filters & search // - - - - - - - - - - - - - - - - - - - - - - - - - -.filters { +.filters, .search-results { h2 { display: inline-block; @@ -1250,10 +1242,6 @@ img.initialjs-avatar { } } -.search-results { - @extend .filters; -} - .search-form { h3 { @@ -1380,6 +1368,7 @@ table { } &:hover { + background: white; color: #40A2D1; } } @@ -1419,6 +1408,7 @@ table { } &:hover { + background: white; color: #354F88; } } @@ -1458,6 +1448,7 @@ table { } &:hover { + background: white; color: #CE3E26; } } @@ -1500,27 +1491,72 @@ table { } .social-share-button-twitter { - @extend .social-share-button-twitter; background: none; color: white; height: rem-calc(24); + position: relative; width: rem-calc(48); + + &:before { + content: "f"; + font-family: "icons" !important; + font-size: rem-calc(24); + left: 50%; + line-height: $line-height*2; + margin-left: rem-calc(-11); + position: absolute; + top: 0; + } + + &:hover { + color: #40A2D1; + } } .social-share-button-facebook { - @extend .social-share-button-facebook; background: none; color: white; height: rem-calc(24); + position: relative; width: rem-calc(48); + + &:before { + content: "A"; + font-family: "icons" !important; + font-size: rem-calc(24); + left: 50%; + line-height: $line-height*2; + margin-left: rem-calc(-11); + position: absolute; + top: 0; + } + + &:hover { + color: #354F88; + } } .social-share-button-google_plus { - @extend .social-share-button-google_plus; background: none; color: white; height: rem-calc(24); + position: relative; width: rem-calc(48); + + &:before { + content: "B"; + font-family: "icons" !important; + font-size: rem-calc(24); + left: 50%; + line-height: $line-height*2; + margin-left: rem-calc(-11); + position: absolute; + top: 0; + } + + &:hover { + color: #CE3E26; + } } } @@ -1825,15 +1861,11 @@ table { padding: rem-calc(6) rem-calc(12); } - &.is-admin { + &.is-admin, &.is-moderator { background: $comment-admin; padding: rem-calc(6) rem-calc(12); } - &.is-moderator { - @extend .is-admin; - } - &.level-5 { background: $comment-level-5; padding: rem-calc(6) rem-calc(12); @@ -1888,13 +1920,15 @@ table { } } -.flag-disable { - color: $text-medium; +.flag-disable, .flag-active { line-height: rem-calc(24); vertical-align: middle; } +.flag-disable { + color: $text-medium; +} + .flag-active { - @extend .flag-disable; color: $delete; } From bbda35b8a3ee1116e30b3b71c55ea129624ecd6a Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 9 Oct 2015 13:15:04 +0200 Subject: [PATCH 6/7] Changes header of transparency and open data pages --- app/views/layouts/_header.html.erb | 11 ++++++++++- config/locales/en.yml | 8 +++++--- config/locales/es.yml | 8 +++++--- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index d62bd6d5c..8ab43b55b 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -29,7 +29,16 @@
  • <%= link_to root_path do %> <%= image_tag('header_logo_madrid.png', class: 'show-for-medium-up left', size: '96x96') %> - <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %> | <%= t("layouts.header.participation") %> + <%= t("layouts.header.open_gov", open: "#{t('layouts.header.open')}").html_safe %> | + + <% if transparency_page? %> + <%= t("layouts.header.transparency") %> + <% elsif opendata_page? %> + <%= t("layouts.header.open_data") %> + <% else %> + <%= t("layouts.header.participation") %> + <% end %> + <% end %>
    • diff --git a/config/locales/en.yml b/config/locales/en.yml index f4362960f..917a7f218 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -10,7 +10,9 @@ en: external_link_blog_url: "/blog" open_gov: "%{open} government" open: "Open" - participation: Participation + participation: "Participation" + transparency: "Transparency" + open_data: "Open data" open_city_title: "The city you want, it will be the city you want." open_city_slogan_html: "Start listening to Madrid. @@ -117,7 +119,7 @@ en: one: 1 Comment other: "%{count} Comments" login_to_comment: "You need to %{signin} or %{signup} to comment." - edit_debate_link: Edit + edit_debate_link: "Edit debate" share: Share flag: "This debate has been flag as innapropiate for some users." edit: @@ -208,7 +210,7 @@ en: one: 1 Comment other: "%{count} Comments" login_to_comment: "You need to %{signin} or %{signup} to comment." - edit_proposal_link: Edit + edit_proposal_link: "Edit proposal" share: Share flag: "This proposal has been flag as innapropiate for some users." edit: diff --git a/config/locales/es.yml b/config/locales/es.yml index fdac85fa2..fbfc06c89 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -10,7 +10,9 @@ es: external_link_blog_url: "/blog" open_gov: "Gobierno %{open}" open: "abierto" - participation: Participación + participation: "Participación" + transparency: "Transparencia" + open_data: "Datos abiertos" open_city_title: "La ciudad que quieres será la ciudad que quieras." open_city_slogan_html: "Existen ciudades gobernadas directamente por sus habitantes, que debaten sobre temas que les preocupan, proponen ideas para mejorar @@ -117,7 +119,7 @@ es: one: 1 Comentario other: "%{count} Comentarios" login_to_comment: "Necesitas %{signin} o %{signup} para comentar." - edit_debate_link: Editar + edit_debate_link: "Editar debate" share: Compartir flag: "Este debate ha sido marcado como inapropiado por varios usuarios." edit: @@ -208,7 +210,7 @@ es: one: 1 Comentario other: "%{count} Comentarios" login_to_comment: "Necesitas %{signin} o %{signup} para comentar." - edit_proposal_link: Editar + edit_proposal_link: "Editar propuesta" share: Compartir flag: "Esta propuesta ha sido marcada como inapropiada por varios usuarios." edit: From f46a379d6c69b8e39e81aef99b4e95add3e7102c Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 9 Oct 2015 17:05:58 +0200 Subject: [PATCH 7/7] Updates tests --- spec/features/debates_spec.rb | 2 +- spec/features/proposals_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb index da67d2ff8..c633f1b2f 100644 --- a/spec/features/debates_spec.rb +++ b/spec/features/debates_spec.rb @@ -184,7 +184,7 @@ feature 'Debates' do expect(page).not_to have_link('click me') expect(page.html).to_not include "" - click_link 'Edit' + click_link 'Edit debate' expect(current_path).to eq edit_debate_path(Debate.last) expect(page).not_to have_link('click me') diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index ad5644747..7bb1146ec 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -253,7 +253,7 @@ feature 'Proposals' do expect(page).not_to have_link('click me') expect(page.html).to_not include "" - click_link 'Edit' + click_link 'Edit proposal' expect(current_path).to eq edit_proposal_path(Proposal.last) expect(page).not_to have_link('click me')