Giulio Cesare Solaroli 83b40aea50 Merge branch 'import' ...

Conflicts:
	frontend/delta/css/clipperz.css
	frontend/delta/css/clipperz.css.map
	frontend/delta/scss/core/layout.scss
	frontend/delta/scss/core/mixin.scss

2015-06-27 18:38:06 +02:00

..

accountStatus.scss

Added copyright/license notice to SCSS files

2015-03-22 23:15:45 +01:00

card.scss

Revisited styles for touch devices

2015-04-20 18:02:37 +02:00

dialogBox.scss

Merged and cleaned-up features implemented by Dario

2015-04-14 11:07:10 +02:00

loadingPage.scss

Added copyright/license notice to SCSS files

2015-03-22 23:15:45 +01:00

loginPage.scss

Revisited styles for touch devices

2015-04-20 18:02:37 +02:00

registrationPage.scss

Added copyright/license notice to SCSS files

2015-03-22 23:15:45 +01:00

selectionPanel.scss

Fixed empty field bug on change passphrase

2015-04-03 19:03:07 +02:00

settingsPanel.scss

Reviewed and improved export feature

2015-05-07 16:23:57 +02:00