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
# Access an IRB console on exception pages or by using <%= console %> in views
gem 'scss_lint', require: false
gem 'web-console', '3.3.0'
end
eval_gemfile './Gemfile_custom'

View File

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

View File

@@ -47,7 +47,6 @@ RAILS_ENV=test rake db:setup
Run the app locally:
```
bin/rails s
```
Prerequisites for testing: install PhantomJS >= 1.9.8
@@ -58,6 +57,12 @@ Run the tests with:
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:
**user:** admin@consul.dev

View File

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

View File

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

View File

@@ -13,22 +13,22 @@
// 01. Global styles
// -----------------
$admin-color: #CF3638;
$admin-color: #cf3638;
body.admin {
.admin {
header {
.header {
border: 0;
}
.top-links {
background: darken($admin-color, 15%);
}
.back-web {
padding-top: $line-height/4;
padding-top: $line-height / 4;
text-decoration: underline;
}
}
.top-bar {
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 {
select {
height: $line-height*2;
height: $line-height * 2;
}
.input-group input[type="text"] {
[type="text"] {
border-radius: 0;
margin-bottom: 0 !important;
}
}
}
table {
th {
text-align: left;
@@ -84,12 +67,12 @@ body.admin {
}
&.with-button {
line-height: $line-height*2;
line-height: $line-height * 2;
}
}
tr {
background: white;
background: #fff;
border: 1px solid $border;
&:hover {
@@ -97,7 +80,8 @@ body.admin {
}
}
td.break {
table {
.break {
word-break: break-word;
}
@@ -105,14 +89,15 @@ body.admin {
table-layout: fixed;
}
input[type="submit"] ~ a, a ~ a {
[type="submit"] ~ a,
a ~ a {
margin-left: 0;
margin-right: 0;
margin-top: $line-height/2;
margin-top: $line-height / 2;
@include breakpoint(medium) {
margin-left: $line-height/2;
margin-right: $line-height/2;
margin-left: $line-height / 2;
margin-right: $line-height / 2;
margin-top: 0;
}
}
@@ -122,7 +107,7 @@ body.admin {
max-width: none;
}
.menu.simple li.active {
.menu.simple .active {
border-bottom: 2px solid $admin-color;
color: $admin-color;
}
@@ -132,10 +117,6 @@ body.admin {
padding-right: 0;
}
#proposals {
width: 100% !important;
}
.accordion-title {
font-size: $base-font-size;
}
@@ -183,7 +164,7 @@ body.admin {
&:hover .on-hover-block {
display: block;
margin: 0;
margin-top: $line-height/2;
margin-top: $line-height / 2;
width: 100%;
}
}
@@ -231,20 +212,21 @@ body.admin {
display: inline-block;
font-size: rem-calc(24);
line-height: $line-height;
padding: $line-height/2 $line-height/4;
padding: $line-height / 2 $line-height / 4;
padding-left: 0;
vertical-align: middle;
}
}
li {
background: white;
background: #fff;
margin: 0;
outline: 0;
ul {
margin-left: $line-height/1.5;
margin-left: $line-height / 1.5;
border-left: 1px solid $border;
padding-left: $line-height/2;
padding-left: $line-height / 2;
}
&.section-title {
@@ -254,8 +236,6 @@ body.admin {
&.active a {
background: #f3f6f7;
border-radius: rem-calc(6);
-moz-border-radius: rem-calc(6);
-webkit-border-radius: rem-calc(6);
color: $admin-color;
font-weight: bold;
}
@@ -271,17 +251,14 @@ body.admin {
&:hover {
background: #f3f6f7;
border-radius: rem-calc(6);
-moz-border-radius: rem-calc(6);
-webkit-border-radius: rem-calc(6);
color: $admin-color;
text-decoration: none;
}
}
}
.is-accordion-submenu-parent {
& > a::after {
> a::after {
border-color: $admin-color transparent transparent;
}
}
@@ -291,11 +268,11 @@ body.admin {
margin-left: $line-height;
li:first-child {
padding-top: $line-height/2;
padding-top: $line-height / 2;
}
li:last-child {
padding-bottom: $line-height/2;
padding-bottom: $line-height / 2;
}
a {
@@ -308,12 +285,14 @@ body.admin {
// -----------------
.delete {
border-bottom: 1px dotted #CF2A0E;
border-bottom: 1px dotted #cf2a0e;
color: $delete;
font-size: $small-font-size;
&:hover, &:active, &:focus {
border-bottom: 1px dotted white;
&:hover,
&:active,
&:focus {
border-bottom: 1px dotted #fff;
color: #cf2a0e;
}
}
@@ -376,8 +355,6 @@ body.admin {
&:hover {
max-height: rem-calc(1000);
transition: max-height 0.9s;
-moz-transition: max-height 0.9s;
-webkit-transition: max-height 0.9s;
}
}
@@ -385,7 +362,7 @@ body.admin {
// ---------
.stats {
background: white;
background: #fff;
}
.stats-numbers {
@@ -417,6 +394,7 @@ body.admin {
ul {
list-style-type: none;
margin-left: 0;
}
li {
font-size: rem-calc(14);
@@ -435,16 +413,17 @@ body.admin {
color: $delete;
}
}
}
}
.account-info, .login-as, .spending-proposal-info {
.account-info,
.login-as,
.spending-proposal-info {
background-color: #e7e7e7;
border-radius: rem-calc(3);
font-size: rem-calc(16);
font-weight: normal;
margin: $line-height;
padding: $line-height/2;
padding: $line-height / 2;
strong {
font-size: rem-calc(18);
@@ -455,15 +434,17 @@ body.admin {
margin-bottom: 0;
}
body.admin {
.admin {
.investment-projects-list.medium-9 {
width: 100%;
}
}
.investment-projects-summary {
.investment-projects-summary {
th, td {
th,
td {
text-align: center;
&:first-child {
@@ -485,10 +466,10 @@ body.admin {
background: $success-bg;
}
}
}
}
.admin-content .select-geozone, .admin-content .select-heading {
.admin-content .select-geozone,
.admin-content .select-heading {
a {
display: block;
@@ -501,14 +482,14 @@ body.admin {
}
}
table.investment-projects-summary {
.investment-projects-summary {
td.total-price {
.total-price {
white-space: nowrap;
}
}
body.admin {
.admin {
.geozone {
background: #ececec;
@@ -516,8 +497,8 @@ body.admin {
color: $text;
display: inline-block;
font-size: $small-font-size;
margin-bottom: $line-height/3;
padding: $line-height/4 $line-height/3;
margin-bottom: $line-height / 3;
padding: $line-height / 4 $line-height / 3;
text-decoration: none;
&:hover {
@@ -538,9 +519,9 @@ body.admin {
table {
.callout {
height: $line-height*2;
line-height: $line-height*2;
padding: 0 $line-height/2;
height: $line-height * 2;
line-height: $line-height * 2;
padding: 0 $line-height / 2;
}
}
@@ -551,15 +532,15 @@ table {
// ---------------
.markdown-editor {
background-color: white;
background-color: #fff;
.markdown-area,
#markdown-preview {
.markdown-preview {
display: none;
}
}
.markdown-editor #markdown-preview {
.markdown-editor .markdown-preview {
overflow-y: auto;
height: 15em;
}
@@ -577,11 +558,11 @@ table {
left: 0;
}
.markdown-editor.fullscreen #markdown-preview {
.markdown-editor.fullscreen .markdown-preview {
height: 99%;
}
.edit_legislation_draft_version .row {
.edit-legislation-draft-version .row {
margin-bottom: 2rem;
}
@@ -614,7 +595,7 @@ table {
// 08. CMS
// --------------
.cms_page_list {
.cms-page-list {
[class^="icon-"] {
padding-right: $menu-icon-spacing;
@@ -624,17 +605,18 @@ table {
.legislation-process-edit {
.edit_legislation_process {
.edit-legislation-process {
small {
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;
}
.legislation-process-start, .legislation-process-end {
.legislation-process-start,
.legislation-process-end {
@include breakpoint(medium) {
line-height: 3rem;
}
@@ -664,7 +646,7 @@ table {
.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;
margin-bottom: 0;
@@ -673,27 +655,16 @@ table {
}
}
input::-webkit-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 {
input::placeholder {
font-style: italic;
}
.legislation-questions-answers {
margin-bottom: 1rem;
}
}
.field {
.field {
margin-bottom: 1rem;
@include breakpoint(medium) {
@@ -720,115 +691,24 @@ table {
text-decoration: none;
}
}
}
}
.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 {
text-align: center;
background: #ccdbe6;
.markdown-editor-header,
.markdown-editor-buttons {
display: none;
}
.fullscreen-container {
a {
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,
&:focus,
&:hover {
text-decoration: none;
}
}
}
}
#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 {
.markdown-area,
#markdown-preview {
display: block;
}
.column {
padding: 0;
}
.fullscreen {
.fullscreen-container {
text-align: left;
background: $admin-color;
padding: 0.5rem 1rem;
margin-bottom: 0;
a {
line-height: 3rem;
@@ -865,6 +745,7 @@ table {
float: right;
padding-left: 1rem;
}
}
input {
font-size: $small-font-size;
@@ -877,30 +758,129 @@ table {
margin: 0.5rem;
}
}
}
a {
color: $white;
}
}
}
#legislation_draft_version_body {
.legislation-draft-versions-form {
.legislation-process-version {
@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) {
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 {
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 {
.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;
border: none;
border: 0;
@include breakpoint(medium) {
padding: 1rem 2rem;
}
&:focus {
border: none;
}
}
#markdown-preview {
.markdown-preview {
padding: 1rem;
border: none;
border: 0;
@include breakpoint(medium) {
padding: 1rem 2rem;
@@ -908,3 +888,9 @@ table {
}
}
}
.legislation-draft-version-body {
&:focus {
border: 0;
}
}

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,5 @@
@charset "UTF-8";
@font-face {
font-family: 'icons';
src: font-url('icons.eot');
@@ -9,7 +10,8 @@
font-weight: normal;
font-style: normal;
}
[data-icon]:before {
[data-icon]::before {
font-family: "icons" !important;
content: attr(data-icon);
font-style: normal !important;
@@ -21,8 +23,9 @@
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
[class^="icon-"]:before,
[class*=" icon-"]:before {
[class^="icon-"]::before,
[class*=" icon-"]::before {
font-family: "icons" !important;
font-style: normal !important;
font-weight: normal !important;
@@ -33,168 +36,223 @@
-webkit-font-smoothing: antialiased;
-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
// -----------------
*, *:before, *:after {
*,
*::before,
*::after {
box-sizing: border-box !important;
}
@@ -23,96 +25,344 @@
display: block !important;
}
.column, .columns {
.column,
.columns {
display: inline-block !important;
float: none !important;
box-sizing: border-box !important;
}
.small-1, .row .small-1 { width: 7.33333%; }
.small-2, .row .small-2 { width: 15.66667%; }
.small-3, .row .small-3 { width: 24%; }
.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%; }
.small-1,
.row .small-1 {
width: 7.33333%;
}
.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%; }
.small-2,
.row .small-2 {
width: 15.66667%;
}
.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%; }
.small-3,
.row .small-3 {
width: 24%;
}
.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%; }
.small-4,
.row .small-4 {
width: 32.33333%;
}
.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%; }
.small-5,
.row .small-5 {
width: 40.66667%;
}
.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%; }
.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%;
}
.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 {
clear: both !important;
height: 100px !important;
}
.locale, .external-links {
.locale,
.external-links {
background: #002d50 !important;
}
@@ -121,11 +371,12 @@
}
.external-links {
color: white !important;
color: #fff !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;
float: none !important;
}
@@ -140,28 +391,29 @@
margin: 0 !important;
position: inherit !important;
&:after {
&::after {
content: none !important;
}
}
form {
input, textarea {
input,
textarea {
height: 48px !important;
line-height: 48px !important;
margin-bottom: 24px !important;
width: 100% !important;
}
input[type="checkbox"],
input[type="radio"] {
[type="checkbox"],
[type="radio"] {
height: auto !important;
line-height: inherit !important;
width: auto !important;
}
input[type="radio"] {
[type="radio"] {
width: 18px !important;
}
}
@@ -184,16 +436,17 @@ form {
// 02. Admin
// ---------
body.admin form {
.admin form {
input[type="text"], textarea {
[type="text"],
textarea {
height: 48px !important;
line-height: 48px !important;
margin-bottom: 24px !important;
}
}
.admin-sidebar ul [class^="icon-"] {
.admin-sidebar [class^="icon-"] {
padding-left: 12px !important;
padding-right: 12px !important;
}

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

@@ -7,14 +7,14 @@
// --------
@mixin logo {
color: white;
color: #fff;
display: inline-block;
font-family: 'Lato' !important;
font-size: rem-calc(24);
font-weight: lighter;
@include breakpoint(medium) {
line-height: $line-height*2;
line-height: $line-height * 2;
margin-top: 0;
}
@@ -24,7 +24,7 @@
@include breakpoint(medium) {
height: 80px;
margin-right: $line-height/2;
margin-right: $line-height / 2;
margin-top: 0;
width: 80px;
}

View File

@@ -16,7 +16,7 @@
padding-top: $line-height;
&.light {
background: #ECF0F1;
background: #ecf0f1;
}
}
@@ -36,7 +36,7 @@
@include breakpoint(medium) {
display: inline-block;
margin-right: $line-height/2;
margin-right: $line-height / 2;
}
}
}
@@ -50,7 +50,7 @@
color: $brand;
}
.additional-info {
.additional-info {
margin-bottom: $line-height;
}
@@ -68,23 +68,23 @@
}
}
ul.features {
.features {
list-style-type: circle;
margin-left: $line-height;
@include breakpoint(medium) {
margin: $line-height 0 $line-height $line-height*2.5;
margin: $line-height 0 $line-height $line-height * 2.5;
}
li {
margin-bottom: $line-height
margin-bottom: $line-height;
}
}
.section-content {
border-top: 1px solid $medium-gray;
padding-bottom: $line-height*2;
padding-top: $line-height*2;
padding-bottom: $line-height * 2;
padding-top: $line-height * 2;
&:first-child {
border-top: 0;
@@ -101,10 +101,10 @@
.sidebar-card {
border: 1px solid $border;
margin-bottom: $line-height;
padding: $line-height/2;
padding: $line-height / 2;
&.light {
background: #ECF0F1;
background: #ecf0f1;
border: 0;
}
}

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

@@ -8,7 +8,7 @@
<% if @pages.any? %>
<h3><%= page_entries_info @pages %></h3>
<table class="cms_page_list">
<table class="cms-page-list">
<thead>
<tr>
<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="expanded row">
<%= render 'shared/locale_switcher' %>

View File

@@ -9,7 +9,7 @@
<span class="panel-title"><%= t('legislation.draft_versions.show.text_comments') %></span>
</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-header">
<span class="icon-comment" aria-hidden="true"></span>

View File

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

View File

@@ -16,7 +16,7 @@
<% end %>
</div>
<% 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">
<%= markdown process.additional_info if process.additional_info %>
</div>

View File

@@ -2,7 +2,7 @@
<%= render 'admin/shared/proposal_search', url: management_proposals_path %>
<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="small-12 medium-7 float-left">

View File

@@ -1,6 +1,6 @@
<main>
<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">
<%= t('management.proposals.print.print_button') %>
</a>

View File

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

View File

@@ -36,7 +36,7 @@
</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="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>
</div>
<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
### 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.
</textarea>
</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">
<input label="false" type="hidden" value="&lt;h2&gt;PREÁMBULO&lt;/h2&gt;
&lt;h3&gt;I&lt;/h3&gt;

View File

@@ -18,7 +18,7 @@
</li>
</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="small-12 medium-4 column">

View File

@@ -86,15 +86,18 @@ feature 'Admin legislation draft versions' do
click_link 'Version 1'
fill_in 'legislation_draft_version_title', with: 'Version 1b'
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'
within('.fullscreen') do
click_button 'Save changes'
click_link 'Close text editor'
end
click_button 'Save changes'
expect(page).to have_content 'Version 1b'
end
end

View File

@@ -97,7 +97,7 @@ feature 'Proposals' do
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_content(proposal1.title)
expect(page).to have_content(proposal1.summary)
@@ -124,7 +124,7 @@ feature 'Proposals' do
expect(page).to have_content "#{user.document_number}"
end
within("#proposals") do
within(".proposals-list") do
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_content(proposal1.summary)
@@ -143,7 +143,7 @@ feature 'Proposals' do
click_link "Support proposals"
within("#proposals") do
within(".proposals-list") do
find('.in-favor a').click
expect(page).to have_content "1 support"
@@ -160,7 +160,7 @@ feature 'Proposals' do
click_link "Support proposals"
within("#proposals") do
within(".proposals-list") do
click_link proposal.title
end
@@ -205,7 +205,7 @@ feature 'Proposals' do
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('Medium proposal').to appear_before('Worst proposal')
end
@@ -217,7 +217,7 @@ feature 'Proposals' do
expect(current_url).to include('order=created_at')
expect(current_url).to include('page=1')
within '#proposals' do
within(".proposals-list") do
expect('Medium proposal').to appear_before('Best proposal')
expect('Best proposal').to appear_before('Worst proposal')
end