Merge branch 'master' of gitlab.com:participa/proposal-app

Leandro Santos
2 parents 4df02e37 820e8f31
Showing 3 changed files with 40 additions and 15 deletions Show diff stats
js/main.js
sass/_proposal_detail.scss
sass/style.scss
@@ -126,7 +126,7 @@ function loadRandomProposal(topic_id, private_token) {
   $(".no-proposals").hide();
   $(".loading").show();
   $('.random-proposal').html('');
-  var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,abstract,created_by';
+  var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,abstract,created_by&content_type=ProposalsDiscussionPlugin::Proposal';
   $.getJSON(url).done(function( data ) {
     $(".loading").hide();
  
 .proposal-detail {
+  li {
+    list-style: none;
+    width: 70%;
+    padding: 0;
+    height: 50px;
+    overflow: hidden;
+
+    a {
+      text-decoration: none;
+      text-transform: uppercase;
+      padding: 15px 35px;
+      margin: 0;
+      width: 20%;
+      display: inline-block;
+      span {
+        padding-left: 40px;
+      }
+      font: {
+        size: larger;
+        weight: bold;
+      }
+      background-size: 32px;
+      color: white;
+    }
+  }
+
+  .categories {
+    select {
+      height: 57px;
+      width: 70%;
+      margin: 0;
+      text-transform: uppercase;
+      border: 0;
+      background: #EEEFF1;
+      float: right;
+    }
+  }
+
   @each $category, $color in $categories {
     .#{$category}{
       ul{
@@ -139,26 +177,13 @@
       }
       li{
         background-color: $color;
-        padding: { 
-          bottom: 20px;
-          top: 20px;
-        }
         a {
           background-image: url(./images/icons/#{$category}.png);
-          padding: 20px 5%;
-          font: {
-            size: larger;
-            weight: bold;
-          }
-          color: white;
           background: {
             color: $color;
             position: center left;
             repeat: no-repeat;
           }
-          span{
-            padding-left: 40px;
-          }
         }
       }
     }
@@ -41,7 +41,7 @@ h1 {
   left: 0;
   color: #03316f;
   font-size: 28px;
-  padding: 20px;
+  padding: 20px 0;
   margin: 0;
   display: block;
   width: 100%;
...	...	@@ -126,7 +126,7 @@ function loadRandomProposal(topic_id, private_token) {
126	126	$(".no-proposals").hide();
127	127	$(".loading").show();
128	128	$('.random-proposal').html('');
129		- var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,abstract,created_by';
	129	+ var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,abstract,created_by&content_type=ProposalsDiscussionPlugin::Proposal';
130	130	$.getJSON(url).done(function( data ) {
131	131	$(".loading").hide();
132	132
...	...
1	1	.proposal-detail {
	2	+ li {
	3	+ list-style: none;
	4	+ width: 70%;
	5	+ padding: 0;
	6	+ height: 50px;
	7	+ overflow: hidden;
	8	+
	9	+ a {
	10	+ text-decoration: none;
	11	+ text-transform: uppercase;
	12	+ padding: 15px 35px;
	13	+ margin: 0;
	14	+ width: 20%;
	15	+ display: inline-block;
	16	+ span {
	17	+ padding-left: 40px;
	18	+ }
	19	+ font: {
	20	+ size: larger;
	21	+ weight: bold;
	22	+ }
	23	+ background-size: 32px;
	24	+ color: white;
	25	+ }
	26	+ }
	27	+
	28	+ .categories {
	29	+ select {
	30	+ height: 57px;
	31	+ width: 70%;
	32	+ margin: 0;
	33	+ text-transform: uppercase;
	34	+ border: 0;
	35	+ background: #EEEFF1;
	36	+ float: right;
	37	+ }
	38	+ }
	39	+
2	40	@each $category, $color in $categories {
3	41	.#{$category}{
4	42	ul{
...	...	@@ -139,26 +177,13 @@
139	177	}
140	178	li{
141	179	background-color: $color;
142		- padding: {
143		- bottom: 20px;
144		- top: 20px;
145		- }
146	180	a {
147	181	background-image: url(./images/icons/#{$category}.png);
148		- padding: 20px 5%;
149		- font: {
150		- size: larger;
151		- weight: bold;
152		- }
153		- color: white;
154	182	background: {
155	183	color: $color;
156	184	position: center left;
157	185	repeat: no-repeat;
158	186	}
159		- span{
160		- padding-left: 40px;
161		- }
162	187	}
163	188	}
164	189	}
...	...
...	...	@@ -41,7 +41,7 @@ h1 {
41	41	left: 0;
42	42	color: #03316f;
43	43	font-size: 28px;
44		- padding: 20px;
	44	+ padding: 20px 0;
45	45	margin: 0;
46	46	display: block;
47	47	width: 100%;
...	...