Alberto Garcia Cabeza 3f53f61b1d Fixes conflicts

2015-09-03 00:12:59 +02:00

..

admin.scss

Adds new texts for admin and moderation pages

2015-08-31 21:49:36 +02:00

application.scss

Merge pull request #194 from AyuntamientoMadrid/styling_admin

2015-08-17 22:07:56 +02:00

debates.scss

adds interface to disallow organizations votes

2015-09-02 12:16:55 +02:00

fonts.scss

uses assets url helpers

2015-09-01 12:40:23 +02:00

foundation_and_overrides.scss

configures foundation #2

2015-07-16 17:03:05 +02:00

icons.scss

Updates custom icons font

2015-08-31 21:35:41 +02:00

participacion.scss

Fixes conflicts

2015-09-03 00:12:59 +02:00

variables.scss

Adds styles for deleted comments

2015-08-27 20:21:26 +02:00