consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into legislation-module-stable

Browse Source
This commit is contained in:
Amaia Castro
2017-01-11 22:54:41 +01:00
parent f7aca52706 6952e7eac6
commit a2a61341fe
235 changed files with 9717 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

350
app/assets/stylesheets/participation.scss
View File

@@ -5,7 +5,8 @@
// 03. Show participation
// 04. List participation
// 05. Featured
// 06. Proposals successfull
// 06. Budget
// 07. Proposals successfull
//
// 01. Votes and supports
@@ -238,6 +239,7 @@
.debate-form,
.proposal-form,
.budget-investment-form,
.spending-proposal-form {
.icon-debates, .icon-proposals, .icon-budget {
@@ -295,7 +297,8 @@
.debate-show,
.proposal-show,
.investment-project-show,
.debate-quiz {
.debate-quiz,
.budget-investment-show {
p {
word-wrap: break-word;
@@ -322,14 +325,14 @@
margin-bottom: 0;
}
.debate-info, .proposal-info, .investment-project-info {
.debate-info, .proposal-info, .investment-project-info, .budget-investment-show {
clear: both;
color: $text-medium;
font-size: $small-font-size;
margin-bottom: $line-height/2;
position: relative;
span {
span:not(.label) {
line-height: rem-calc(32); // Same as avatar height
}
@@ -456,11 +459,11 @@
color: $border;
}
.investment-project-show p {
.investment-project-show p, .budget-investment-show p {
word-break: break-word;
}
.proposal-show, .investment-project-show {
.proposal-show, .investment-project-show, .budget-investment-show {
.supports {
padding: $line-height/2 0 0;
@@ -474,21 +477,21 @@
// 04. List participation
// ----------------------
.debates-list, .proposals-list, .investment-projects-list {
.debates-list, .proposals-list, .investment-projects-list, .budget-investments-list {
@include breakpoint(medium) {
margin-bottom: rem-calc(48);
}
}
.investment-projects-list {
.investment-projects-list, .budget-investments-list {
@include breakpoint(medium) {
min-height: $line-height*15;
}
}
.debate, .proposal, .investment-project, .legislation {
.debate, .proposal, .investment-project, .budget-investment, .legislation {
margin: $line-height/4 0;
.panel {
@@ -506,7 +509,7 @@
padding-bottom: rem-calc(12);
}
.label-debate, .label-proposal, .label-investment-project {
.label-debate, .label-proposal, .label-investment-project, .label-budget-investment {
background: none;
clear: both;
display: block;
@@ -531,6 +534,10 @@
color: $budget;
}
.label-budget-investment {
color: $budget;
}
h3 {
font-weight: bold;
margin: 0;
@@ -540,7 +547,7 @@
}
}
.debate-content, .proposal-content, .investment-project-content {
.debate-content, .proposal-content, .investment-project-content, .budget-investment-content {
margin: 0;
min-height: rem-calc(180);
position: relative;
@@ -570,7 +577,7 @@
font-size: $small-font-size;
}
.debate-info, .proposal-info, .investment-project-info {
.debate-info, .proposal-info, .investment-project-info, .budget-investment-info {
color: $text-medium;
font-size: $small-font-size;
margin: rem-calc(6) 0 0;
@@ -585,7 +592,7 @@
}
}
.debate-description, .proposal-description, .investment-project-description {
.debate-description, .proposal-description, .investment-project-description, .budget-investment-description {
color: $text;
font-size: rem-calc(13);
height: rem-calc(72);
@@ -670,12 +677,14 @@
}
}
.investment-project, .investment-project-show {
.investment-project, .investment-project-show,
.budget-investment, .budget-investment-show {
.supports {
@include supports;
.investment-project-amount {
.investment-project-amount,
.budget-investment-amount {
color: $budget;
font-size: rem-calc(20);
font-weight: bold;
@@ -704,6 +713,7 @@
}
.remove .icon-check-circle {
color: $budget;
display: block;
font-size: rem-calc(70);
line-height: rem-calc(70);
@@ -711,6 +721,11 @@
}
}
.investment-project-show .supports,
.budget-investment-show .supports {
border: 0;
}
.proposals-summary {
.panel {
@@ -719,11 +734,38 @@
}
.investment-project .supports .total-supports.no-button,
.investment-project-show .supports .total-supports.no-button {
.investment-project-show .supports .total-supports.no-button,
.budget-investment .supports .total-supports.no-button,
.budget-investment-show .supports .total-supports.no-button {
display: block;
margin-top: $line-height*1.5;
}
.budget-investment-show {
.label-budget-investment {
background: none;
clear: both;
color: $budget;
display: block;
font-size: rem-calc(12);
font-weight: bold;
line-height: $line-height;
padding-bottom: 0;
padding-left: 0;
padding-top: 0;
text-transform: uppercase;
}
.icon-budget {
color: $budget;
font-size: $small-font-size;
line-height: $line-height;
margin-left: rem-calc(6);
top: 0;
}
}
// 05. Featured
// ------------
@@ -835,7 +877,281 @@
}
}
// 06. Proposals successfull
// 06. Budget
// ----------
.expanded.budget {
background: $budget;
h1, h2, p, a.back, .icon-angle-left {
color: white;
}
.button {
background: white;
color: $budget;
}
.info {
background: #6A2A72;
@include breakpoint(medium) {
border-top: rem-calc(6) solid #54225C;
}
}
}
.jumbo-budget {
background: $budget;
border-bottom: 1px solid $budget;
&.budget-heading {
min-height: $line-height*10;
}
h1 {
margin-bottom: 0;
}
h1, h2, .back, .icon-angle-left, p, a {
color: white;
}
&.welcome {
background: $budget image-url('spending_proposals_bg.jpg');
background-position: 50% 50%;
background-repeat: no-repeat;
background-size: cover;
.spending-proposal-timeline {
padding-top: $line-height;
ul li {
margin-right: $line-height;
padding-top: $line-height/2;
.icon-calendar {
display: none;
}
}
}
}
a {
text-decoration: underline;
&.button {
background: white;
color: $brand;
margin-bottom: rem-calc(3);
text-decoration: none;
}
}
.social-share-button a {
color: white;
&.social-share-button-twitter:hover {
color: #40A2D1;
}
&.social-share-button-facebook:hover {
color: #354F88;
}
&.social-share-button-google_plus:hover {
color: #CE3E26;
}
}
}
.progress-votes {
position: relative;
.progress {
background: #212033;
clear: both;
}
.progress-meter {
background: #fdcb10;
border-radius: 0;
-webkit-transition: width 2s;
transition: width 2s;
}
.spent-amount-progress,
.spent-amount-meter {
background: none !important;
}
.spent-amount-text {
color: white;
font-size: $base-font-size;
font-weight: normal;
position: absolute;
right: 0;
text-align: right;
top: 16px;
width: 100%;
&:before {
color: #a5a1ff;
content: "\57";
font-family: 'icons';
font-size: $small-font-size;
position: absolute;
right: -6px;
top: -17px;
}
}
.total-amount {
color: white;
font-size: rem-calc(18);
font-weight: bold;
float: right;
}
.amount-available {
display: block;
text-align: right;
span {
font-size: rem-calc(24);
font-weight: bold;
}
}
}
.big-number {
color: $budget;
font-size: rem-calc(60);
line-height: rem-calc(120);
@include breakpoint(large) {
font-size: rem-calc(90);
line-height: rem-calc(240);
}
}
.ballot {
h2, h3 {
font-weight: normal;
span {
color: $budget;
font-weight: bold;
}
}
h3.subtitle {
border-bottom: 3px solid $budget;
span {
font-size: $base-font-size;
font-weight: normal;
}
}
.amount-spent {
background: $success-bg;
font-weight: normal;
padding: $line-height/2;
span {
font-size: rem-calc(24);
font-weight: bold;
}
}
}
ul.ballot-list {
list-style: none;
margin-left: 0;
li {
background: #f9f9f9;
line-height: $line-height;
margin-bottom: $line-height/4;
padding: $line-height/2;
position: relative;
a {
color: $text;
}
span {
color: #9f9f9f;
display: block;
font-style: italic;
}
.remove-investment-project {
display: block;
height: 0;
.icon-x {
color: #9f9f9f;
font-size: rem-calc(24);
line-height: $line-height/2;
position: absolute;
right: 6px;
text-decoration: none;
top: 6px;
@include breakpoint(medium) {
font-size: $base-font-size;
}
}
}
&:hover {
background: $budget;
color: white;
a, span {
color: white;
outline: 0;
text-decoration: none;
}
.remove-investment-project .icon-x {
color: white;
}
}
}
}
.select-district a {
display: inline-block;
margin: $line-height/4 0;
padding: $line-height/4;
}
.select-district .active a {
background: #f9f9f9;
border-radius: rem-calc(3);
color: $budget;
font-weight: bold;
&:after {
content: "\56";
font-family: "icons";
font-size: $small-font-size;
font-weight: normal;
line-height: $line-height;
padding-left: rem-calc(3);
vertical-align: baseline;
&:hover {
text-decoration: none;
}
}
}
// 07. Proposals successfull
// -------------------------
.dark-heading {