Commit Graph

2326 Commits

Author SHA1 Message Date
Alessandro Cuoghi
ce3193e763 Added style to the button to upload image into budgets/investments/new. Refactor some css into partecipation.scss for pass scss-lint. 2017-09-26 13:53:42 +02:00
Alessandro Cuoghi
6cde1c1c10 Added upload image button. Created function to show file upload name. Added translation. 2017-09-26 13:53:42 +02:00
Alessandro Cuoghi
4ce8e14f86 Replaced div with tag 'figure' in budget investment show. 2017-09-26 13:53:42 +02:00
Alessandro Cuoghi
dd1e73c5fd Add image into investment show and add some change of css. 2017-09-26 13:53:42 +02:00
Alessandro Cuoghi
3d13896c9a Add no image to budget investment’s. 2017-09-26 13:53:42 +02:00
Alessandro Cuoghi
aa471974bd Use different image versions on responsive sizes 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
51d1031afa Add recomendations to edit image page with english and spanish translations. 2017-09-26 13:53:42 +02:00
BertoCQ
73c47dcd0e Merge pull request #1905 from wairbut-m2c/iagirre-autocomplete-tags
Iagirre autocomplete tags
2017-09-26 10:19:34 +02:00
decabeza
7827f6edd1 fixes icon notifications on admin header 2017-09-25 19:17:48 +02:00
BertoCQ
0eb33bbcd4 Merge pull request #1910 from consul/filter-subnav
Filter subnav
2017-09-25 19:02:30 +02:00
BertoCQ
a1a74f59bf Merge pull request #1911 from consul/legislation-process
Legislation process SCSS
2017-09-25 19:00:42 +02:00
BertoCQ
d449e8ee62 Merge pull request #1875 from consul/admin-design
Admin design
2017-09-25 17:23:17 +02:00
decabeza
e404d149ce fixes some lint errors on legislation_process.scss 2017-09-22 19:10:39 +02:00
decabeza
ad63b0a7d7 makes filter subnav same style than order links 2017-09-22 18:20:21 +02:00
iagirre
0948959a65 Run scss-lint to fix some errors in autocomplete_overrides.scss 2017-09-22 08:09:03 +02:00
Carlos Ruiz
dc2e2a0944 Minor refactor and implement foundation toggler 2017-09-21 23:09:04 +02:00
María Checa
ac5620c583 Merge branch 'master' into 1856-legislation_processes_proposals_phase 2017-09-21 21:24:56 +02:00
iagirre
4db2584f87 The tags are suggested based on the entries the user makes.
Cambios para hacer commit:
	modificado:    app/assets/javascripts/tag_autocomplete.js.coffee
	modificado:    app/assets/stylesheets/autocomplete_overrides.scss
	nuevo archivo: app/controllers/tags_controller.rb
	modificado:    app/models/abilities/common.rb
	modificado:    app/views/debates/_form.html.erb
	modificado:    app/views/proposals/_form.html.erb
	modificado:    config/initializers/acts_as_taggable_on.rb
	modificado:    config/routes.rb
	modificado:    spec/lib/acts_as_taggable_on_spec.rb
