Commit Graph

664 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
6d9ced63a2 renames and removes unused variables 2016-10-31 13:10:15 +01:00
Alberto Garcia Cabeza
08db2faf86 fixes breakpoint on mixins 2016-10-25 16:30:36 +02:00
Alberto Garcia Cabeza
5c1e1f96ea deletes unused wrap class 2016-10-25 16:23:45 +02:00
Alberto Garcia Cabeza
1a143dfe0f adds style for selection 2016-10-25 16:21:52 +02:00
Alberto Garcia Cabeza
c835d9b1d1 improves styles for flash notices 2016-10-19 10:54:48 +02: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
a4693788f1 Updates custom icons font 2016-09-12 18:46:04 +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
Juanjo Bazán
42c705e1e3 adds dossier editing of investments to valuation 2016-09-09 15:09:06 +02:00
Juanjo Bazán
0fc31b1259 adds budget/budget_investment indexes to valuators 2016-09-09 13:39:08 +02:00
Alberto Garcia Cabeza
cff1f43a90 Adds banner, styles, and updates icons font 2016-09-07 16:42:57 +02:00
rgarcia
c2c7cdb18d Merge branch 'budget' into budget-public-controllers 2016-09-02 13:15:40 +02:00
Juanjo Bazán
b8b71d0ab0 Merge branch 'master' into budget 2016-09-02 12:47:54 +02:00
kikito
7ad4a21229 Tries to make ckeditor work correctly with the asset pipeline
Reference: https://github.com/galetahub/ckeditor/issues/519
2016-08-30 12:05:46 +02:00
Alberto Garcia Cabeza
3e892c6e76 Adds translations and improve example content 2016-07-28 19:21:53 +02:00
Alberto Garcia Cabeza
b69308b770 Adds example content for admin budget new 2016-07-28 13:04:30 +02:00
rgarcia
3c55d66591 fixes conflicts with budget 2016-07-27 11:41:46 +02:00
rgarcia
a23666683f fixes conflicts with master 2016-07-19 15:50:22 +02:00
Alberto Garcia Cabeza
616e8abe28 Updates foundation rails gem 2016-07-13 14:22:24 +02:00
Alberto Garcia Cabeza
e55fdc42ee Updates classes names for social share button 2016-07-08 14:13:13 +02:00
Alberto Garcia Cabeza
0972f5284a Creates new scss file for IE styles 2016-06-23 13:56:57 +02:00
Alberto Garcia Cabeza
7f20d4eb23 Improves styles for admin pages 2016-06-16 13:44:06 +02:00
Alberto Garcia Cabeza
2dc39192b8 Adds button to proposal's show to 'Send notification' 2016-06-15 17:13:44 +02:00
Alberto Garcia Cabeza
988f1f645a Improves proposal notification mailer and fixes settings.scss 2016-06-10 18:02:37 +02:00
Alberto Garcia Cabeza
15af94928b Adds styles and texts for direct messages mailer 2016-06-09 16:01:38 +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
rgarcia
21c2220626 fixes typo 2016-06-08 12:30:53 +02:00
rgarcia
34304a0b5e fixes conflicts with master 2016-06-07 23:19:01 +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
e550a40f90 Adds share and comment button on email 2016-06-07 16:12:16 +02:00
Alberto Garcia Cabeza
0a5369c7b4 Shows anonymous messages on focus whit tab 2016-06-06 18:04:58 +02:00
Alberto Garcia Cabeza
bfc9c6c0df Improves styles for proposal show 2016-06-06 17:51:16 +02:00
Alberto Garcia Cabeza
224c9d42c4 Fixes layout for order comments 2016-06-06 17:47:17 +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
d147cce459 Fixes localization specs 2016-06-02 11:26:40 +02:00
Alberto Garcia Cabeza
9e31eeefad Cleans admin.scss 2016-06-01 18:10:14 +02:00
Alberto Garcia Cabeza
5bd7bbee4f Improves styles for management section 2016-06-01 18:07:58 +02:00
Andrés Pereira
a4dbd768ce Custom folder structure: initial documentation, code and structure folders 2016-05-31 19:57:29 +02:00
Alberto Garcia Cabeza
00fd9da0f9 Improves admin dashboard 2016-05-31 17:25:30 +02:00
Alberto Garcia Cabeza
56bb06b168 Improves general layout for admin 2016-05-31 17:10:08 +02:00
Alberto Garcia Cabeza
7d1bf7344a Removes unused file and style 2016-05-23 19:05:16 +02:00
Alberto Garcia Cabeza
8954ea6cb5 Improves styles, removes blank spaces and changes banners img 2016-05-23 16:49:40 +02:00
Alberto Garcia Cabeza
a9ac0dc7ff Moves banners styles to layout.scss 2016-05-23 16:48:42 +02:00