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

..

_settings.scss

Updates foundation rails gem

2016-07-13 14:22:24 +02:00

admin.scss

Creates new scss file for IE styles

2016-06-23 13:56:57 +02:00

annotator_overrides.scss

Removes unused scss

2016-05-19 16:25:10 +02:00

application.scss

Moves banners styles to layout.scss

2016-05-23 16:48:42 +02:00

custom.scss

Custom folder structure: initial documentation, code and structure folders

2016-05-31 19:57:29 +02:00

datepicker_overrides.scss

Merge branch 'add_banners_admin' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-add_banners_admin

2016-05-23 12:14:52 +02:00

fonts.scss

Removes Merriweather font

2015-12-15 16:54:26 +01:00

foundation_and_overrides.scss

Removes unused image and scss

2016-05-18 12:47:24 +02:00

icons.scss

Adds banner, styles, and updates icons font

2016-09-07 16:42:57 +02:00

ie.scss

Creates new scss file for IE styles

2016-06-23 13:56:57 +02:00

layout.scss

Updates classes names for social share button

2016-07-08 14:13:13 +02:00

mixins.scss

Improves styles, removes blank spaces and changes banners img

2016-05-23 16:49:40 +02:00

participation.scss

Merge branch 'master' into voting-proposals

2016-09-15 13:58:53 +02:00

print.css

Improves styles for management section

2016-06-01 18:07:58 +02:00