Commit Graph

70 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
2eccd30eff Adds styles for deleted users, improves previous 2015-08-19 15:01:10 +02:00
Alberto Garcia Cabeza
85ef4eb08d Updates custom icons font 2015-08-19 15:00:00 +02:00
Alberto Garcia Cabeza
04db8112b4 Adds styles for associations comments 2015-08-19 11:53:35 +02:00
Alberto Garcia Cabeza
87d921b3c7 Adds styles for comments 2015-08-19 11:53:18 +02:00
Alberto Garcia Cabeza
33875daef6 Adds styles for new admin's sections 2015-08-18 13:48:37 +02:00
Alberto Garcia Cabeza
ad1833b918 Updates custom icons font 2015-08-18 13:47:24 +02:00
Raimond Garcia
3a358ed90c Merge pull request #194 from AyuntamientoMadrid/styling_admin
Styling admin
2015-08-17 22:07:56 +02:00
Alberto Garcia Cabeza
9f8229465c fixes conflicts 2015-08-17 21:36:06 +02:00
Alberto Garcia Cabeza
0df1524f0d Creates SCSS for admin 2015-08-17 21:30:07 +02:00
Alberto Garcia Cabeza
43ee2144c1 Updates custom icons font 2015-08-17 21:29:44 +02:00
Juanjo Bazán
7e1cd2940d Fix conflicts 2015-08-17 21:08:15 +02:00
Raimond Garcia
b51354cffb Merge pull request #187 from AyuntamientoMadrid/titles_and_filters
Titles and filters
2015-08-17 20:00:05 +02:00
Eloy Gomez
637e428f4c Add c3.js and dependencies 2015-08-17 19:13:38 +02:00
Juanjo Bazán
4a8825cf11 Merge pull request #184 from AyuntamientoMadrid/add_subnavigation
Adds sub navigation menu
2015-08-17 15:21:53 +02:00
Alberto Garcia Cabeza
f485225250 Merge branch 'master' into titles_and_filters 2015-08-17 14:53:48 +02:00
Alberto Garcia Cabeza
43f8db8e3a Adds styles for titles and filters 2015-08-17 14:53:00 +02:00
rgarcia
f31ed2940d adds moderation to comments and debates [#136] 2015-08-17 13:39:31 +02:00
Alberto Garcia Cabeza
9f1f64cc3a Adds sub navigation menu 2015-08-17 12:31:05 +02:00
Alberto Garcia Cabeza
09d71ad84f Merge branch 'master' into improving_debates
Conflicts:
	app/assets/stylesheets/debates.scss
	app/assets/stylesheets/participacion.scss
2015-08-15 01:45:56 +02:00
Alberto Garcia Cabeza
3ab3285ce4 Cleans scss files 2015-08-15 01:20:26 +02:00
Alberto Garcia Cabeza
26e2a7bcbb Cleans style guide 2015-08-15 01:05:46 +02:00
Alberto Garcia Cabeza
a255d15793 Updates custom icons fonts 2015-08-15 00:56:58 +02:00
David Gil
2b16716ee1 add author-photo css class to author avatar 2015-08-14 21:16:53 +02:00
David Gil
d870706a26 rename css class 2015-08-14 21:16:53 +02:00
David Gil
925921d605 adding initial.js to show Gmail-like user avatars; adding avatar_image helper to abstract from plugin options adding the two currently used styles, profile and small 2015-08-14 21:15:59 +02:00
Alberto Garcia Cabeza
8bee3abb7b Adds styles for tag clod 2015-08-12 17:08:39 +02:00
Alberto Garcia Cabeza
d6c7528df3 Improves styles of debates show page 2015-08-12 15:26:46 +02:00
Alberto Garcia Cabeza
00af11396d Improves styles for auth pages 2015-08-12 14:07:34 +02:00
Alberto Garcia Cabeza
502920c7f2 Improves styles for account page, adds user image 2015-08-12 11:53:28 +02:00
Alberto Garcia Cabeza
94dc53e68c Improves styles for account page, adds user avatar 2015-08-12 11:44:15 +02:00
Alberto Garcia Cabeza
3cddc1070a Adds styles for not logged votes 2015-08-11 17:40:27 +02:00
Alberto Garcia Cabeza
d5c27b36d5 Improves styles for debate show and comments 2015-08-11 13:16:24 +02:00
Alberto Garcia Cabeza
f9e0dad7a2 Adds links on comments title 2015-08-11 12:00:54 +02:00
Fernando Seror
6d20972f34 Share in social networks
* Add the social buttons gem to the Gemfile

* Initializer and translations for the social buttons

* Add the social buttons assets to the sprockets require

* Add the social buttons in the show debate view

* Spec to lock down the amount of social share buttons to three
2015-08-10 11:00:39 -05:00
Alberto Garcia Cabeza
91cdfbc8a1 Adds content on footer 2015-08-10 15:39:38 +02:00
Alberto Garcia Cabeza
c80d9b0a47 Reorganizes scss files 2015-08-10 13:33:02 +02:00
Alberto Garcia Cabeza
6c0dd32ed1 Adds styles for debates voted and no voted 2015-08-10 12:08:43 +02:00
Alberto Garcia Cabeza
c048f25941 Fixes conflicts 2015-08-08 13:28:29 +02:00
Alberto Garcia Cabeza
fdfef95595 Adds styles for account page and edit user 2015-08-08 13:21:46 +02:00
Alberto Garcia Cabeza
d45a22781a Changes styles for header 2015-08-07 23:23:16 +02:00
Alberto Garcia Cabeza
8fdba1b5b4 Merges accounts show with registrations edit 2015-08-07 12:16:20 +02:00
Alberto Garcia Cabeza
beb05106cb Fixes conflicts 2015-08-06 20:58:54 +02:00
Alberto Garcia Cabeza
df3884ad18 Adds styles for debate new 2015-08-06 20:54:37 +02:00
Alberto Garcia Cabeza
724cffa4ce Updates icons fonts 2015-08-06 20:54:37 +02:00
Alberto Garcia Cabeza
f9cb8151ff Adds styles for authentication pages 2015-08-06 20:53:14 +02:00
Alberto Garcia Cabeza
1067d2272e Adds styles for debate new 2015-08-06 17:59:22 +02:00
Alberto Garcia Cabeza
c7cd29360d Updates icons fonts 2015-08-06 17:59:05 +02:00
rgarcia
ec6d34a49f fixes conflicts 2015-08-06 13:42:57 +02:00
Alberto Garcia Cabeza
f0be767ae8 Updates styles for debates show 2015-08-06 12:42:41 +02:00
Alberto Garcia Cabeza
77ecf39852 Updates styles for debates index 2015-08-06 11:19:37 +02:00