Commit Graph

792 Commits

Author SHA1 Message Date
Amaia Castro
00b488fe84 Merge branch 'master' into legislation-module-stable 2017-01-17 10:46:33 +01:00
Amaia Castro
e651ef5b9c Merge pull request #59 from medialab-prado/18-create-comment
Create annotations and comments
2017-01-16 19:30:45 +01:00
Amaia Castro
65fcd83ee5 Don’t show new annotation/comment form if allegations phase is not open 2017-01-16 19:06:06 +01:00
Alberto Garcia Cabeza
45450d74ff improves styles for unfeasible investments 2017-01-16 18:45:42 +01:00
Alberto
868ed78488 Merge pull request #1348 from aspgems/custom_settings_scss
Add custom setting for foundation variables.
2017-01-16 17:58:05 +01:00
Amaia Castro
ce6b278f55 Merge pull request #60 from medialab-prado/frontend-improvements
Frontend improvements
2017-01-16 11:58:45 +01:00
Fernando Blat
046c021c0c Complete create comment details 2017-01-14 16:43:40 +01:00
Fernando Blat
f47cef5a93 Highlight text when creating a comment 2017-01-14 16:43:26 +01:00
Fernando Blat
d253c4c09f Restore custom position 2017-01-14 16:42:59 +01:00
Fernando Blat
72ff1de2ab CSS fix 2017-01-14 16:42:59 +01:00
Fernando Blat
17a68f5c14 Load annotations on click event 2017-01-14 16:42:57 +01:00
Fernando Blat
4431d95d31 Basic annotation creation 2017-01-14 16:42:12 +01:00
Martín González
eadf933c22 Change debate questions class to avoid colliding with other CSS 2017-01-13 16:42:59 +01:00
Martín González
02d49266e0 Increase margin on questions to fix a cosmetic issue 2017-01-13 16:14:44 +01:00
Juanma
e418937d42 Add custom setting for foundation variables. 2017-01-13 11:49:23 +01:00
Martín González
046bcbfb0f Fix small header toggle 2017-01-12 12:48:14 +01:00
Martín González
495c7e8099 Key dates SVG fix 2017-01-12 12:16:45 +01:00
Martín González
a0011b7c5c More css fixes 2017-01-12 11:55:12 +01:00
Martín González
be024f0fe1 Push legislation comments style fixes 2017-01-12 11:19:30 +01:00
Martín González
203bc740ac Adjust home and process index styles 2017-01-12 10:54:39 +01:00
Amaia Castro
306e3fa59f Don’t show comments panel if seeing final version 2017-01-11 23:11:11 +01:00
Amaia Castro
a2a61341fe Merge branch 'master' into legislation-module-stable 2017-01-11 22:54:41 +01:00
Juanjo Bazán
7ef481ef0c Merge pull request #1337 from consul/devise-views
Devise views
2017-01-11 12:38:41 +01:00
Amaia Castro
174fe5ee04 Don’t scroll and show comments when there isn’t an anchor in the url 2017-01-10 18:59:18 +01:00
Amaia Castro
87a548a298 Adjust panel widths to maintain the same width for the center text 2017-01-10 18:24:55 +01:00
Amaia Castro
f3daf2aca2 Show comments box when scrolling to annotation 2017-01-10 18:24:55 +01:00
Amaia Castro
4f539b374f View comments for draft text 2017-01-10 17:25:02 +01:00
Alberto Garcia Cabeza
201a222cd3 improves styles for omniauth buttons 2017-01-09 18:49:29 +01:00
Alberto Garcia Cabeza
42d147a462 changes general styles for devise layout 2017-01-09 18:07:04 +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
rgarcia
b4cd1ea9d7 merges with budgets 2017-01-08 19:58:53 +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
e8dafde39f adds message for not logged users 2017-01-05 13:03:11 +01:00
Fernando Blat
7100156b28 Show full header when click on expand button 2017-01-05 10:55:53 +01:00
Alberto Garcia Cabeza
8b1e8fed5b improves styles for budgets views 2017-01-04 19:18:41 +01:00
Alberto Garcia Cabeza
9c2857e75b changes budget color 2017-01-04 19:17:58 +01:00
Alberto Garcia Cabeza
ef1300abbc removes unused scss 2017-01-04 19:17:51 +01:00
Amaia Castro
ee9fa3db15 Base Legislation Annotations 2017-01-04 12:56:58 +01:00
Amaia Castro
5627b18be2 Draft Version page 2017-01-02 18:05:15 +01:00
Martín González
bc72e72e8f Refactor legislation processes filter styles 2017-01-02 12:43:00 +01:00
kikito
68d598a43d Merge branch 'master' into budgets 2017-01-02 12:10:23 +01:00
Amaia Castro
4c309b5243 Refactor css classes 2016-12-30 11:22:28 +01:00
Amaia Castro
0cd2b62e2c Integrate admin html and css from sandbox 2016-12-30 11:00:34 +01:00
Martín González
99a0e79354 Add toggle content style 2016-12-29 11:24:53 +01:00
Martín González
28b452f994 Add debate toggles 2016-12-29 10:45:12 +01:00
Amaia Castro
5584835314 Merge branch 'legislation-module-stable' into sandbox-html 2016-12-29 09:27:07 +01:00
Martín González
fa3d188a09 Add draft editor markup and styles 2016-12-28 18:59:12 +01:00