Commit Graph

494 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Alberto Garcia Cabeza
7c65a6ee1a Merge branch 'add_banners_admin' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-add_banners_admin 2016-05-23 12:14:52 +02:00
Alberto Garcia Cabeza
1103703ace Removes duplicates styles 2016-05-19 16:29:37 +02:00
Alberto Garcia Cabeza
10a2412e20 Removes unused scss 2016-05-19 16:25:10 +02:00
MaiteHdezRivas
550f61ed51 Merge with consul 2016-05-19 13:55:25 +02:00
MaiteHdezRivas
3b2bfc46cf Admin option to add banners and show banners 2016-05-19 13:18:30 +02:00
Alberto Garcia Cabeza
ecf6999730 Improves layout 2016-05-19 12:54:49 +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
58aa0309ac Fixes typo 2016-05-18 17:24:08 +02:00
Alberto Garcia Cabeza
e77b9cf46c Moves custom variables to settings.scss 2016-05-18 17:16:06 +02:00
Alberto Garcia Cabeza
d9cca3cbf1 Updates settings.scss 2016-05-18 16:52:17 +02:00
Alberto Garcia Cabeza
d1f34c8288 Removes unused image and scss 2016-05-18 12:47:24 +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
2d33ace410 Adds styles for :focus selector 2016-05-04 11:28:30 +02:00
kikito
e441a6805f makes callout.notice and callout.error equivalent to success, alert 2016-04-28 16:21:51 +02:00
kikito
dea1a28a69 purges simple_captcha 2016-04-27 16:07:47 +02:00
Alberto Garcia Cabeza
32f4228b5f Fixes total price wrap on summary tables 2016-04-27 14:15:05 +02:00
Alberto Garcia Cabeza
cd02af5d64 Improves layout for sps evaluators 2016-04-27 09:00:19 +02:00
Alberto Garcia Cabeza
106469dbf4 Improves table layout for sps admin summary 2016-04-26 16:33:45 +02:00