Merge pull request #1643 from consul/chore/add_scss_lint

[WIP] SCSS Linting tool & Config
This commit is contained in:
Alberto
2017-06-16 18:22:43 +02:00
committed by GitHub
33 changed files with 2484 additions and 1884 deletions

211
.scss-lint.yml Normal file
View File

@@ -0,0 +1,211 @@
linters:
BangFormat:
enabled: true
space_before_bang: true
space_after_bang: false
BorderZero:
enabled: true
convention: zero
ChainedClasses:
enabled: false
ColorKeyword:
enabled: true
ColorVariable:
enabled: false
Comment:
enabled: false
DebugStatement:
enabled: true
DeclarationOrder:
enabled: true
DisableLinterReason:
enabled: true
DuplicateProperty:
enabled: false
ElsePlacement:
enabled: true
style: same_line
EmptyLineBetweenBlocks:
enabled: true
ignore_single_line_blocks: true
EmptyRule:
enabled: true
ExtendDirective:
enabled: false
FinalNewline:
enabled: true
present: true
HexLength:
enabled: true
style: short
HexNotation:
enabled: true
style: lowercase
HexValidation:
enabled: true
IdSelector:
enabled: true
ImportantRule:
enabled: false
ImportPath:
enabled: true
leading_underscore: false
filename_extension: false
Indentation:
enabled: true
allow_non_nested_indentation: true
character: space
width: 2
LeadingZero:
enabled: true
style: include_zero
MergeableSelector:
enabled: false
force_nesting: false
NameFormat:
enabled: true
convention: hyphenated_lowercase
allow_leading_underscore: true
NestingDepth:
enabled: true
max_depth: 4
PlaceholderInExtend:
enabled: true
PrivateNamingConvention:
enabled: true
prefix: _
PropertyCount:
enabled: false
PropertySortOrder:
enabled: false
PropertySpelling:
enabled: true
extra_properties: []
PropertyUnits:
enabled: false
PseudoElement:
enabled: true
QualifyingElement:
enabled: true
allow_element_with_attribute: false
allow_element_with_class: false
allow_element_with_id: false
SelectorDepth:
enabled: true
max_depth: 5
SelectorFormat:
enabled: true
convention: hyphenated_lowercase
Shorthand:
enabled: true
SingleLinePerProperty:
enabled: true
allow_single_line_rule_sets: false
SingleLinePerSelector:
enabled: true
SpaceAfterComma:
enabled: true
SpaceAfterPropertyColon:
enabled: true
style: one_space
SpaceAfterPropertyName:
enabled: true
SpaceAfterVariableColon:
enabled: true
style: at_least_one_space
SpaceAfterVariableName:
enabled: true
SpaceAroundOperator:
enabled: true
style: one_space
SpaceBeforeBrace:
enabled: true
style: space
allow_single_line_padding: true
SpaceBetweenParens:
enabled: true
spaces: 0
StringQuotes:
enabled: true
style: single_quotes
TrailingSemicolon:
enabled: true
TrailingZero:
enabled: true
TransitionAll:
enabled: false
UnnecessaryMantissa:
enabled: true
UnnecessaryParentReference:
enabled: true
UrlFormat:
enabled: false
UrlQuotes:
enabled: true
VariableForProperty:
enabled: false
VendorPrefixes:
enabled: true
identifier_list: base
include: []
exclude: []
ZeroUnit:
enabled: true

View File

@@ -108,7 +108,9 @@ end
group :development do group :development do
# Access an IRB console on exception pages or by using <%= console %> in views # Access an IRB console on exception pages or by using <%= console %> in views
gem 'scss_lint', require: false
gem 'web-console', '3.3.0' gem 'web-console', '3.3.0'
end end
eval_gemfile './Gemfile_custom' eval_gemfile './Gemfile_custom'

View File

@@ -397,6 +397,9 @@ GEM
nokogiri (>= 1.4.0) nokogiri (>= 1.4.0)
nori (~> 2.4) nori (~> 2.4)
wasabi (~> 3.4) wasabi (~> 3.4)
scss_lint (0.53.0)
rake (>= 0.9, < 13)
sass (~> 3.4.20)
simplecov (0.14.1) simplecov (0.14.1)
docile (~> 1.1.0) docile (~> 1.1.0)
json (>= 1.8, < 3) json (>= 1.8, < 3)
@@ -541,6 +544,7 @@ DEPENDENCIES
rvm1-capistrano3 rvm1-capistrano3
sass-rails (~> 5.0, >= 5.0.4) sass-rails (~> 5.0, >= 5.0.4)
savon savon
scss_lint
sitemap_generator (~> 5.3.1) sitemap_generator (~> 5.3.1)
social-share-button (~> 0.10) social-share-button (~> 0.10)
spring spring

View File

@@ -47,7 +47,6 @@ RAILS_ENV=test rake db:setup
Run the app locally: Run the app locally:
``` ```
bin/rails s bin/rails s
``` ```
Prerequisites for testing: install PhantomJS >= 1.9.8 Prerequisites for testing: install PhantomJS >= 1.9.8
@@ -58,6 +57,12 @@ Run the tests with:
bin/rspec bin/rspec
``` ```
If you add SCSS code you can check it with:
```
scss-lint
```
You can use the default admin user from the seeds file: You can use the default admin user from the seeds file:
**user:** admin@consul.dev **user:** admin@consul.dev

View File

@@ -58,6 +58,12 @@ Para ejecutar los tests:
bin/rspec bin/rspec
``` ```
Si añades código SCSS puedes revisarlo con:
```
scss-lint
```
Puedes usar el usuario administrador por defecto del fichero seeds: Puedes usar el usuario administrador por defecto del fichero seeds:
**user:** admin@consul.dev **user:** admin@consul.dev

View File