2017-09-21 18:21:45 +02:00
decabeza
363f2a59ac improves styles for community 2017-09-21 17:39:55 +02:00
decabeza
80e24d6c13 changes h2 titles upcase to prevent broke specs 2017-09-21 00:58:39 +02:00
Carlos Ruiz
c9ce560380 Legislation process minor html fixes 2017-09-20 23:34:27 +02:00
decabeza
b43e464292 renames js class 2017-09-20 19:27:11 +02:00
decabeza
6642d47f4c fixes scss lint errors 2017-09-20 19:26:43 +02:00
decabeza
b291547bae replaces unnecessary css class 2017-09-20 19:07:08 +02:00
Raimond Garcia
b416d2846e Merge pull request #1883 from xarlybovi/switch-flags-ajax
Switch flag/unflag buttons on use via ajax
2017-09-20 12:21:56 +02:00
decabeza
3fe1c21d7f includes new css styles 2017-09-20 01:38:32 +02:00
decabeza
3e5b4f2e44 removes important declaration on layout.scss 2017-09-20 01:38:32 +02:00
Carlos Ruiz
cf2dff1013 Small class names and html refactor 2017-09-19 20:11:06 +02:00
BertoCQ
f67ba62c49 Merge branch 'master' into user-recomendations 2017-09-19 18:56:12 +02:00
BertoCQ
f99612d619 Merge pull request #1869 from wairbut-m2c/iagirre-display-datepicker-arrows
Iagirre display datepicker arrows
2017-09-19 18:55:10 +02:00
iagirre
049967649e Selection of multiple tags separated by ',' works for hardcoded array of tags. 2017-09-19 17:37:31 +02:00
Carlos Ruiz
12d34a3ea1 Switch flag/unflag buttons on use via ajax 2017-09-18 19:07:45 +02:00
decabeza
cacd99648e fixes margin of tags on proposal show 2017-09-18 14:22:02 +02:00
decabeza
2b3cbac5bc moves author actions to sidebar on proposal show 2017-09-18 14:21:38 +02:00
iagirre
b889d23fe6 Fixed width property, changed to top. 2017-09-18 08:19:47 +02:00
iagirre
5ca4a6052f Merge branch 'iagirre-display-datepicker-arrows' of github.com:wairbut-m2c/consul into iagirre-display-datepicker-arrows 2017-09-15 10:04:12 +02:00
iagirre
354d07c1a6 Changes suggested in the PR https://github.com/consul/consul/pull/1869 made. Use the icons of consul instead of icons from jquery-ui.
Cambios para hacer commit:
	modificado:    app/assets/stylesheets/application.scss
	modificado:    app/assets/stylesheets/datepicker_overrides.scss
	borrado:       app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb
2017-09-15 10:02:18 +02:00
BertoCQ
87c99018e7 Merge branch 'master' into user-recomendations 2017-09-14 23:45:56 +02:00
BertoCQ
ce61adbfd2 Merge branch 'master' into iagirre-display-datepicker-arrows 2017-09-14 17:53:29 +02:00
iagirre
a7e570ed24 Added new line at the end of the file. 2017-09-14 17:09:02 +02:00
iagirre
f1eb535bde The arrows of the datepicker for changing the month didn't appear. There was a link for it, but no icons. The CSS file "theme" from jquery-ui was missing.
Cambios para hacer commit:
	modificado:    app/assets/stylesheets/application.scss
	modificado:    app/assets/stylesheets/datepicker_overrides.scss
	nuevo archivo: app/assets/stylesheets/jquery-ui-theme_overrides.scss.erb
2017-09-14 16:54:49 +02:00
BertoCQ
b597395768 Merge pull request #1860 from consul/help-headers
Help headers
2017-09-13 19:19:34 +02:00
BertoCQ
440c448ae4 Merge pull request #1862 from wairbut-m2c/iagirre-comments-empty-html
Iagirre comments empty html
2017-09-13 19:16:25 +02:00
decabeza
fb44a931df fixes legislation key dates with new proposal dates 2017-09-13 17:45:56 +02:00
iagirre
1356ea217b Erased extra empty HTML for comments without replies. Added .gitignore rules for Netbeans projects
Cambios para hacer commit:
	modificado:    .gitignore
	modificado:    app/assets/javascripts/comments.js.coffee
	modificado:    app/views/comments/_comment.html.erb
	modificado:    spec/features/comments/debates_spec.rb
2017-09-13 13:30:37 +02:00
decabeza
6b0f9746ef improves margins on simple menus 2017-09-13 13:27:53 +02:00
decabeza
eccbe9f833 makes section header minimal 2017-09-13 13:27:37 +02:00
decabeza
7aa876f0a7 avoids button overflow on admin tags table 2017-09-12 21:36:24 +02:00
BertoCQ
1ced54f0e3 Merge pull request #1835 from consul/1677-poll_questions_documents
Poll questions document and video
2017-09-11 00:08:31 +02:00
María Checa
12e6b9e681 Added video link to question public view 2017-09-06 19:11:28 +02:00