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

..

clipperz-font

Switched default font from SourceCode Pro to Dejavu

2015-02-26 16:39:48 +01:00

behavior.scss

Revisited styles for touch devices

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

flex.scss

Cleaned up the rendering of search form

2015-03-03 23:25:30 +01:00

fonts.scss

Added transition when opening the left panel

2015-04-03 16:57:18 +02:00

layout.scss

Merged Import and Export branches, implemented Giulio's remarks on Import feature

2015-05-21 14:34:49 +02:00

mixin.scss

Merged Import and Export branches, implemented Giulio's remarks on Import feature

2015-05-21 14:34:49 +02:00

overlay.scss

Merged Import and Export branches, implemented Giulio's remarks on Import feature

2015-05-21 14:34:49 +02:00

palette.scss

Added copyright/license notice to SCSS files

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

parameters.scss

Added copyright/license notice to SCSS files

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

reset.scss

Interim synchronization with internal repository

2014-07-28 18:07:48 +02:00

sizes.scss

Added transition when opening the left panel

2015-04-03 16:57:18 +02:00

tagEditor.scss

Added copyright/license notice to SCSS files

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