@@ -53,53 +53,53 @@ $small-font-size: rem-calc(14);
$line-height: rem-calc(24); $line-height: rem-calc(24);
$tiny-font-size: rem-calc(12); $tiny-font-size: rem-calc(12);
$brand: #004A83; $brand: #004a83;
$dark: darken($brand, 10%); $dark: darken($brand, 10%);
$text: #222222; $text: #222;
$text-medium: #515151; $text-medium: #515151;
$text-light: #BFBFBF; $text-light: #bfbfbf;
$border: #DEE0E3; $border: #dee0e3;
$link: $brand; $link: $brand;
$link-hover: darken($link, 20%); $link-hover: darken($link, 20%);
$debates: $brand; $debates: $brand;
$like: #7BD2A8; $like: #7bd2a8;
$unlike: #EF8585; $unlike: #ef8585;
$delete: #F04124; $delete: #f04124;
$check: #46DB91; $check: #46db91;
$proposals: #FFA42D; $proposals: #ffa42d;
$proposals-dark: #794500; $proposals-dark: #794500;
$budget: #7E328A; $budget: #7e328a;
$budget-hover: #7571BF; $budget-hover: #7571bf;
$highlight: #E7F2FC; $highlight: #e7f2fc;
$light: #F5F7FA; $light: #f5f7fa;
$featured: #FFDC5C; $featured: #ffdc5c;
$footer-border: #BFC1C3; $footer-border: #bfc1c3;
$success-bg: #DFF0D8; $success-bg: #dff0d8;
$success-border: #D6E9C6; $success-border: #d6e9c6;
$color-success: #3C763D; $color-success: #3c763d;
$info-bg: #D9EDF7; $info-bg: #d9edf7;
$info-border: #BCE8F1; $info-border: #bce8f1;
$color-info: #31708F; $color-info: #31708f;
$warning-bg: #FCF8E3; $warning-bg: #fcf8e3;
$warning-border: #FAEBCC; $warning-border: #faebcc;
$color-warning: #8A6D3B; $color-warning: #8a6d3b;
$alert-bg: #F2DEDE; $alert-bg: #f2dede;
$alert-border: #EBCCD1; $alert-border: #ebccd1;
$color-alert: #A94442; $color-alert: #a94442;
// 1. Global // 1. Global
@@ -118,8 +118,8 @@ $foundation-palette: (
$light-gray: #e6e6e6; $light-gray: #e6e6e6;
$medium-gray: #cacaca; $medium-gray: #cacaca;
$dark-gray: #8a8a8a; $dark-gray: #8a8a8a;
$black: #222222; $black: #222;
$white: #ffffff; $white: #fff;
$body-background: $white; $body-background: $white;
$body-font-color: $black; $body-font-color: $black;
$body-font-family: 'Source Sans Pro', 'Helvetica', 'Arial', sans-serif !important; $body-font-family: 'Source Sans Pro', 'Helvetica', 'Arial', sans-serif !important;

View File

@@ -13,12 +13,13 @@
// 01. Global styles // 01. Global styles
// ----------------- // -----------------
$admin-color: #CF3638; $admin-color: #cf3638;
body.admin { .admin {
header { .header {
border: 0; border: 0;
}
.top-links { .top-links {
background: darken($admin-color, 15%); background: darken($admin-color, 15%);
@@ -28,7 +29,6 @@ body.admin {
padding-top: $line-height / 4; padding-top: $line-height / 4;
text-decoration: underline; text-decoration: underline;
} }
}
.top-bar { .top-bar {
background: $admin-color !important; background: $admin-color !important;
@@ -42,34 +42,17 @@ body.admin {
} }
} }
form {
.button {
margin-top: 0;
&.margin-top {
margin-top: $line-height;
}
}
input[type="text"], textarea {
width: 100%;
}
.fieldset { .fieldset {
select { select {
height: $line-height * 2; height: $line-height * 2;
} }
.input-group input[type="text"] { [type="text"] {
border-radius: 0; border-radius: 0;
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
} }
}
table {
th { th {
text-align: left; text-align: left;
@@ -89,7 +72,7 @@ body.admin {
} }
tr { tr {
background: white; background: #fff;
border: 1px solid $border; border: 1px solid $border;
&:hover { &:hover {
@@ -97,7 +80,8 @@ body.admin {
} }
} }
td.break { table {
.break {
word-break: break-word; word-break: break-word;
} }
@@ -105,7 +89,8 @@ body.admin {
table-layout: fixed; table-layout: fixed;
} }
input[type="submit"] ~ a, a ~ a { [type="submit"] ~ a,
a ~ a {
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
margin-top: $line-height / 2; margin-top: $line-height / 2;
@@ -122,7 +107,7 @@ body.admin {
max-width: none; max-width: none;
} }
.menu.simple li.active { .menu.simple .active {
border-bottom: 2px solid $admin-color; border-bottom: 2px solid $admin-color;
color: $admin-color; color: $admin-color;
} }
@@ -132,10 +117,6 @@ body.admin {
padding-right: 0; padding-right: 0;
} }
#proposals {
width: 100% !important;
}
.accordion-title { .accordion-title {
font-size: $base-font-size; font-size: $base-font-size;
} }
@@ -235,9 +216,10 @@ body.admin {
padding-left: 0; padding-left: 0;
vertical-align: middle; vertical-align: middle;
} }
}
li { li {
background: white; background: #fff;
margin: 0; margin: 0;
outline: 0; outline: 0;
@@ -254,8 +236,6 @@ body.admin {
&.active a { &.active a {
background: #f3f6f7; background: #f3f6f7;
border-radius: rem-calc(6); border-radius: rem-calc(6);
-moz-border-radius: rem-calc(6);
-webkit-border-radius: rem-calc(6);
color: $admin-color; color: $admin-color;
font-weight: bold; font-weight: bold;
} }
@@ -271,17 +251,14 @@ body.admin {
&:hover { &:hover {
background: #f3f6f7; background: #f3f6f7;
border-radius: rem-calc(6); border-radius: rem-calc(6);
-moz-border-radius: rem-calc(6);
-webkit-border-radius: rem-calc(6);
color: $admin-color; color: $admin-color;
text-decoration: none; text-decoration: none;
} }
} }
}
.is-accordion-submenu-parent { .is-accordion-submenu-parent {
& > a::after { > a::after {
border-color: $admin-color transparent transparent; border-color: $admin-color transparent transparent;
} }
} }
@@ -308,12 +285,14 @@ body.admin {
// ----------------- // -----------------
.delete { .delete {
border-bottom: 1px dotted #CF2A0E; border-bottom: 1px dotted #cf2a0e;
color: $delete; color: $delete;
font-size: $small-font-size; font-size: $small-font-size;
&:hover, &:active, &:focus { &:hover,
border-bottom: 1px dotted white; &:active,
&:focus {
border-bottom: 1px dotted #fff;
color: #cf2a0e; color: #cf2a0e;
} }
} }
@@ -376,8 +355,6 @@ body.admin {
&:hover { &:hover {
max-height: rem-calc(1000); max-height: rem-calc(1000);
transition: max-height 0.9s; transition: max-height 0.9s;
-moz-transition: max-height 0.9s;
-webkit-transition: max-height 0.9s;
} }
} }
@@ -385,7 +362,7 @@ body.admin {
// --------- // ---------
.stats { .stats {
background: white; background: #fff;
} }
.stats-numbers { .stats-numbers {
@@ -417,6 +394,7 @@ body.admin {
ul { ul {
list-style-type: none; list-style-type: none;
margin-left: 0; margin-left: 0;
}
li { li {
font-size: rem-calc(14); font-size: rem-calc(14);
@@ -436,9 +414,10 @@ body.admin {
} }
} }
} }
}
.account-info, .login-as, .spending-proposal-info { .account-info,
.login-as,
.spending-proposal-info {
background-color: #e7e7e7; background-color: #e7e7e7;
border-radius: rem-calc(3); border-radius: rem-calc(3);
font-size: rem-calc(16); font-size: rem-calc(16);
@@ -455,15 +434,17 @@ body.admin {
margin-bottom: 0; margin-bottom: 0;
} }
body.admin { .admin {
.investment-projects-list.medium-9 { .investment-projects-list.medium-9 {
width: 100%; width: 100%;
} }
}
.investment-projects-summary { .investment-projects-summary {
th, td { th,
td {
text-align: center; text-align: center;
&:first-child { &:first-child {
@@ -486,9 +467,9 @@ body.admin {
} }
} }
} }
}
.admin-content .select-geozone, .admin-content .select-heading { .admin-content .select-geozone,
.admin-content .select-heading {
a { a {
display: block; display: block;
@@ -501,14 +482,14 @@ body.admin {
} }
} }
table.investment-projects-summary { .investment-projects-summary {
td.total-price { .total-price {
white-space: nowrap; white-space: nowrap;
} }
} }
body.admin { .admin {
.geozone { .geozone {
background: #ececec; background: #ececec;
@@ -551,15 +532,15 @@ table {
// --------------- // ---------------
.markdown-editor { .markdown-editor {
background-color: white; background-color: #fff;
.markdown-area, .markdown-area,
#markdown-preview { .markdown-preview {
display: none; display: none;
} }
} }
.markdown-editor #markdown-preview { .markdown-editor .markdown-preview {
overflow-y: auto; overflow-y: auto;
height: 15em; height: 15em;
} }
@@ -577,11 +558,11 @@ table {
left: 0; left: 0;
} }
.markdown-editor.fullscreen #markdown-preview { .markdown-editor.fullscreen .markdown-preview {
height: 99%; height: 99%;
} }
.edit_legislation_draft_version .row { .edit-legislation-draft-version .row {
margin-bottom: 2rem; margin-bottom: 2rem;
} }
@@ -614,7 +595,7 @@ table {
// 08. CMS // 08. CMS
// -------------- // --------------
.cms_page_list { .cms-page-list {
[class^="icon-"] { [class^="icon-"] {
padding-right: $menu-icon-spacing; padding-right: $menu-icon-spacing;
@@ -624,17 +605,18 @@ table {
.legislation-process-edit { .legislation-process-edit {
.edit_legislation_process { .edit-legislation-process {
small { small {
color: $text-medium; color: $text-medium;
} }
input[type]:not([type="submit"]):not([type="file"]):not([type="checkbox"]):not([type="radio"]) { [type]:not([type="submit"]):not([type="file"]):not([type="checkbox"]):not([type="radio"]) {
background: $white; background: $white;
} }
.legislation-process-start, .legislation-process-end { .legislation-process-start,
.legislation-process-end {
@include breakpoint(medium) { @include breakpoint(medium) {
line-height: 3rem; line-height: 3rem;
} }
@@ -664,7 +646,7 @@ table {
.legislation-questions-form { .legislation-questions-form {
input[type]:not([type="submit"]):not([type="file"]):not([type="checkbox"]):not([type="radio"]) { [type]:not([type="submit"]):not([type="file"]):not([type="checkbox"]):not([type="radio"]) {
background: $white; background: $white;
margin-bottom: 0; margin-bottom: 0;
@@ -673,25 +655,14 @@ table {
} }
} }
input::-webkit-input-placeholder { input::placeholder {
font-style: italic;
}
input:-moz-placeholder { /* Firefox 18- */
font-style: italic;
}
input::-moz-placeholder { /* Firefox 19+ */
font-style: italic;
}
input:-ms-input-placeholder {
font-style: italic; font-style: italic;
} }
.legislation-questions-answers { .legislation-questions-answers {
margin-bottom: 1rem; margin-bottom: 1rem;
} }
}
.field { .field {
margin-bottom: 1rem; margin-bottom: 1rem;
@@ -721,61 +692,12 @@ table {
} }
} }
} }
}
.legislation-draft-versions-form {
.legislation-process-version {
@include breakpoint(medium) {
text-align: right;
}
}
input[type]:not([type="submit"]):not([type="file"]):not([type="checkbox"]):not([type="radio"]) {
background: $white;
}
.control {
cursor: pointer;
margin-bottom: 1rem;
small {
display: block;
margin-top: -1rem;
color: $text-medium;
@include breakpoint(medium) {
margin-left: 0.25rem;
display: inline-block;
margin-top: 0;
}
}
}
.fullscreen-container { .fullscreen-container {
text-align: center;
background: #ccdbe6;
.markdown-editor-header,
.markdown-editor-buttons {
display: none;
}
a { a {
line-height: 8rem; line-height: 8rem;
span {
text-decoration: none;
font-size: $small-font-size;
}
.icon-expand {
margin-left: 0.25rem;
vertical-align: sub;
text-decoration: none;
line-height: 0;
}
&:active, &:active,
&:focus, &:focus,
&:hover { &:hover {
@@ -784,51 +706,9 @@ table {
} }
} }
#legislation_draft_version_body {
font-family: $font-family-serif;
background: #f5f5f5;
height: 16em;
&:focus {
border: 1px solid #cacaca;
box-shadow: inset 0 1px 2px rgba(34, 34, 34, 0.1);
}
}
#markdown-preview {
font-family: $font-family-serif;
border: 1px solid #cacaca;
margin-bottom: 2rem;
h1, h2, h3, h4, h5, h6 {
font-family: $font-family-serif !important;
font-size: 1rem;
line-height: 1.625rem;
margin-bottom: 0;
}
p {
font-size: 1rem;
line-height: 1.625rem;
}
}
.fullscreen { .fullscreen {
.markdown-area,
#markdown-preview {
display: block;
}
.column {
padding: 0;
}
.fullscreen-container { .fullscreen-container {
text-align: left;
background: $admin-color;
padding: 0.5rem 1rem;
margin-bottom: 0;
a { a {
line-height: 3rem; line-height: 3rem;
@@ -865,6 +745,7 @@ table {
float: right; float: right;
padding-left: 1rem; padding-left: 1rem;
} }
}
input { input {
font-size: $small-font-size; font-size: $small-font-size;
@@ -877,30 +758,129 @@ table {
margin: 0.5rem; margin: 0.5rem;
} }
} }
}
a { a {
color: $white; color: $white;
} }
} }
}
#legislation_draft_version_body { .legislation-draft-versions-form {
border-radius: 0;
padding: 1rem; .legislation-process-version {
border: none; @include breakpoint(medium) {
text-align: right;
}
}
[type]:not([type="submit"]):not([type="file"]):not([type="checkbox"]):not([type="radio"]) {
background: $white;
}
.control {
cursor: pointer;
margin-bottom: 1rem;
small {
display: block;
margin-top: -1rem;
color: $text-medium;
@include breakpoint(medium) { @include breakpoint(medium) {
padding: 1rem 2rem; margin-left: 0.25rem;
display: inline-block;
margin-top: 0;
} }
}
}
.fullscreen-container {
text-align: center;
background: #ccdbe6;
.markdown-editor-header,
.markdown-editor-buttons {
display: none;
}
span {
text-decoration: none;
font-size: $small-font-size;
}
.icon-expand {
margin-left: 0.25rem;
vertical-align: sub;
text-decoration: none;
line-height: 0;
}
}
.legislation-draft-version-body {
font-family: $font-family-serif;
background: #f5f5f5;
height: 16em;
&:focus { &:focus {
border: none; border: 1px solid #cacaca;
box-shadow: inset 0 1px 2px rgba(34, 34, 34, 0.1);
} }
} }
#markdown-preview { .markdown-preview {
font-family: $font-family-serif;
border: 1px solid #cacaca;
margin-bottom: 2rem;
h1,
h2,
h3,
h4,
h5,
h6 {
font-family: $font-family-serif !important;
font-size: 1rem;
line-height: 1.625rem;
margin-bottom: 0;
}
p {
font-size: 1rem;
line-height: 1.625rem;
}
}
.fullscreen {
.markdown-area,
.markdown-preview {
display: block;
}
.column {
padding: 0;
}
.fullscreen-container {
text-align: left;
background: $admin-color;
padding: 0.5rem 1rem;
margin-bottom: 0;
}
.legislation-draft-version-body {
border-radius: 0;
padding: 1rem; padding: 1rem;
border: none; border: 0;
@include breakpoint(medium) {
padding: 1rem 2rem;
}
}
.markdown-preview {
padding: 1rem;
border: 0;
@include breakpoint(medium) { @include breakpoint(medium) {
padding: 1rem 2rem; padding: 1rem 2rem;
@@ -908,3 +888,9 @@ table {
} }
} }
} }
.legislation-draft-version-body {
&:focus {
border: 0;
}
}

View File

@@ -2,9 +2,9 @@
// //
.annotator-editor .annotator-controls, .annotator-editor .annotator-controls,
.annotator-filter, .annotator-filter .annotator-filter,
.annotator-filter-navigation button { .annotator-filter .annotator-filter-navigation button {
background: #F3F3F3; background: #f3f3f3;
background-image: none; background-image: none;
border: 0; border: 0;
border-radius: 0; border-radius: 0;
@@ -14,12 +14,12 @@
} }
.annotator-adder { .annotator-adder {
background-image: image-url("annotator_adder.png"); background-image: image-url('annotator_adder.png');
margin-top: -52px; margin-top: -52px;
} }
.annotator-widget { .annotator-widget {
background: white; background: #fff;
border: 1px solid $border; border: 1px solid $border;
border-radius: 0; border-radius: 0;
bottom: $line-height; bottom: $line-height;
@@ -38,12 +38,12 @@
.annotator-item, .annotator-item,
.annotator-editor .annotator-item input:focus, .annotator-editor .annotator-item input:focus,
.annotator-editor .annotator-item textarea:focus { .annotator-editor .annotator-item textarea:focus {
background: white; background: #fff;
} }
.annotator-widget:after, .annotator-widget::after,
.annotator-editor.annotator-invert-y .annotator-widget:after { .annotator-editor.annotator-invert-y .annotator-widget::after {
background-image: image-url("annotator_items.png"); background-image: image-url('annotator_items.png');
} }
.annotator-editor a, .annotator-editor a,
@@ -54,7 +54,7 @@
.annotator-editor a { .annotator-editor a {
background: none; background: none;
background-image: none; background-image: none;
border: none; border: 0;
box-shadow: none; box-shadow: none;
color: $link; color: $link;
font-family: $body-font-family; font-family: $body-font-family;
@@ -63,7 +63,9 @@
text-shadow: none; text-shadow: none;
padding: 0; padding: 0;
&:hover, &:active, &:focus { &:hover,
&:active,
&:focus {
background: none; background: none;
background-image: none; background-image: none;
color: $link-hover; color: $link-hover;
@@ -71,28 +73,28 @@
text-shadow: none; text-shadow: none;
} }
&:after { &::after {
content: none; content: none;
} }
&.annotator-cancel { &.annotator-cancel {
background: #F04124; background: #f04124;
color: white; color: #fff;
padding: $line-height / 4 $line-height / 2; padding: $line-height / 4 $line-height / 2;
&:hover { &:hover {
background: darken(#F04124, 20); background: darken(#f04124, 20);
text-decoration: none; text-decoration: none;
} }
} }
&.annotator-save { &.annotator-save {
background: #43AC6A; background: #43ac6a;
color: white; color: #fff;
padding: $line-height / 4 $line-height / 2; padding: $line-height / 4 $line-height / 2;
&:hover { &:hover {
background: darken(#43AC6A, 20); background: darken(#43ac6a, 20);
text-decoration: none; text-decoration: none;
} }
} }
@@ -104,19 +106,23 @@
} }
.annotator-hl.weight-1 { .annotator-hl.weight-1 {
background: #FFF9DA; background: #fff9da;
} }
.annotator-hl.weight-2 { .annotator-hl.weight-2 {
background: #FFF5BC; background: #fff5bc;
} }
.annotator-hl.weight-3 { .annotator-hl.weight-3 {
background: #FFF1A2; background: #fff1a2;
} }
.annotator-hl.weight-4 { .annotator-hl.weight-4 {
background: #FFEF8C; background: #ffef8c;
} }
.annotator-hl.weight-5 { .annotator-hl.weight-5 {
background: #FFE95F; background: #ffe95f;
} }
.current-annotation { .current-annotation {

View File

@@ -1,17 +1,17 @@
@import "social-share-button"; @import 'social-share-button';
@import "foundation_and_overrides"; @import 'foundation_and_overrides';
@import "fonts"; @import 'fonts';
@import "icons"; @import 'icons';
@import "mixins"; @import 'mixins';
@import "admin"; @import 'admin';
@import "layout"; @import 'layout';
@import "participation"; @import 'participation';
@import "pages"; @import 'pages';
@import "legislation"; @import 'legislation';
@import "legislation_process"; @import 'legislation_process';
@import "custom"; @import 'custom';
@import "c3"; @import 'c3';
@import "annotator.min"; @import 'annotator.min';
@import "annotator_overrides"; @import 'annotator_overrides';
@import "jquery-ui/datepicker"; @import 'jquery-ui/datepicker';
@import "datepicker_overrides"; @import 'datepicker_overrides';

View File

@@ -3,7 +3,7 @@
.ui-datepicker-header { .ui-datepicker-header {
background: $brand; background: $brand;
color: white; color: #fff;
font-weight: bold; font-weight: bold;
} }
@@ -14,9 +14,17 @@
color: $text; color: $text;
} }
.ui-state-hover, .ui-state-active { .ui-state-hover,
.ui-state-active {
background: $brand; background: $brand;
color: white; color: #fff;
}
thead {
tr th {
color: $dark;
}
} }
} }
@@ -32,8 +40,9 @@
right: 12px; right: 12px;
} }
.ui-datepicker-prev, .ui-datepicker-next { .ui-datepicker-prev,
color: white; .ui-datepicker-next {
color: #fff;
cursor: pointer; cursor: pointer;
font-weight: normal; font-weight: normal;
font-size: $small-font-size; font-size: $small-font-size;
@@ -44,22 +53,13 @@
table { table {
border: 1px solid $border; border: 1px solid $border;
border-top: 0; border-top: 0;
thead {
background: $dark;
border-left: 1px solid $dark;
border-right: 1px solid $dark;
tr th {
color: $dark;
}
} }
tr { tr {
border-bottom: 1px solid $border; border-bottom: 1px solid $border;
&:last-child { &:last-child {
border-bottom: 0px; border-bottom: 0;
} }
&:nth-child(odd) { &:nth-child(odd) {
@@ -72,23 +72,23 @@
border-right: 1px solid $border; border-right: 1px solid $border;
&:last-child { &:last-child {
border-right: 0px; border-right: 0;
} }
span, a { span,
a {
text-align: center; text-align: center;
line-height: $line-height; line-height: $line-height;
color: $text; color: $text;
} }
}
}
&.ui-datepicker-unselectable.ui-state-disabled { .ui-datepicker-unselectable.ui-state-disabled {
background: white; background: #fff;
.ui-state-default { .ui-state-default {
background: #F8F8F8; background: #f8f8f8;
color: $text-medium; color: $text-medium;
} }
} }
}
}
}

View File

@@ -16,7 +16,7 @@
font-url('sourcesanspro-light-webfont.woff2') format('woff2'), font-url('sourcesanspro-light-webfont.woff2') format('woff2'),
font-url('sourcesanspro-light-webfont.woff') format('woff'), font-url('sourcesanspro-light-webfont.woff') format('woff'),
font-url('sourcesanspro-light-webfont.ttf') format('truetype'), font-url('sourcesanspro-light-webfont.ttf') format('truetype'),
font-url('sourcesanspro-light-webfont.svg#source_sans_prolight') format('svg') font-url('sourcesanspro-light-webfont.svg#source_sans_prolight') format('svg');
} }
@font-face { @font-face {
@@ -67,7 +67,7 @@
font-url('lato-light.ttf') format('truetype'), font-url('lato-light.ttf') format('truetype'),
font-url('lato-light.svg#latolight') format('svg'); font-url('lato-light.svg#latolight') format('svg');
font-weight: lighter; font-weight: lighter;
font-style: normal font-style: normal;
} }
@font-face { @font-face {
@@ -79,7 +79,7 @@
font-url('lato-regular.ttf') format('truetype'), font-url('lato-regular.ttf') format('truetype'),
font-url('lato-regular.svg#latoregular') format('svg'); font-url('lato-regular.svg#latoregular') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal font-style: normal;
} }
@font-face { @font-face {
@@ -91,5 +91,5 @@
font-url('lato-bold.ttf') format('truetype'), font-url('lato-bold.ttf') format('truetype'),
font-url('lato-bold.svg#latobold') format('svg'); font-url('lato-bold.svg#latobold') format('svg');
font-weight: bold; font-weight: bold;
font-style: normal font-style: normal;
} }

View File

@@ -1,4 +1,5 @@
@charset "UTF-8"; @charset "UTF-8";
@font-face { @font-face {
font-family: 'icons'; font-family: 'icons';
src: font-url('icons.eot'); src: font-url('icons.eot');
@@ -9,7 +10,8 @@
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
[data-icon]:before {
[data-icon]::before {
font-family: "icons" !important; font-family: "icons" !important;
content: attr(data-icon); content: attr(data-icon);
font-style: normal !important; font-style: normal !important;
@@ -21,8 +23,9 @@
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
[class^="icon-"]:before,
[class*=" icon-"]:before { [class^="icon-"]::before,
[class*=" icon-"]::before {
font-family: "icons" !important; font-family: "icons" !important;
font-style: normal !important; font-style: normal !important;
font-weight: normal !important; font-weight: normal !important;
@@ -33,168 +36,223 @@
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-angle-down:before {
content: "\61"; .icon-angle-down::before {
content: '\61';
} }
.icon-angle-left:before {
content: "\62"; .icon-angle-left::before {
content: '\62';
} }
.icon-angle-right:before {
content: "\63"; .icon-angle-right::before {
content: '\63';
} }
.icon-angle-up:before {
content: "\64"; .icon-angle-up::before {
content: '\64';
} }
.icon-comments:before {
content: "\65"; .icon-comments::before {
content: '\65';
} }
.icon-twitter:before {
content: "\66"; .icon-twitter::before {
content: '\66';
} }
.icon-calendar:before {
content: "\67"; .icon-calendar::before {
content: '\67';
} }
.icon-debates:before {
content: "\69"; .icon-debates::before {
content: '\69';
} }
.icon-unlike:before {
content: "\6a"; .icon-unlike::before {
content: '\6a';
} }
.icon-like:before {
content: "\6b"; .icon-like::before {
content: '\6b';
} }
.icon-check:before {
content: "\6c"; .icon-check::before {
content: '\6c';
} }
.icon-edit:before {
content: "\6d"; .icon-edit::before {
content: '\6d';
} }
.icon-user:before {
content: "\6f"; .icon-user::before {
content: '\6f';
} }
.icon-settings:before {
content: "\71"; .icon-settings::before {
content: '\71';
} }
.icon-stats:before {
content: "\72"; .icon-stats::before {
content: '\72';
} }
.icon-proposals:before {
content: "\68"; .icon-proposals::before {
content: '\68';
} }
.icon-organizations:before {
content: "\73"; .icon-organizations::before {
content: '\73';
} }
.icon-deleted:before {
content: "\74"; .icon-deleted::before {
content: '\74';
} }
.icon-tag:before {
content: "\75"; .icon-tag::before {
content: '\75';
} }
.icon-eye:before {
content: "\70"; .icon-eye::before {
content: '\70';
} }
.icon-x:before {
content: "\76"; .icon-x::before {
content: '\76';
} }
.icon-flag:before {
content: "\77"; .icon-flag::before {
content: '\77';
} }
.icon-comment:before {
content: "\79"; .icon-comment::before {
content: '\79';
} }
.icon-reply:before {
content: "\7a"; .icon-reply::before {
content: '\7a';
} }
.icon-facebook:before {
content: "\41"; .icon-facebook::before {
content: '\41';
} }
.icon-google-plus:before {
content: "\42"; .icon-google-plus::before {
content: '\42';
} }
.icon-search:before {
content: "\45"; .icon-search::before {
content: '\45';
} }
.icon-external:before {
content: "\46"; .icon-external::before {
content: '\46';
} }
.icon-video:before {
content: "\44"; .icon-video::before {
content: '\44';
} }
.icon-document:before {
content: "\47"; .icon-document::before {
content: '\47';
} }
.icon-print:before {
content: "\48"; .icon-print::before {
content: '\48';
} }
.icon-blog:before {
content: "\4a"; .icon-blog::before {
content: '\4a';
} }
.icon-box:before {
content: "\49"; .icon-box::before {
content: '\49';
} }
.icon-youtube:before {
content: "\4b"; .icon-youtube::before {
content: '\4b';
} }
.icon-letter:before {
content: "\4c"; .icon-letter::before {
content: '\4c';
} }
.icon-circle:before {
content: "\43"; .icon-circle::before {
content: '\43';
} }
.icon-circle-o:before {
content: "\4d"; .icon-circle-o::before {
content: '\4d';
} }
.icon-help:before {
content: "\4e"; .icon-help::before {
content: '\4e';
} }
.icon-budget:before {
content: "\53"; .icon-budget::before {
content: '\53';
} }
.icon-notification:before {
content: "\6e"; .icon-notification::before {
content: '\6e';
} }
.icon-no-notification:before {
content: "\78"; .icon-no-notification::before {
content: '\78';
} }
.icon-whatsapp:before {
content: "\50"; .icon-whatsapp::before {
content: '\50';
} }
.icon-zip:before {
content: "\4f"; .icon-zip::before {
content: '\4f';
} }
.icon-banner:before {
content: "\51"; .icon-banner::before {
content: '\51';
} }
.icon-arrow-down:before {
content: "\52"; .icon-arrow-down::before {
content: '\52';
} }
.icon-arrow-left:before {
content: "\54"; .icon-arrow-left::before {
content: '\54';
} }
.icon-arrow-right:before {
content: "\55"; .icon-arrow-right::before {
content: '\55';
} }
.icon-check-circle:before {
content: "\56"; .icon-check-circle::before {
content: '\56';
} }
.icon-arrow-top:before {
content: "\57"; .icon-arrow-top::before {
content: '\57';
} }
.icon-checkmark-circle:before {
content: "\59"; .icon-checkmark-circle::before {
content: '\59';
} }
.icon-minus-square:before {
content: "\58"; .icon-minus-square::before {
content: '\58';
} }
.icon-plus-square:before {
content: "\5a"; .icon-plus-square::before {
content: '\5a';
} }
.icon-expand:before {
content: "\30"; .icon-expand::before {
content: '\30';
} }
.icon-telegram:before {
content: "\31"; .icon-telegram::before {
content: '\31';
} }
.icon-instagram:before {
content: "\32"; .icon-instagram::before {
content: '\32';
} }

View File

@@ -8,7 +8,9 @@
// 01. Global styles // 01. Global styles
// ----------------- // -----------------
*, *:before, *:after { *,
*::before,
*::after {
box-sizing: border-box !important; box-sizing: border-box !important;
} }
@@ -23,96 +25,344 @@
display: block !important; display: block !important;
} }
.column, .columns { .column,
.columns {
display: inline-block !important; display: inline-block !important;
float: none !important; float: none !important;
box-sizing: border-box !important; box-sizing: border-box !important;
} }
.small-1, .row .small-1 { width: 7.33333%; } .small-1,
.small-2, .row .small-2 { width: 15.66667%; } .row .small-1 {
.small-3, .row .small-3 { width: 24%; } width: 7.33333%;
.small-4, .row .small-4 { width: 32.33333%; } }
.small-5, .row .small-5 { width: 40.66667%; }
.small-6, .row .small-6 { width: 49%; }
.small-7, .row .small-7 { width: 57.33333%; }
.small-8, .row .small-8 { width: 65.66667%; }
.small-9, .row .small-9 { width: 74%; }
.small-10, .row .small-10 { width: 82.33333%; }
.small-11, .row .small-11 { width: 90.66667%; }
.small-12, .row .small-12 { width: 99%; }
.medium-1, .row .medium-1 { width: 7.33333%; } .small-2,
.medium-2, .row .medium-2 { width: 15.66667%; } .row .small-2 {
.medium-3, .row .medium-3 { width: 24%; } width: 15.66667%;
.medium-4, .row .medium-4 { width: 32.33333%; } }
.medium-5, .row .medium-5 { width: 40.66667%; }
.medium-6, .row .medium-6 { width: 49%; }
.medium-7, .row .medium-7 { width: 57.33333%; }
.medium-8, .row .medium-8 { width: 65.66667%; }
.medium-9, .row .medium-9 { width: 74%; }
.medium-10, .row .medium-10 { width: 82.33333%; }
.medium-11, .row .medium-11 { width: 90.66667%; }
.medium-12, .row .medium-12 { width: 99%; }
.large-1, .row .large-1 { width: 7.33333%; } .small-3,
.large-2, .row .large-2 { width: 15.66667%; } .row .small-3 {
.large-3, .row .large-3 { width: 24%; } width: 24%;
.large-4, .row .large-4 { width: 32.33333%; } }
.large-5, .row .large-5 { width: 40.66667%; }
.large-6, .row .large-6 { width: 49%; }
.large-7, .row .large-7 { width: 57.33333%; }
.large-8, .row .large-8 { width: 65.66667%; }
.large-9, .row .large-9 { width: 74%; }
.large-10, .row .large-10 { width: 82.33333%; }
.large-11, .row .large-11 { width: 90.66667%; }
.large-12, .row .large-12 { width: 99%; }
.row .small-offset-1 { margin-left: 7.33333%; } .small-4,
.row .small-offset-2 { margin-left: 15.66667%; } .row .small-4 {
.row .small-offset-3 { margin-left: 24%; } width: 32.33333%;
.row .small-offset-4 { margin-left: 32.33333%; } }
.row .small-offset-5 { margin-left: 40.66667%; }
.row .small-offset-6 { margin-left: 49%; }
.row .small-offset-7 { margin-left: 57.33333%; }
.row .small-offset-8 { margin-left: 65.66667%; }
.row .small-offset-9 { margin-left: 74%; }
.row .small-offset-10 { margin-left: 82.33333%; }
.row .small-offset-11 { margin-left: 90.66667%; }
.row .small-offset-12 { margin-left: 99%; }
.row .medium-offset-1 { margin-left: 7.33333%; } .small-5,
.row .medium-offset-2 { margin-left: 15.66667%; } .row .small-5 {
.row .medium-offset-3 { margin-left: 24%; } width: 40.66667%;
.row .medium-offset-4 { margin-left: 32.33333%; } }
.row .medium-offset-5 { margin-left: 40.66667%; }
.row .medium-offset-6 { margin-left: 49%; }
.row .medium-offset-7 { margin-left: 57.33333%; }
.row .medium-offset-8 { margin-left: 65.66667%; }
.row .medium-offset-9 { margin-left: 74%; }
.row .medium-offset-10 { margin-left: 82.33333%; }
.row .medium-offset-11 { margin-left: 90.66667%; }
.row .medium-offset-12 { margin-left: 99%; }
.row .large-offset-1 { margin-left: 7.33333%; } .small-6,
.row .large-offset-2 { margin-left: 15.66667%; } .row .small-6 {
.row .large-offset-3 { margin-left: 24%; } width: 49%;
.row .large-offset-4 { margin-left: 32.33333%; } }
.row .large-offset-5 { margin-left: 40.66667%; }
.row .large-offset-6 { margin-left: 49%; } .small-7,
.row .large-offset-7 { margin-left: 57.33333%; } .row .small-7 {
.row .large-offset-8 { margin-left: 65.66667%; } width: 57.33333%;
.row .large-offset-9 { margin-left: 74%; } }
.row .large-offset-10 { margin-left: 82.33333%; }
.row .large-offset-11 { margin-left: 90.66667%; } .small-8,
.row .large-offset-12 { margin-left: 99%; } .row .small-8 {
width: 65.66667%;
}
.small-9,
.row .small-9 {
width: 74%;
}
.small-10,
.row .small-10 {
width: 82.33333%;
}
.small-11,
.row .small-11 {
width: 90.66667%;
}
.small-12,
.row .small-12 {
width: 99%;
}
.medium-1,
.row .medium-1 {
width: 7.33333%;
}
.medium-2,
.row .medium-2 {
width: 15.66667%;
}
.medium-3,
.row .medium-3 {
width: 24%;
}
.medium-4,
.row .medium-4 {
width: 32.33333%;
}
.medium-5,
.row .medium-5 {
width: 40.66667%;
}
.medium-6,
.row .medium-6 {
width: 49%;
}
.medium-7,
.row .medium-7 {
width: 57.33333%;
}
.medium-8,
.row .medium-8 {
width: 65.66667%;
}
.medium-9,
.row .medium-9 {
width: 74%;
}
.medium-10,
.row .medium-10 {
width: 82.33333%;
}
.medium-11,
.row .medium-11 {
width: 90.66667%;
}
.medium-12,
.row .medium-12 {
width: 99%;
}
.large-1,
.row .large-1 {
width: 7.33333%;
}
.large-2,
.row .large-2 {
width: 15.66667%;
}
.large-3,
.row .large-3 {
width: 24%;
}
.large-4,
.row .large-4 {
width: 32.33333%;
}
.large-5,
.row .large-5 {
width: 40.66667%;
}
.large-6,
.row .large-6 {
width: 49%;
}
.large-7,
.row .large-7 {
width: 57.33333%;
}
.large-8,
.row .large-8 {
width: 65.66667%;
}
.large-9,
.row .large-9 {
width: 74%;
}
.large-10,
.row .large-10 {
width: 82.33333%;
}
.large-11,
.row .large-11 {
width: 90.66667%;
}
.large-12,
.row .large-12 {
width: 99%;
}
.row .small-offset-1 {
margin-left: 7.33333%;
}
.row .small-offset-2 {
margin-left: 15.66667%;
}
.row .small-offset-3 {
margin-left: 24%;
}
.row .small-offset-4 {
margin-left: 32.33333%;
}
.row .small-offset-5 {
margin-left: 40.66667%;
}
.row .small-offset-6 {
margin-left: 49%;
}
.row .small-offset-7 {
margin-left: 57.33333%;
}
.row .small-offset-8 {
margin-left: 65.66667%;
}
.row .small-offset-9 {
margin-left: 74%;
}
.row .small-offset-10 {
margin-left: 82.33333%;
}
.row .small-offset-11 {
margin-left: 90.66667%;
}
.row .small-offset-12 {
margin-left: 99%;
}
.row .medium-offset-1 {
margin-left: 7.33333%;
}
.row .medium-offset-2 {
margin-left: 15.66667%;
}
.row .medium-offset-3 {
margin-left: 24%;
}
.row .medium-offset-4 {
margin-left: 32.33333%;
}
.row .medium-offset-5 {
margin-left: 40.66667%;
}
.row .medium-offset-6 {
margin-left: 49%;
}
.row .medium-offset-7 {
margin-left: 57.33333%;
}
.row .medium-offset-8 {
margin-left: 65.66667%;
}
.row .medium-offset-9 {
margin-left: 74%;
}
.row .medium-offset-10 {
margin-left: 82.33333%;
}
.row .medium-offset-11 {
margin-left: 90.66667%;
}
.row .medium-offset-12 {
margin-left: 99%;
}
.row .large-offset-1 {
margin-left: 7.33333%;
}
.row .large-offset-2 {
margin-left: 15.66667%;
}
.row .large-offset-3 {
margin-left: 24%;
}
.row .large-offset-4 {
margin-left: 32.33333%;
}
.row .large-offset-5 {
margin-left: 40.66667%;
}
.row .large-offset-6 {
margin-left: 49%;
}
.row .large-offset-7 {
margin-left: 57.33333%;
}
.row .large-offset-8 {
margin-left: 65.66667%;
}
.row .large-offset-9 {
margin-left: 74%;
}
.row .large-offset-10 {
margin-left: 82.33333%;
}
.row .large-offset-11 {
margin-left: 90.66667%;
}
.row .large-offset-12 {
margin-left: 99%;
}
.top-bar { .top-bar {
clear: both !important; clear: both !important;
height: 100px !important; height: 100px !important;
} }
.locale, .external-links { .locale,
.external-links {
background: #002d50 !important; background: #002d50 !important;
} }
@@ -121,11 +371,12 @@
} }
.external-links { .external-links {
color: white !important; color: #fff !important;
float: right !important; float: right !important;
} }
.top-bar-title, .top-bar-title a, .top-bar-title a { .top-bar-title,
.top-bar-title a {
display: inline-block !important; display: inline-block !important;
float: none !important; float: none !important;
} }
@@ -140,28 +391,29 @@
margin: 0 !important; margin: 0 !important;
position: inherit !important; position: inherit !important;
&:after { &::after {
content: none !important; content: none !important;
} }
} }
form { form {
input, textarea { input,
textarea {
height: 48px !important; height: 48px !important;
line-height: 48px !important; line-height: 48px !important;
margin-bottom: 24px !important; margin-bottom: 24px !important;
width: 100% !important; width: 100% !important;
} }
input[type="checkbox"], [type="checkbox"],
input[type="radio"] { [type="radio"] {
height: auto !important; height: auto !important;
line-height: inherit !important; line-height: inherit !important;
width: auto !important; width: auto !important;
} }
input[type="radio"] { [type="radio"] {
width: 18px !important; width: 18px !important;
} }
} }
@@ -184,16 +436,17 @@ form {
// 02. Admin // 02. Admin
// --------- // ---------
body.admin form { .admin form {
input[type="text"], textarea { [type="text"],
textarea {
height: 48px !important; height: 48px !important;
line-height: 48px !important; line-height: 48px !important;
margin-bottom: 24px !important; margin-bottom: 24px !important;
} }
} }
.admin-sidebar ul [class^="icon-"] { .admin-sidebar [class^="icon-"] {
padding-left: 12px !important; padding-left: 12px !important;
padding-right: 12px !important; padding-right: 12px !important;
} }

File diff suppressed because it is too large Load Diff

View File

@@ -18,7 +18,7 @@
h4 { h4 {
font-weight: 400; font-weight: 400;
text-align: center; text-align: center;
color: white; color: #fff;
} }
} }
} }
@@ -28,7 +28,7 @@
.legislation-categories { .legislation-categories {
.menu.simple { .menu.simple {
border-bottom: none; border-bottom: 0;
list-style: none; list-style: none;
padding-left: 0; padding-left: 0;
margin-left: 0; margin-left: 0;
@@ -37,6 +37,7 @@
@include breakpoint(medium) { @include breakpoint(medium) {
margin: 1.5rem 0; margin: 1.5rem 0;
} }
}
li { li {
display: block; display: block;
@@ -47,9 +48,8 @@
margin-bottom: 2rem; margin-bottom: 2rem;
max-width: 80%; max-width: 80%;
} }
}
li.active { &.active {
font-weight: 700; font-weight: 700;
} }
} }
@@ -58,14 +58,14 @@
// 03. Legislation cards // 03. Legislation cards
// ----------------- // -----------------
.legislation { .legislation {
margin: 0 0 $line-height 0; margin: 0 0 $line-height;
background: white; background: #fff;
border: 1px solid; border: 1px solid;
border-color: #e5e6e9 #dfe0e4 #d0d1d5; border-color: #e5e6e9 #dfe0e4 #d0d1d5;
border-radius: 0; border-radius: 0;
box-shadow: 0px 1px 3px 0 #DEE0E3; box-shadow: 0 1px 3px 0 #dee0e3;
min-height: 12rem; min-height: 12rem;
padding: 2rem 0 0 0; padding: 2rem 0 0;
} }
.legislation-text { .legislation-text {
@@ -83,13 +83,13 @@
} }
.legislation-calendar { .legislation-calendar {
background: #E5ECF2; background: #e5ecf2;
padding-top: 1rem; padding-top: 1rem;
h5 { h5 {
margin-left: 0.25rem; margin-left: 0.25rem;
margin-bottom: 0; margin-bottom: 0;
color: #61686E; color: #61686e;
@include breakpoint(medium) { @include breakpoint(medium) {
margin-left: 0; margin-left: 0;

View File

@@ -16,7 +16,7 @@
// ----------------- // -----------------
.grey-heading { .grey-heading {
background: #E6E6E6; background: #e6e6e6;
} }
$epigraph-font-size: rem-calc(15); $epigraph-font-size: rem-calc(15);
@@ -39,15 +39,15 @@ $epigraph-line-height: rem-calc(22);
list-style: none; list-style: none;
margin-left: 0; margin-left: 0;
li:before { li::before {
vertical-align: text-bottom; vertical-align: text-bottom;
padding-right: 0.5rem; padding-right: 0.5rem;
content: ""; content: '';
color: #8AA8BE; color: #8aa8be;
} }
} }
#debate-show { .legislation-debate-show {
display: none; display: none;
} }
@@ -82,12 +82,9 @@ $epigraph-line-height: rem-calc(22);
} }
.half-gradient { .half-gradient {
/* Permalink - use to edit and share this gradient: http://colorzilla.com/gradient-editor/#e6e6e6+0,e6e6e6+50,ffffff+50 */ background: #e6e6e6;
background: #e6e6e6; /* Old browsers */ background: linear-gradient(to bottom, #e6e6e6 0%, #e6e6e6 50%, #fff 50%);
background: -moz-linear-gradient(top, #e6e6e6 0%, #e6e6e6 50%, #ffffff 50%); /* FF3.6-15 */ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e6e6e6', endColorstr='#fff', GradientType=0);
background: -webkit-linear-gradient(top, #e6e6e6 0%,#e6e6e6 50%,#ffffff 50%); /* Chrome10-25,Safari5.1-6 */
background: linear-gradient(to bottom, #e6e6e6 0%,#e6e6e6 50%,#ffffff 50%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e6e6e6', endColorstr='#ffffff',GradientType=0 ); /* IE6-9 */
} }
.text-center .button { .text-center .button {
@@ -115,6 +112,7 @@ $epigraph-line-height: rem-calc(22);
ul { ul {
font-size: $epigraph-font-size; font-size: $epigraph-font-size;
line-height: $epigraph-line-height; line-height: $epigraph-line-height;
}
li { li {
margin-bottom: 1rem; margin-bottom: 1rem;
@@ -124,7 +122,6 @@ $epigraph-line-height: rem-calc(22);
margin-bottom: 0; margin-bottom: 0;
} }
} }
}
h4 { h4 {
font-size: $base-font-size; font-size: $base-font-size;
@@ -134,6 +131,11 @@ $epigraph-line-height: rem-calc(22);
.button-subscribe { .button-subscribe {
margin-top: 1rem; margin-top: 1rem;
@include breakpoint(medium) {
padding: 0.5em 1em;
margin-top: 3rem;
}
h3 { h3 {
margin-bottom: 0; margin-bottom: 0;
} }
@@ -144,12 +146,7 @@ $epigraph-line-height: rem-calc(22);
} }
&:hover h3 { &:hover h3 {
color: white; color: #fff;
}
@include breakpoint(medium) {
padding: 0.5em 1em;
margin-top: 3rem;
} }
} }
} }
@@ -161,7 +158,7 @@ $epigraph-line-height: rem-calc(22);
.legislation-process-list { .legislation-process-list {
border-bottom: 1px solid $medium-gray; border-bottom: 1px solid $medium-gray;
margin: 0 1rem 1rem 1rem; margin: 0 1rem 1rem;
padding-top: 4rem; padding-top: 4rem;
@include breakpoint(medium) { @include breakpoint(medium) {
@@ -190,6 +187,7 @@ $epigraph-line-height: rem-calc(22);
left: -1rem; left: -1rem;
} }
} }
}
li { li {
cursor: pointer; cursor: pointer;
@@ -215,12 +213,13 @@ $epigraph-line-height: rem-calc(22);
a, a,
h4 { h4 {
display: block; display: block;
color: #6D6D6D; color: #6d6d6d;
margin-bottom: 0; margin-bottom: 0;
} }
a { a {
&:hover, &:active { &:hover,
&:active {
text-decoration: none; text-decoration: none;
} }
@@ -239,7 +238,6 @@ $epigraph-line-height: rem-calc(22);
} }
} }
} }
}
// 04. Debate list // 04. Debate list
// ----------------- // -----------------
@@ -269,21 +267,21 @@ $epigraph-line-height: rem-calc(22);
.debate-title a { .debate-title a {
color: $brand; color: $brand;
} }
}
.debate-meta, .debate-meta,
.debate-meta a { .debate-meta a {
font-size: $small-font-size; font-size: $small-font-size;
color: #6D6D6D; color: #6d6d6d;
.icon-comments { .icon-comments {
margin-right: 0.2rem; margin-right: 0.2rem;
} }
} }
}
.debate-info { .debate-info {
padding: 1rem; padding: 1rem;
background: #F4F4F4; background: #f4f4f4;
} }
} }
@@ -297,13 +295,14 @@ $epigraph-line-height: rem-calc(22);
.quiz-header { .quiz-header {
margin-bottom: 2rem; margin-bottom: 2rem;
.quiz-title, .quiz-next { .quiz-title,
.quiz-next {
padding: 1rem; padding: 1rem;
height: 6rem; height: 6rem;
} }
.quiz-title { .quiz-title {
background: #E5ECF2; background: #e5ecf2;
.quiz-header-title { .quiz-header-title {
margin-bottom: 0; margin-bottom: 0;
@@ -324,12 +323,13 @@ $epigraph-line-height: rem-calc(22);
.quiz-next-link { .quiz-next-link {
display: block; display: block;
&:hover, &:active { &:hover,
&:active {
text-decoration: none; text-decoration: none;
} }
.quiz-next { .quiz-next {
background: #CCDBE5; background: #ccdbe5;
font-weight: 700; font-weight: 700;
color: $brand; color: $brand;
font-size: $small-font-size; font-size: $small-font-size;
@@ -341,13 +341,14 @@ $epigraph-line-height: rem-calc(22);
vertical-align: sub; vertical-align: sub;
} }
&:hover, &:active { &:hover,
&:active {
text-decoration: none; text-decoration: none;
background: $brand; background: $brand;
color: white; color: #fff;
.icon-angle-right { .icon-angle-right {
color: white; color: #fff;
} }
} }
} }
@@ -380,8 +381,8 @@ $epigraph-line-height: rem-calc(22);
} }
.active { .active {
background: #CCDBE6; background: #ccdbe6;
border: none; border: 0;
} }
.control input { .control input {
@@ -392,7 +393,7 @@ $epigraph-line-height: rem-calc(22);
.control input:checked ~ .control-indicator { .control input:checked ~ .control-indicator {
background-color: $brand; background-color: $brand;
border: none; border: 0;
} }
.radio .control-indicator { .radio .control-indicator {
@@ -409,11 +410,8 @@ $epigraph-line-height: rem-calc(22);
line-height: 1rem; line-height: 1rem;
font-size: 65%; font-size: 65%;
text-align: center; text-align: center;
border: 2px solid #9C9C9C; border: 2px solid #9c9c9c;
pointer-events: none; pointer-events: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none; user-select: none;
} }
} }
@@ -422,9 +420,9 @@ $epigraph-line-height: rem-calc(22);
// 06. Legislation draft // 06. Legislation draft
// ----------------- // -----------------
.debate-draft { .debate-draft {
padding: 10rem 2rem 15rem 2rem; padding: 10rem 2rem 15rem;
display: block; display: block;
background: #F2F2F2; background: #f2f2f2;
button { button {
height: 90px; height: 90px;
@@ -445,7 +443,7 @@ $epigraph-line-height: rem-calc(22);
.legislation-allegation { .legislation-allegation {
padding-top: 1rem; padding-top: 1rem;
#debate-show { .legislation-debate-show {
margin-top: 2rem; margin-top: 2rem;
} }
@@ -459,7 +457,7 @@ $epigraph-line-height: rem-calc(22);
.button-circle { .button-circle {
line-height: 0; line-height: 0;
padding: 0em; padding: 0;
width: 30px; width: 30px;
height: 30px; height: 30px;
border-radius: 50%; border-radius: 50%;
@@ -467,7 +465,7 @@ $epigraph-line-height: rem-calc(22);
span { span {
padding-left: 1px; padding-left: 1px;
&:before { &::before {
line-height: 1.55; line-height: 1.55;
} }
} }
@@ -482,8 +480,12 @@ $epigraph-line-height: rem-calc(22);
.button-subscribed { .button-subscribed {
margin-top: 1rem; margin-top: 1rem;
border: 1px solid #D1D1D1; border: 1px solid #d1d1d1;
background: #F2F2F2; background: #f2f2f2;
@include breakpoint(medium) {
padding: 0.5em 1em;
}
h3 { h3 {
display: inline-block; display: inline-block;
@@ -499,10 +501,6 @@ $epigraph-line-height: rem-calc(22);
&:hover h3 { &:hover h3 {
color: $text; color: $text;
} }
@include breakpoint(medium) {
padding: 0.5em 1em;
}
} }
} }
@@ -547,7 +545,7 @@ $epigraph-line-height: rem-calc(22);
a { a {
text-decoration: underline; text-decoration: underline;
color: $text-medium color: $text-medium;
} }
} }
} }
@@ -585,12 +583,12 @@ $epigraph-line-height: rem-calc(22);
} }
.calc-text { .calc-text {
width: calc(65% - 25px) width: calc(65% - 25px);
} }
.calc-comments { .calc-comments {
cursor: pointer; cursor: pointer;
background: #F2F2F2; background: #f2f2f2;
width: 50px; width: 50px;
.draft-panel { .draft-panel {
@@ -618,7 +616,7 @@ $epigraph-line-height: rem-calc(22);
font-weight: 700; font-weight: 700;
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
color: #696969; color: #696969;
background: #F2F2F2; background: #f2f2f2;
font-size: $small-font-size; font-size: $small-font-size;
.icon-comments { .icon-comments {
@@ -647,21 +645,23 @@ $epigraph-line-height: rem-calc(22);
li { li {
margin-bottom: 1rem; margin-bottom: 1rem;
} }
.open::before { .open::before {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
margin-left: -1.25rem; margin-left: -1.25rem;
font-family: "icons"; font-family: 'icons';
content: "\58"; content: '\58';
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.closed::before { .closed::before {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
margin-left: -1.25rem; margin-left: -1.25rem;
font-family: "icons"; font-family: 'icons';
content: "\5a"; content: '\5a';
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
@@ -689,7 +689,7 @@ $epigraph-line-height: rem-calc(22);
.anchor::before { .anchor::before {
display: none; display: none;
content: "#"; content: '#';
color: $text-medium; color: $text-medium;
position: absolute; position: absolute;
left: 0; left: 0;
@@ -732,10 +732,7 @@ $epigraph-line-height: rem-calc(22);
font-weight: 700; font-weight: 700;
color: #696969; color: #696969;
margin-top: 4rem; margin-top: 4rem;
-webkit-transform: rotate(-90deg); transform: rotate(-90deg);
-moz-transform: rotate(-90deg);
-ms-transform: rotate(-90deg);
-o-transform: rotate(-90deg);
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
} }
} }
@@ -746,7 +743,7 @@ $epigraph-line-height: rem-calc(22);
.comments-on { .comments-on {
.calc-index { .calc-index {
width: 50px; width: 50px;
background: #F2F2F2; background: #f2f2f2;
cursor: pointer; cursor: pointer;
.panel-title { .panel-title {
@@ -766,10 +763,7 @@ $epigraph-line-height: rem-calc(22);
font-weight: 700; font-weight: 700;
color: #696969; color: #696969;
margin-top: $line-height; margin-top: $line-height;
-webkit-transform: rotate(-90deg); transform: rotate(-90deg);
-moz-transform: rotate(-90deg);
-ms-transform: rotate(-90deg);
-o-transform: rotate(-90deg);
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
.panel-title { .panel-title {
@@ -781,11 +775,11 @@ $epigraph-line-height: rem-calc(22);
.calc-text { .calc-text {
width: calc(65% - 25px); width: calc(65% - 25px);
border-right: none; border-right: 0;
.show-comments { .show-comments {
width: 105%; width: 105%;
background: #FAFAFA; background: #fafafa;
padding: 0.25rem 2.5rem 0.25rem 0.25rem; padding: 0.25rem 2.5rem 0.25rem 0.25rem;
border: 1px solid $border; border: 1px solid $border;
margin-bottom: 1rem; margin-bottom: 1rem;
@@ -798,7 +792,7 @@ $epigraph-line-height: rem-calc(22);
} }
.calc-comments { .calc-comments {
background: white; background: #fff;
cursor: auto; cursor: auto;
width: calc(35% - 25px); width: calc(35% - 25px);
@@ -810,7 +804,7 @@ $epigraph-line-height: rem-calc(22);
display: none; display: none;
} }
#comments-box { .comments-box-container {
position: absolute; position: absolute;
top: 230px; top: 230px;
} }
@@ -818,7 +812,7 @@ $epigraph-line-height: rem-calc(22);
.comment-box { .comment-box {
width: 375px; width: 375px;
padding: 1rem; padding: 1rem;
background: #F9F9F9; background: #f9f9f9;
border: 1px solid $border; border: 1px solid $border;
display: block; display: block;
margin-bottom: 2rem; margin-bottom: 2rem;
@@ -868,7 +862,7 @@ $epigraph-line-height: rem-calc(22);
.participation-not-allowed { .participation-not-allowed {
font-size: 0.875rem; font-size: 0.875rem;
height: 50px; height: 50px;
padding: .85rem 0.75rem; padding: 0.85rem 0.75rem;
top: -18px; top: -18px;
} }
} }
@@ -880,21 +874,21 @@ $epigraph-line-height: rem-calc(22);
border-bottom: 1px solid $border; border-bottom: 1px solid $border;
.comment-advice { .comment-advice {
border-top: 1px solid #D0D0D0; border-top: 1px solid #d0d0d0;
border-right: 1px solid #D0D0D0; border-right: 1px solid #d0d0d0;
border-left: 1px solid #D0D0D0; border-left: 1px solid #d0d0d0;
width: 100%; width: 100%;
padding: 0.5rem; padding: 0.5rem;
display: inline-block; display: inline-block;
font-size: $small-font-size; font-size: $small-font-size;
background: #DFDFDF; background: #dfdfdf;
.icon-proposals { .icon-proposals {
color: #838383; color: #838383;
} }
a { a {
color: #87A3B9; color: #87a3b9;
text-decoration: underline; text-decoration: underline;
} }
} }
@@ -902,9 +896,9 @@ $epigraph-line-height: rem-calc(22);
textarea { textarea {
border-radius: 0; border-radius: 0;
box-shadow: none; box-shadow: none;
border-bottom: 1px solid #D0D0D0; border-bottom: 1px solid #d0d0d0;
border-right: 1px solid #D0D0D0; border-right: 1px solid #d0d0d0;
border-left: 1px solid #D0D0D0; border-left: 1px solid #d0d0d0;
width: 100%; width: 100%;
height: 200px; height: 200px;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
@@ -912,7 +906,7 @@ $epigraph-line-height: rem-calc(22);
.comment-actions { .comment-actions {
.cancel-comment { .cancel-comment {
color: #87A3B9; color: #87a3b9;
text-decoration: underline; text-decoration: underline;
font-size: $small-font-size; font-size: $small-font-size;
display: inline-block; display: inline-block;
@@ -948,10 +942,11 @@ $epigraph-line-height: rem-calc(22);
display: inline-block; display: inline-block;
&::after { &::after {
content: "|"; content: '|';
color: #838383; color: #838383;
} }
} }
.comment-replies { .comment-replies {
display: inline-block; display: inline-block;
} }
@@ -968,14 +963,14 @@ $epigraph-line-height: rem-calc(22);
&::after { &::after {
margin-left: 0.25rem; margin-left: 0.25rem;
content: "|"; content: '|';
} }
} }
.icon-like, .icon-like,
.icon-unlike { .icon-unlike {
cursor: pointer; cursor: pointer;
color: #C7C7C7; color: #c7c7c7;
&:hover, &:hover,
&:active, &:active,
@@ -993,8 +988,8 @@ $epigraph-line-height: rem-calc(22);
} }
.draft-panel { .draft-panel {
background: #E5E5E5; background: #e5e5e5;
border-left: 1px solid #D4D4D4; border-left: 1px solid #d4d4d4;
.panel-title { .panel-title {
display: inline-block; display: inline-block;
@@ -1022,7 +1017,7 @@ $epigraph-line-height: rem-calc(22);
&::before { &::before {
margin-right: 0.25rem; margin-right: 0.25rem;
content: "" content: '';
} }
.changes-link { .changes-link {
@@ -1041,7 +1036,7 @@ $epigraph-line-height: rem-calc(22);
.icon-external { .icon-external {
text-decoration: none; text-decoration: none;
color: #999999; color: #999;
line-height: 0; line-height: 0;
vertical-align: sub; vertical-align: sub;
margin-left: 0.5rem; margin-left: 0.5rem;
@@ -1067,9 +1062,9 @@ $epigraph-line-height: rem-calc(22);
} }
.comment-section { .comment-section {
background: #FAFAFA; background: #fafafa;
padding: 1rem; padding: 1rem;
border: 1px solid #DEE0E3; border: 1px solid #dee0e3;
margin-top: 0.25rem; margin-top: 0.25rem;
margin-bottom: 1rem; margin-bottom: 1rem;
} }
@@ -1085,7 +1080,7 @@ $epigraph-line-height: rem-calc(22);
.icon-expand, .icon-expand,
.icon-comments { .icon-comments {
text-decoration: none; text-decoration: none;
color: #999999; color: #999;
line-height: 0; line-height: 0;
} }
@@ -1119,9 +1114,9 @@ $epigraph-line-height: rem-calc(22);
} }
.comment-section { .comment-section {
background: #FAFAFA; background: #fafafa;
padding: 1rem; padding: 1rem;
border: 1px solid #DEE0E3; border: 1px solid #dee0e3;
margin-top: 0.25rem; margin-top: 0.25rem;
margin-bottom: 1rem; margin-bottom: 1rem;
} }
@@ -1137,7 +1132,7 @@ $epigraph-line-height: rem-calc(22);
.icon-expand, .icon-expand,
.icon-comments { .icon-comments {
text-decoration: none; text-decoration: none;
color: #999999; color: #999;
line-height: 0; line-height: 0;
} }

View File

@@ -7,7 +7,7 @@
// -------- // --------
@mixin logo { @mixin logo {
color: white; color: #fff;
display: inline-block; display: inline-block;
font-family: 'Lato' !important; font-family: 'Lato' !important;
font-size: rem-calc(24); font-size: rem-calc(24);

View File

@@ -16,7 +16,7 @@
padding-top: $line-height; padding-top: $line-height;
&.light { &.light {
background: #ECF0F1; background: #ecf0f1;
} }
} }
@@ -50,7 +50,7 @@
color: $brand; color: $brand;
} }
.additional-info { .additional-info {
margin-bottom: $line-height; margin-bottom: $line-height;
} }
@@ -68,7 +68,7 @@
} }
} }
ul.features { .features {
list-style-type: circle; list-style-type: circle;
margin-left: $line-height; margin-left: $line-height;
@@ -77,7 +77,7 @@
} }
li { li {
margin-bottom: $line-height margin-bottom: $line-height;
} }
} }
@@ -104,7 +104,7 @@
padding: $line-height / 2; padding: $line-height / 2;
&.light { &.light {
background: #ECF0F1; background: #ecf0f1;
border: 0; border: 0;
} }
} }

View File

@@ -25,8 +25,9 @@
margin-top: 0; margin-top: 0;
} }
.icon-like, .icon-unlike { .icon-like,
background: white; .icon-unlike {
background: #fff;
border: 2px solid $text-light; border: 2px solid $text-light;
border-radius: rem-calc(3); border-radius: rem-calc(3);
color: $text-light; color: $text-light;
@@ -36,8 +37,9 @@
padding: rem-calc(3) rem-calc(6); padding: rem-calc(3) rem-calc(6);
position: relative; position: relative;
&:hover, &:active { &:hover,
color: white; &:active {
color: #fff;
cursor: pointer; cursor: pointer;
opacity: 1 !important; opacity: 1 !important;
} }
@@ -45,7 +47,8 @@
.icon-like { .icon-like {
&:hover, &:active { &:hover,
&:active {
background: $like; background: $like;
border: 2px solid $like; border: 2px solid $like;
} }
@@ -53,18 +56,20 @@
.icon-unlike { .icon-unlike {
&:hover, &:active { &:hover,
&:active {
background: $unlike; background: $unlike;
border: 2px solid $unlike; border: 2px solid $unlike;
} }
} }
.like, .unlike { .like,
.unlike {
line-height: rem-calc(48); line-height: rem-calc(48);
vertical-align: super; vertical-align: super;
text-decoration: none; text-decoration: none;
span.percentage { .percentage {
color: $text; color: $text;
display: inline-block; display: inline-block;
font-size: $small-font-size; font-size: $small-font-size;
@@ -82,8 +87,9 @@
.voted { .voted {
.icon-like, .icon-unlike { .icon-like,
color: white; .icon-unlike {
color: #fff;
} }
.icon-like { .icon-like {
@@ -99,8 +105,9 @@
.no-voted { .no-voted {
.icon-like, .icon-unlike { .icon-like,
opacity: .3; .icon-unlike {
opacity: 0.3;
} }
} }
@@ -153,7 +160,7 @@
color: $text-medium; color: $text-medium;
&[title] { &[title] {
border-bottom: none; border-bottom: 0;
} }
} }
@@ -164,7 +171,8 @@
font-size: $small-font-size; font-size: $small-font-size;
margin-top: rem-calc(12); margin-top: rem-calc(12);
&:hover, &:active { &:hover,
&:active {
background: lighten($proposals, 25%); background: lighten($proposals, 25%);
cursor: pointer; cursor: pointer;
} }
@@ -242,10 +250,12 @@
.budget-investment-form, .budget-investment-form,
.spending-proposal-form { .spending-proposal-form {
.icon-debates, .icon-proposals, .icon-budget { .icon-debates,
.icon-proposals,
.icon-budget {
font-size: rem-calc(50); font-size: rem-calc(50);
line-height: $line-height; line-height: $line-height;
opacity: .5; opacity: 0.5;
} }
.icon-debates { .icon-debates {
@@ -259,6 +269,7 @@
.icon-budget { .icon-budget {
color: $budget; color: $budget;
} }
}
.recommendations { .recommendations {
list-style-type: none; list-style-type: none;
@@ -269,24 +280,23 @@
font-size: $small-font-size; font-size: $small-font-size;
margin: $line-height / 2 0; margin: $line-height / 2 0;
&:before { &::before {
content: "l "; content: 'l ';
font-family: "icons" !important; font-family: "icons" !important;
} }
} }
} }
}
.debate-form { .debate-form {
.recommendations li:before { .recommendations li::before {
color: $debates; color: $debates;
} }
} }
.proposal-form { .proposal-form {
.recommendations li:before { .recommendations li::before {
color: $proposals; color: $proposals;
} }
} }
@@ -315,20 +325,24 @@
display: inline; display: inline;
} }
.whatsapp:before { .whatsapp::before {
background-color: #43d854; background-color: #43d854;
color: white; color: #fff;
font-size: 1.7em; font-size: 1.7em;
margin-left: rem-calc(0.5); margin-left: rem-calc(0.5);
padding: rem-calc(9.5) rem-calc(9.8); padding: rem-calc(9.5) rem-calc(9.8);
vertical-align: rem-calc(10); vertical-align: rem-calc(10);
} }
.edit-debate, .edit-proposal { .edit-debate,
.edit-proposal {
margin-bottom: 0; margin-bottom: 0;
} }
.debate-info, .proposal-info, .investment-project-info, .budget-investment-show { .debate-info,
.proposal-info,
.investment-project-info,
.budget-investment-show {
clear: both; clear: both;
color: $text-medium; color: $text-medium;
font-size: $small-font-size; font-size: $small-font-size;
@@ -350,26 +364,28 @@
} }
} }
.debate-description, .proposal-description { .debate-description,
.proposal-description {
font-size: rem-calc(15); font-size: rem-calc(15);
line-height: rem-calc(30); line-height: rem-calc(30);
} }
ul, ol { ul,
margin: rem-calc(12) 0; ol {
li { li {
font-size: rem-calc(15); font-size: rem-calc(15);
margin-bottom: rem-calc(15); margin-bottom: rem-calc(15);
} }
}
&.tags, &.geozone { &.tags,
&.geozone {
li { li {
margin-bottom: 0; margin-bottom: 0;
} }
} }
}
.author-photo { .author-photo {
line-height: rem-calc(32); line-height: rem-calc(32);
@@ -383,10 +399,6 @@
a { a {
color: $link !important; color: $link !important;
&:hover {
color: $link-hover !important;
}
} }
} }
@@ -403,14 +415,15 @@
} }
blockquote { blockquote {
color: #4C4C4C; color: #4c4c4c;
margin-top: rem-calc(12); margin-top: rem-calc(12);
padding-top: 0; padding-top: 0;
font-size: rem-calc(15); font-size: rem-calc(15);
line-height: rem-calc(30); line-height: rem-calc(30);
} }
.document-link, .video-link { .document-link,
.video-link {
border: 1px solid $border; border: 1px solid $border;
display: block; display: block;
margin: $line-height / 2 0; margin: $line-height / 2 0;
@@ -421,9 +434,9 @@
padding-left: rem-calc(24); padding-left: rem-calc(24);
} }
:before { ::before {
color: #007BB7; color: #007bb7;
content: "G"; content: 'G';
font-family: "icons" !important; font-family: "icons" !important;
font-size: rem-calc(24); font-size: rem-calc(24);
left: rem-calc(6); left: rem-calc(6);
@@ -435,9 +448,9 @@
.video-link { .video-link {
:before { ::before {
color: #CC181E; color: #cc181e;
content: "D"; content: 'D';
} }
} }
@@ -463,11 +476,14 @@
color: $text; color: $text;
} }
.investment-project-show p, .budget-investment-show p { .investment-project-show p,
.budget-investment-show p {
word-break: break-word; word-break: break-word;
} }
.proposal-show, .investment-project-show, .budget-investment-show { .proposal-show,
.investment-project-show,
.budget-investment-show {
.supports { .supports {
padding: $line-height / 2 0 0; padding: $line-height / 2 0 0;
@@ -481,38 +497,52 @@
// 04. List participation // 04. List participation
// ---------------------- // ----------------------
.debates-list, .proposals-list, .investment-projects-list, .budget-investments-list { .debates-list,
.proposals-list,
.investment-projects-list,
.budget-investments-list {
@include breakpoint(medium) { @include breakpoint(medium) {
margin-bottom: rem-calc(48); margin-bottom: rem-calc(48);
} }
} }
.investment-projects-list, .budget-investments-list { .investment-projects-list,
.budget-investments-list {
@include breakpoint(medium) { @include breakpoint(medium) {
min-height: $line-height * 15; min-height: $line-height * 15;
} }
} }
.debate, .proposal, .investment-project, .budget-investment, .legislation { .debate,
.proposal,
.investment-project,
.budget-investment,
.legislation {
margin: $line-height / 4 0; margin: $line-height / 4 0;
.panel { .panel {
background: white; background: #fff;
border: 1px solid; border: 1px solid;
border-color: #e5e6e9 #dfe0e4 #d0d1d5; border-color: #e5e6e9 #dfe0e4 #d0d1d5;
border-radius: 0; border-radius: 0;
box-shadow: 0px 1px 3px 0 $border; box-shadow: 0 1px 3px 0 $border;
margin-bottom: rem-calc(12); margin-bottom: rem-calc(12);
min-height: rem-calc(192); min-height: rem-calc(192);
padding: rem-calc(12) rem-calc(12) 0 rem-calc(12); padding: rem-calc(12) rem-calc(12) 0;
@include breakpoint(medium) { @include breakpoint(medium) {
margin-bottom: rem-calc(-1); margin-bottom: rem-calc(-1);
padding-bottom: rem-calc(12); padding-bottom: rem-calc(12);
} }
@include breakpoint(medium) {
.divider {
display: inline-block;
}
}
h3 { h3 {
font-weight: bold; font-weight: bold;
margin-top: $line-height / 2; margin-top: $line-height / 2;
@@ -521,19 +551,24 @@
color: $text; color: $text;
} }
} }
}
.debate-content, .proposal-content, .debate-content,
.investment-project-content, .budget-investment-content { .proposal-content,
.investment-project-content,
.budget-investment-content {
margin: 0; margin: 0;
min-height: rem-calc(180); min-height: rem-calc(180);
position: relative; position: relative;
}
.tags { .tags {
display: block; display: block;
} }
}
.icon-debates, .icon-proposals, .icon-budget { .icon-debates,
.icon-proposals,
.icon-budget {
font-size: rem-calc(18); font-size: rem-calc(18);
line-height: $line-height; line-height: $line-height;
margin-left: rem-calc(6); margin-left: rem-calc(6);
@@ -553,7 +588,10 @@
font-size: $small-font-size; font-size: $small-font-size;
} }
.debate-info, .proposal-info, .investment-project-info, .budget-investment-info { .debate-info,
.proposal-info,
.investment-project-info,
.budget-investment-info {
color: $text-medium; color: $text-medium;
font-size: $small-font-size; font-size: $small-font-size;
margin: rem-calc(6) 0 0; margin: rem-calc(6) 0 0;
@@ -568,7 +606,10 @@
} }
} }
.debate-description, .proposal-description, .investment-project-description, .budget-investment-description { .debate-description,
.proposal-description,
.investment-project-description,
.budget-investment-description {
color: $text; color: $text;
font-size: rem-calc(13); font-size: rem-calc(13);
height: rem-calc(72); height: rem-calc(72);
@@ -581,14 +622,6 @@
a { a {
color: $text; color: $text;
} }
ul, ol {
li {
font-size: rem-calc(13);
margin-bottom: rem-calc(12);
}
}
} }
.truncate { .truncate {
@@ -609,13 +642,6 @@
display: none; display: none;
} }
@include breakpoint(medium) {
.divider {
display: inline-block;
}
}
}
.more-info { .more-info {
clear: both; clear: both;
color: $text-medium; color: $text-medium;
@@ -626,18 +652,19 @@
} }
} }
.debate, .debate-show { .debate,
.debate-show {
.votes { .votes {
@include votes; @include votes;
.against {
margin-left: $line-height/4;
}
@include breakpoint(medium) { @include breakpoint(medium) {
text-align: center; text-align: center;
} }
.against {
margin-left: $line-height / 4;
}
} }
} }
@@ -653,8 +680,10 @@
} }
} }
.investment-project, .investment-project-show, .investment-project,
.budget-investment, .budget-investment-show { .investment-project-show,
.budget-investment,
.budget-investment-show {
.supports { .supports {
@include supports; @include supports;
@@ -669,16 +698,16 @@
.button-support { .button-support {
background: $budget; background: $budget;
color: white; color: #fff;
&:hover { &:hover {
background: $budget-hover; background: $budget-hover;
color: white; color: #fff;
cursor: pointer; cursor: pointer;
} }
&:active { &:active {
opacity: .75; opacity: 0.75;
} }
} }
@@ -745,7 +774,8 @@
// 05. Featured // 05. Featured
// ------------ // ------------
.featured-debates, .featured-proposals, .featured-debates,
.featured-proposals,
.enquiries-list { .enquiries-list {
padding: $line-height / 2 0; padding: $line-height / 2 0;
@@ -769,11 +799,11 @@
} }
} }
a, .info { a,
.info {
color: lighten($text, 15%); color: lighten($text, 15%);
font-size: $small-font-size; font-size: $small-font-size;
} }
} }
.featured-debates { .featured-debates {
@@ -794,7 +824,7 @@
padding-bottom: 0; padding-bottom: 0;
padding-top: 0; padding-top: 0;
&:after { &::after {
content: none; content: none;
} }
@@ -808,7 +838,7 @@
margin-top: 0; margin-top: 0;
&:hover { &:hover {
background: white; background: #fff;
color: $text; color: $text;
} }
} }
@@ -833,25 +863,25 @@
margin-top: 0; margin-top: 0;
font-size: $small-font-size; font-size: $small-font-size;
} }
}
.share-supported { .share-supported {
.ssb-twitter, .ssb-twitter,
.ssb-facebook, .ssb-facebook,
.ssb-google_plus { [class^="ssb-icon ssb-google"] {
background: none; background: none;
color: $text; color: $text;
height: rem-calc(33) !important; height: rem-calc(33) !important;
&:before { &::before {
font-size: rem-calc(18); font-size: rem-calc(18);
line-height: rem-calc(33); line-height: rem-calc(33);
} }
} }
} }
} }
}
// 06. Budget // 06. Budget
// ---------- // ----------
@@ -859,26 +889,26 @@
.expanded.budget { .expanded.budget {
background: $budget; background: $budget;
h1, h2, p, a.back, .icon-angle-left { h1,
color: white; h2,
p,
.back,
.icon-angle-left {
color: #fff;
} }
.button { .button {
background: white; background: #fff;
color: $budget; color: $budget;
} }
.info { .info {
background: #6A2A72; background: #6a2a72;
p { p {
margin-bottom: 0; margin-bottom: 0;
text-transform: uppercase; text-transform: uppercase;
} }
@include breakpoint(medium) {
border-top: rem-calc(6) solid #54225C;
}
} }
} }
@@ -894,8 +924,13 @@
margin-bottom: 0; margin-bottom: 0;
} }
h1, h2, .back, .icon-angle-left, p, a { h1,
color: white; h2,
.back,
.icon-angle-left,
p,
a {
color: #fff;
} }
.callout.warning { .callout.warning {
@@ -914,6 +949,7 @@
.spending-proposal-timeline { .spending-proposal-timeline {
padding-top: $line-height; padding-top: $line-height;
}
ul li { ul li {
margin-right: $line-height; margin-right: $line-height;
@@ -924,36 +960,35 @@
} }
} }
} }
}
a { a {
text-decoration: underline; text-decoration: underline;
}
&.button { .button {
background: white; background: #fff;
color: $brand; color: $brand;
margin-bottom: rem-calc(3); margin-bottom: rem-calc(3);
text-decoration: none; text-decoration: none;
} }
}
.social-share-button a { .social-share-button a {
color: white; color: #fff;
&.social-share-button-twitter:hover { &.social-share-button-twitter:hover {
color: #40A2D1; color: #40a2d1;
} }
&.social-share-button-facebook:hover { &.social-share-button-facebook:hover {
color: #354F88; color: #354f88;
} }
&.social-share-button-google_plus:hover { &[class^="social-share-button-google"] {
color: #CE3E26; color: #ce3e26;
} }
&.social-share-button-telegram:hover { &.social-share-button-telegram:hover {
color: #CE3E26; color: #ce3e26;
} }
} }
} }
@@ -969,7 +1004,6 @@
.progress-meter { .progress-meter {
background: #fdcb10; background: #fdcb10;
border-radius: 0; border-radius: 0;
-webkit-transition: width 2s;
transition: width 2s; transition: width 2s;
} }
@@ -979,7 +1013,7 @@
} }
.spent-amount-text { .spent-amount-text {
color: white; color: #fff;
font-size: $base-font-size; font-size: $base-font-size;
font-weight: normal; font-weight: normal;
position: absolute; position: absolute;
@@ -988,9 +1022,9 @@
top: 16px; top: 16px;
width: 100%; width: 100%;
&:before { &::before {
color: #a5a1ff; color: #a5a1ff;
content: "\57"; content: '\57';
font-family: 'icons'; font-family: 'icons';
font-size: $small-font-size; font-size: $small-font-size;
position: absolute; position: absolute;
@@ -1000,7 +1034,7 @@
} }
.total-amount { .total-amount {
color: white; color: #fff;
font-size: rem-calc(18); font-size: rem-calc(18);
font-weight: bold; font-weight: bold;
float: right; float: right;
@@ -1030,7 +1064,8 @@
.ballot { .ballot {
h2, h3 { h2,
h3 {
font-weight: normal; font-weight: normal;
span { span {
@@ -1040,7 +1075,7 @@
} }
.ballot-content { .ballot-content {
border: 2px solid #F9F9F9; border: 2px solid #f9f9f9;
border-radius: rem-calc(6); border-radius: rem-calc(6);
padding: $line-height / 2; padding: $line-height / 2;
} }
@@ -1063,7 +1098,7 @@
} }
} }
ul.ballot-list { .ballot-list {
list-style: none; list-style: none;
margin-left: 0; margin-left: 0;
@@ -1104,16 +1139,17 @@ ul.ballot-list {
&:hover { &:hover {
background: $budget; background: $budget;
color: white; color: #fff;
a, span { a,
color: white; span {
color: #fff;
outline: 0; outline: 0;
text-decoration: none; text-decoration: none;
} }
.remove-investment-project .icon-x { .remove-investment-project .icon-x {
color: white; color: #fff;
} }
} }
} }
@@ -1131,9 +1167,9 @@ ul.ballot-list {
color: $budget; color: $budget;
font-weight: bold; font-weight: bold;
&:after { &::after {
content: "\56"; content: '\56';
font-family: "icons"; font-family: 'icons';
font-size: $small-font-size; font-size: $small-font-size;
font-weight: normal; font-weight: normal;
line-height: $line-height; line-height: $line-height;
@@ -1153,13 +1189,9 @@ ul.ballot-list {
@include breakpoint(medium) { @include breakpoint(medium) {
background-color: $budget; background-color: $budget;
-webkit-transition: height 0.3s;
-moz-transition: height 0.3s;
transition: height 0.3s; transition: height 0.3s;
h1 { h1 {
-webkit-transition: font-size 0.3s;
-moz-transition: font-size 0.3s;
transition: font-size 0.3s; transition: font-size 0.3s;
} }
@@ -1177,8 +1209,6 @@ ul.ballot-list {
h1 { h1 {
font-size: rem-calc(24); font-size: rem-calc(24);
-webkit-transition: font-size 0.3s;
-moz-transition: font-size 0.3s;
transition: font-size 0.3s; transition: font-size 0.3s;
} }
} }
@@ -1189,8 +1219,8 @@ ul.ballot-list {
// ------------------------- // -------------------------
.dark-heading { .dark-heading {
background: #2D3E50; background: #2d3e50;
color: white; color: #fff;
@include breakpoint(medium) { @include breakpoint(medium) {
padding-bottom: $line-height; padding-bottom: $line-height;
@@ -1199,7 +1229,7 @@ ul.ballot-list {
p { p {
&.title { &.title {
color: #FFD200; color: #ffd200;
} }
&.title-date { &.title-date {
@@ -1213,40 +1243,42 @@ ul.ballot-list {
padding-top: $line-height; padding-top: $line-height;
@include breakpoint(medium) { @include breakpoint(medium) {
border-top: rem-calc(6) solid #FFD200; border-top: rem-calc(6) solid #ffd200;
} }
} }
} }
.featured-proposals-ballot-banner, .sucessfull-proposals-banner { .featured-proposals-ballot-banner,
background: #2D3E50 image-url("ballot_tiny.gif") no-repeat; .sucessfull-proposals-banner {
background: #2d3e50 image-url('ballot_tiny.gif') no-repeat;
background-position: 75% 0; background-position: 75% 0;
position: relative; position: relative;
h2, a:hover h2 {
color: #FFD200 !important;
}
p {
color: white;
}
@include breakpoint(medium) { @include breakpoint(medium) {
margin-left: 0 !important; margin-left: 0 !important;
margin-right: 0 !important; margin-right: 0 !important;
} }
@include breakpoint(large) { @include breakpoint(large) {
background: #2D3E50 image-url("ballot.gif") no-repeat; background: #2d3e50 image-url('ballot.gif') no-repeat;
background-position: 90% 0; background-position: 90% 0;
} }
h2,
a:hover h2 {
color: #ffd200 !important;
}
p {
color: #fff;
}
} }
.sucessfull-proposals-banner, .sucessfull-proposals-banner,
.successful .panel { .successful .panel {
.icon-successful { .icon-successful {
border-right: 60px solid #FFD200; border-right: 60px solid #ffd200;
border-top: 0; border-top: 0;
border-bottom: 60px solid transparent; border-bottom: 60px solid transparent;
height: 0; height: 0;
@@ -1255,9 +1287,9 @@ ul.ballot-list {
top: 0; top: 0;
width: 0; width: 0;
&:after { &::after {
color: #1B254C; color: #1b254c;
content: "\59"; content: '\59';
font-family: "icons" !important; font-family: "icons" !important;
left: 34px; left: 34px;
position: absolute; position: absolute;
@@ -1292,15 +1324,15 @@ ul.ballot-list {
// ---------------------- // ----------------------
.dark-heading { .dark-heading {
background: #2D3E50; background: #2d3e50;
color: white; color: #fff;
.title { .title {
color: #92BA48; color: #92ba48;
} }
.button { .button {
background: white; background: #fff;
color: $brand; color: $brand;
} }
@@ -1324,17 +1356,18 @@ ul.ballot-list {
padding: $line-height; padding: $line-height;
@include breakpoint(medium) { @include breakpoint(medium) {
border-top: rem-calc(6) solid #92BA48; border-top: rem-calc(6) solid #92ba48;
} }
} }
a:not(.button) { a:not(.button) {
color: white; color: #fff;
text-decoration: underline; text-decoration: underline;
} }
.back, .icon-angle-left { .back,
color: white; .icon-angle-left {
color: #fff;
} }
&.polls-show-header { &.polls-show-header {
@@ -1342,8 +1375,9 @@ ul.ballot-list {
} }
} }
.poll, .poll-question { .poll,
background: white; .poll-question {
background: #fff;
border-radius: rem-calc(6); border-radius: rem-calc(6);
margin-bottom: $line-height / 2; margin-bottom: $line-height / 2;
} }
@@ -1361,11 +1395,11 @@ ul.ballot-list {
top: 0; top: 0;
width: 0; width: 0;
&.can-answer:after, &.can-answer::after,
&.cant-answer:after, &.cant-answer::after,
&.not-logged-in:after, &.not-logged-in::after,
&.already-answer:after, &.already-answer::after,
&.unverified:after { &.unverified::after {
font-family: "icons" !important; font-family: "icons" !important;
left: 34px; left: 34px;
position: absolute; position: absolute;
@@ -1375,45 +1409,45 @@ ul.ballot-list {
&.can-answer { &.can-answer {
border-right: 60px solid $info-bg; border-right: 60px solid $info-bg;
&:after { &::after {
color: $color-info; color: $color-info;
content: "\6c"; content: '\6c';
} }
} }
&.cant-answer { &.cant-answer {
border-right: 60px solid $alert-bg; border-right: 60px solid $alert-bg;
&:after { &::after {
color: $color-alert; color: $color-alert;
content: "\74"; content: '\74';
} }
} }
&.not-logged-in { &.not-logged-in {
border-right: 60px solid $info-bg; border-right: 60px solid $info-bg;
&:after { &::after {
color: $color-info; color: $color-info;
content: "\6f"; content: '\6f';
} }
} }
&.unverified { &.unverified {
border-right: 60px solid $warning-bg; border-right: 60px solid $warning-bg;
&:after { &::after {
color: $color-warning; color: $color-warning;
content: "\6f"; content: '\6f';
} }
} }
&.already-answer { &.already-answer {
border-right: 60px solid $success-bg; border-right: 60px solid $success-bg;
&:after { &::after {
color: $color-success; color: $color-success;
content: "\59"; content: '\59';
} }
} }
} }
@@ -1434,11 +1468,11 @@ ul.ballot-list {
} }
} }
h2.questions-callout { .questions-callout {
font-size: $base-font-size; font-size: $base-font-size;
} }
h3.section-title-divider { .section-title-divider {
border-bottom: 2px solid $brand; border-bottom: 2px solid $brand;
color: $brand; color: $brand;
margin-bottom: $line-height; margin-bottom: $line-height;
@@ -1463,16 +1497,16 @@ h3.section-title-divider {
min-width: rem-calc(168); min-width: rem-calc(168);
&.answered { &.answered {
background: #F4F8EC; background: #f4f8ec;
border: 2px solid #92BA48; border: 2px solid #92ba48;
color: $text; color: $text;
position: relative; position: relative;
&:after { &::after {
background: #92BA48; background: #92ba48;
border-radius: rem-calc(20); border-radius: rem-calc(20);
content: "\6c"; content: '\6c';
color: white; color: #fff;
font-family: "icons" !important; font-family: "icons" !important;
font-size: rem-calc(12); font-size: rem-calc(12);
padding: $line-height / 4; padding: $line-height / 4;

View File

@@ -79,7 +79,7 @@
<div class="small-12 medium-6 column markdown-area"> <div class="small-12 medium-6 column markdown-area">
<%= f.text_area :body, label: false, placeholder: t('admin.legislation.draft_versions.form.body_placeholder') %> <%= f.text_area :body, label: false, placeholder: t('admin.legislation.draft_versions.form.body_placeholder') %>
</div> </div>
<div id="markdown-preview" class="small-12 medium-6 column"> <div id="markdown-preview" class="small-12 medium-6 column markdown-preview">
</div> </div>
</div> </div>
</div> </div>

View File

@@ -6,7 +6,7 @@
<h2 class="inline-block"><%= t("admin.site_customization.content_blocks.index.title") %></h2> <h2 class="inline-block"><%= t("admin.site_customization.content_blocks.index.title") %></h2>
<table class="cms_page_list"> <table class="cms-page-list">
<thead> <thead>
<tr> <tr>
<th><%= t("admin.site_customization.content_blocks.content_block.name") %></th> <th><%= t("admin.site_customization.content_blocks.content_block.name") %></th>

View File

@@ -8,7 +8,7 @@
<% if @pages.any? %> <% if @pages.any? %>
<h3><%= page_entries_info @pages %></h3> <h3><%= page_entries_info @pages %></h3>
<table class="cms_page_list"> <table class="cms-page-list">
<thead> <thead>
<tr> <tr>
<th><%= t("admin.site_customization.pages.page.title") %></th> <th><%= t("admin.site_customization.pages.page.title") %></th>

View File

@@ -1,4 +1,4 @@
<header> <header class="header">
<div class="top-links"> <div class="top-links">
<div class="expanded row"> <div class="expanded row">
<%= render 'shared/locale_switcher' %> <%= render 'shared/locale_switcher' %>

View File

@@ -9,7 +9,7 @@
<span class="panel-title"><%= t('legislation.draft_versions.show.text_comments') %></span> <span class="panel-title"><%= t('legislation.draft_versions.show.text_comments') %></span>
</div> </div>
<div id="comments-box" style="display: none;"> <div id="comments-box" class="comments-box-container" style="display: none;">
<div class="comment-box"> <div class="comment-box">
<div class="comment-header"> <div class="comment-header">
<span class="icon-comment" aria-hidden="true"></span> <span class="icon-comment" aria-hidden="true"></span>

View File

@@ -6,7 +6,7 @@
</div> </div>
</div> </div>
<div id="debate-show" class="row description"> <div id="debate-show" class="row description legislation-debate-show">
<div class="small-12 column"> <div class="small-12 column">
<% if process.description.present? %> <% if process.description.present? %>
<h4><%= t('legislation.processes.header_full.description') %></h4> <h4><%= t('legislation.processes.header_full.description') %></h4>

View File

@@ -16,7 +16,7 @@
<% end %> <% end %>
</div> </div>
<% if process.additional_info.present? %> <% if process.additional_info.present? %>
<div id="debate-show" class="small-12 column debate-add-info"> <div id="debate-show" class="small-12 column debate-add-info legislation-debate-show">
<div class="debate-info-wrapper"> <div class="debate-info-wrapper">
<%= markdown process.additional_info if process.additional_info %> <%= markdown process.additional_info if process.additional_info %>
</div> </div>

View File

@@ -2,7 +2,7 @@
<%= render 'admin/shared/proposal_search', url: management_proposals_path %> <%= render 'admin/shared/proposal_search', url: management_proposals_path %>
<div class="row"> <div class="row">
<div id="proposals" class="proposals-list small-12 medium-9 column"> <div class="proposals-list small-12 column">
<div class="filters"> <div class="filters">
<div class="small-12 medium-7 float-left"> <div class="small-12 medium-7 float-left">

View File

@@ -1,6 +1,6 @@
<main> <main>
<div class="row"> <div class="row">
<div id="proposals" class="proposals-list small-12 column"> <div class="proposals-list small-12 column">
<a id="print_link" href="javascript:window.print();" class="button warning float-right"> <a id="print_link" href="javascript:window.print();" class="button warning float-right">
<%= t('management.proposals.print.print_button') %> <%= t('management.proposals.print.print_button') %>
</a> </a>

View File

@@ -1,7 +1,7 @@
<a href="#" class="button float-right margin-right">Crear nueva página</a> <a href="#" class="button float-right margin-right">Crear nueva página</a>
<h2 class="inline-block">Editar páginas</h2> <h2 class="inline-block">Editar páginas</h2>
<table class="cms_page_list"> <table class="cms-page-list">
<thead> <thead>
<tr> <tr>
<th>Nombre</th> <th>Nombre</th>

View File

@@ -36,7 +36,7 @@
</div> </div>
</div> </div>
<form class="edit_legislation_draft_version" id="edit_legislation_draft_version_1" action="/admin/legislation/processes/1/draft_versions/1" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="&#x2713;" /><input type="hidden" name="_method" value="patch" /><input type="hidden" name="authenticity_token" value="PGlvCYHqh/eXoeE0qz7DEZHsTghiKHY9HSZa2JNj+5pFPxPkF1Zuq3gaAuTmTjjhNi86OYIebJPVjFoaBIRaCA==" /> <form class="edit-legislation-draft-version" id="edit_legislation_draft_version_1" action="/admin/legislation/processes/1/draft_versions/1" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="&#x2713;" /><input type="hidden" name="_method" value="patch" /><input type="hidden" name="authenticity_token" value="PGlvCYHqh/eXoeE0qz7DEZHsTghiKHY9HSZa2JNj+5pFPxPkF1Zuq3gaAuTmTjjhNi86OYIebJPVjFoaBIRaCA==" />
<div class="row"> <div class="row">
<div class="small-12 medium-4 column"> <div class="small-12 medium-4 column">
@@ -105,7 +105,7 @@ Esta es la primera versión, no hay cambios.</textarea>
<a class="fullscreen-toggle" href="#"><span>Pantalla completa</span> <span class="icon-expand"></span></a> <a class="fullscreen-toggle" href="#"><span>Pantalla completa</span> <span class="icon-expand"></span></a>
</div> </div>
<div class="small-12 medium-6 column"> <div class="small-12 medium-6 column">
<textarea name="legislation_draft_version[body]" id="legislation_draft_version_body"> <textarea name="legislation_draft_version[body]" id="legislation_draft_version_body" class="legislation-draft-version-body">
## PREÁMBULO ## PREÁMBULO
### I ### I
@@ -579,7 +579,7 @@ e) La afectación legal de los terrenos obtenidos por la Administración en virt
3. Antes de la finalización de las obras de urbanización no es posible, con carácter general, la realización de otros actos edificatorios o de implantación de usos que los provisionales previstos en la letra b) del número 1 anterior. Sin embargo, podrá autorizarse la edificación vinculada a la simultánea terminación de las obras de urbanización inmediata a la parcela de que se trate, en las mismas condiciones que en el suelo urbano consolidado. 3. Antes de la finalización de las obras de urbanización no es posible, con carácter general, la realización de otros actos edificatorios o de implantación de usos que los provisionales previstos en la letra b) del número 1 anterior. Sin embargo, podrá autorizarse la edificación vinculada a la simultánea terminación de las obras de urbanización inmediata a la parcela de que se trate, en las mismas condiciones que en el suelo urbano consolidado.
</textarea> </textarea>
</div> </div>
<div id="markdown-preview" class="small-12 medium-6 column"></div> <div id="markdown-preview" class="small-12 medium-6 column markdown-preview"></div>
<div id="markdown-result"> <div id="markdown-result">
<input label="false" type="hidden" value="&lt;h2&gt;PREÁMBULO&lt;/h2&gt; <input label="false" type="hidden" value="&lt;h2&gt;PREÁMBULO&lt;/h2&gt;
&lt;h3&gt;I&lt;/h3&gt; &lt;h3&gt;I&lt;/h3&gt;

View File

@@ -18,7 +18,7 @@
</li> </li>
</ul> </ul>
<form class="edit_legislation_process" id="edit_legislation_process_1" action="/admin/legislation/processes/1" accept-charset="UTF-8" method="post"> <form class="edit-legislation-process" id="edit_legislation_process_1" action="/admin/legislation/processes/1" accept-charset="UTF-8" method="post">
<div class="row"> <div class="row">
<div class="small-12 medium-4 column"> <div class="small-12 medium-4 column">

View File

@@ -86,15 +86,18 @@ feature 'Admin legislation draft versions' do
click_link 'Version 1' click_link 'Version 1'
fill_in 'legislation_draft_version_title', with: 'Version 1b'
click_link 'Launch text editor' click_link 'Launch text editor'
fill_in 'legislation_draft_version_title', with: 'Version 1b'
fill_in 'legislation_draft_version_body', with: '# Version 1 body\r\n\r\nParagraph\r\n\r\n>Quote' fill_in 'legislation_draft_version_body', with: '# Version 1 body\r\n\r\nParagraph\r\n\r\n>Quote'
within('.fullscreen') do within('.fullscreen') do
click_button 'Save changes' click_link 'Close text editor'
end end
click_button 'Save changes'
expect(page).to have_content 'Version 1b' expect(page).to have_content 'Version 1b'
end end
end end

View File

@@ -97,7 +97,7 @@ feature 'Proposals' do
expect(current_path).to eq(management_proposals_path) expect(current_path).to eq(management_proposals_path)
within("#proposals") do within(".proposals-list") do
expect(page).to have_css('.proposal', count: 1) expect(page).to have_css('.proposal', count: 1)
expect(page).to have_content(proposal1.title) expect(page).to have_content(proposal1.title)
expect(page).to have_content(proposal1.summary) expect(page).to have_content(proposal1.summary)
@@ -124,7 +124,7 @@ feature 'Proposals' do
expect(page).to have_content "#{user.document_number}" expect(page).to have_content "#{user.document_number}"
end end
within("#proposals") do within(".proposals-list") do
expect(page).to have_css('.proposal', count: 2) expect(page).to have_css('.proposal', count: 2)
expect(page).to have_css("a[href='#{management_proposal_path(proposal1)}']", text: proposal1.title) expect(page).to have_css("a[href='#{management_proposal_path(proposal1)}']", text: proposal1.title)
expect(page).to have_content(proposal1.summary) expect(page).to have_content(proposal1.summary)
@@ -143,7 +143,7 @@ feature 'Proposals' do
click_link "Support proposals" click_link "Support proposals"
within("#proposals") do within(".proposals-list") do
find('.in-favor a').click find('.in-favor a').click
expect(page).to have_content "1 support" expect(page).to have_content "1 support"
@@ -160,7 +160,7 @@ feature 'Proposals' do
click_link "Support proposals" click_link "Support proposals"
within("#proposals") do within(".proposals-list") do
click_link proposal.title click_link proposal.title
end end
@@ -205,7 +205,7 @@ feature 'Proposals' do
expect(page).to have_selector('.js-order-selector[data-order="confidence_score"]') expect(page).to have_selector('.js-order-selector[data-order="confidence_score"]')
within '#proposals' do within(".proposals-list") do
expect('Best proposal').to appear_before('Medium proposal') expect('Best proposal').to appear_before('Medium proposal')
expect('Medium proposal').to appear_before('Worst proposal') expect('Medium proposal').to appear_before('Worst proposal')
end end
@@ -217,7 +217,7 @@ feature 'Proposals' do
expect(current_url).to include('order=created_at') expect(current_url).to include('order=created_at')
expect(current_url).to include('page=1') expect(current_url).to include('page=1')
within '#proposals' do within(".proposals-list") do
expect('Medium proposal').to appear_before('Best proposal') expect('Medium proposal').to appear_before('Best proposal')
expect('Best proposal').to appear_before('Worst proposal') expect('Best proposal').to appear_before('Worst proposal')
end end