Commit Graph

85 Commits

Author SHA1 Message Date
Amaia Castro
6c36fde6cc Merge branch 'master' into legislation-module-stable 2017-01-17 15:45:33 +01:00
Alberto Garcia Cabeza
45450d74ff improves styles for unfeasible investments 2017-01-16 18:45:42 +01:00
Amaia Castro
a2a61341fe Merge branch 'master' into legislation-module-stable 2017-01-11 22:54:41 +01:00
Alberto Garcia Cabeza
428c539684 fixes lineheight on official labels 2017-01-09 17:16:17 +01:00
Alberto Garcia Cabeza
e6cc09a460 adds budget icon on investment show when no aside 2017-01-09 17:10:36 +01:00
Alberto Garcia Cabeza
54691fe7f4 improves styles for budgets ballot 2017-01-05 20:37:34 +01:00
Alberto Garcia Cabeza
f503c492f3 improves styles for budgets investments ballot and votes 2017-01-05 17:43:57 +01:00
Alberto Garcia Cabeza
e0d3752f72 improves styles of budgets investments views 2017-01-05 17:23:30 +01:00
Alberto Garcia Cabeza
8b1e8fed5b improves styles for budgets views 2017-01-04 19:18:41 +01:00
kikito
68d598a43d Merge branch 'master' into budgets 2017-01-02 12:10:23 +01:00
Amaia Castro
573e281a8f Merge branch 'master' into legislation-module-stable 2016-12-27 18:07:11 +01:00
Alberto Garcia Cabeza
170ef4e680 improves styles for users avatar 2016-12-27 16:17:43 +01:00
Martín González
23211337ef Legislation process debate markup 2016-12-16 19:04:21 +01:00
Martín González
bbacd4546b Legislation process markup and styles 2016-12-16 19:04:20 +01:00
kikito
2e8650c324 merge with master 2016-12-12 16:09:05 +01:00
Alberto Garcia Cabeza
1968cc97f3 improves colours contrast 2016-12-07 13:52:19 +01:00
Alberto Garcia Cabeza
dd84df8d18 adds unordered list on geozone tags 2016-12-05 17:53:32 +01:00
Alberto Garcia Cabeza
3b2fe1e184 improves headings and outline structure 2016-12-05 17:02:42 +01:00
kikito
242f8102a3 moves styles inside participation.scss 2016-11-28 12:59:23 +01:00
kikito
2a2179d0f3 Merge branch 'master' into budget 2016-11-28 11:41:49 +01:00
Alberto Garcia Cabeza
a66800afb1 fixes styles for spending proposals list and show 2016-11-14 17:46:01 +01:00
Alberto Garcia Cabeza
e778c49e64 removes orange blocks and improves contrast on proposals 2016-11-02 16:31:38 +01:00
Alberto Garcia Cabeza
2c4b5315c8 removes blue blocks and improves contrast on debates 2016-11-02 13:07:26 +01:00
Alberto Garcia Cabeza
6fd5e6a67a unifies styles for participation not allowed 2016-10-31 16:50:13 +01:00
Alberto Garcia Cabeza
a39506f54b Polish voting proposals banner 2016-09-16 12:08:38 +02:00
Alberto Garcia Cabeza
910b24936d Merge branch 'master' into voting-proposals
Conflicts:
	app/models/proposal.rb
	app/views/proposals/_proposal.html.erb
	app/views/proposals/index.html.erb
	app/views/proposals/show.html.erb
	spec/support/common_actions.rb
2016-09-15 13:58:53 +02:00
Alberto Garcia Cabeza
076e237320 Improves proposal ballot banner, deletes unused partial 2016-09-14 10:40:16 +02:00
Raimond Garcia
9a2d45f25d Merge pull request #1219 from consul/budget-management
Budget management
2016-09-13 18:45:30 +02:00
Alberto Garcia Cabeza
c42877efb1 Improves styles for select heading page 2016-09-12 18:45:47 +02:00
kikito
2bc9e7be78 started working on budget manatement 2016-09-12 12:11:47 +02:00
Alberto Garcia Cabeza
e8b70a48fa Adds tab in index & removes support button in index/show 2016-09-09 17:32:03 +02:00
Alberto Garcia Cabeza
cff1f43a90 Adds banner, styles, and updates icons font 2016-09-07 16:42:57 +02:00
rgarcia
3c55d66591 fixes conflicts with budget 2016-07-27 11:41:46 +02:00
Alberto Garcia Cabeza
e55fdc42ee Updates classes names for social share button 2016-07-08 14:13:13 +02:00
Alberto Garcia Cabeza
7548b0492d Adds more styles to budget pages 2016-06-09 12:59:55 +02:00
Alberto Garcia Cabeza
aa1ed87725 Adds styles for budgets 2016-06-08 19:45:09 +02:00
Alberto Garcia Cabeza
0899a0ddb4 Improves styles for budget index and show views 2016-06-07 19:22:15 +02:00
Alberto Garcia Cabeza
84f9dcaa76 Adds tabs for notifications on proposal show 2016-06-06 17:26:48 +02:00
kikito
4ade8325d7 css for investments 2016-06-03 18:51:08 +02:00
Alberto Garcia Cabeza
10a2412e20 Removes unused scss 2016-05-19 16:25:10 +02:00
Alberto Garcia Cabeza
a59cb3481e Removes unused scss 2016-05-19 12:44:40 +02:00
Alberto Garcia Cabeza
49c8145e76 Cleans scss 2016-05-18 18:39:35 +02:00
Alberto Garcia Cabeza
e77b9cf46c Moves custom variables to settings.scss 2016-05-18 17:16:06 +02:00
Alberto Garcia Cabeza
c436f1389a Fixes styles for mobile and updates scss files 2016-05-13 14:47:52 +02:00
Alberto Garcia Cabeza
551de46105 Changes color on button support for increase contrast color 2016-05-04 11:44:26 +02:00
Alberto Garcia Cabeza
f079bdac8a Improves styles for retire proposals 2016-04-23 13:28:43 +02:00
Alberto Garcia Cabeza
e3878ff437 Fixes icon animation on reply comments 2016-04-20 17:27:58 +02:00
Alberto Garcia Cabeza
84a7438786 Improves styles for long proposals show texts 2016-04-19 00:08:50 +02:00
Juanjo Bazán
c939339020 shows voting button for sps only if voting allowed 2016-04-18 12:04:50 +02:00
Juanjo Bazán
e6a9cb4fcc disable voting on sps if setting disabled
refactors hover messages on sps votes
2016-04-15 23:01:00 +02:00