Merge branch 'vanilla_devel' of https://github.com/mrbeam/OctoPrint into pr/mrbeam/vanilla_devel

Conflicts:
	src/octoprint/static/less/octoprint.less
This commit is contained in:
Gina Häußge 2016-08-15 09:40:21 +02:00
commit edf83e4984
2 changed files with 4 additions and 1 deletions

File diff suppressed because one or more lines are too long

View file

@ -953,18 +953,21 @@ textarea.block {
-webkit-transform: scaleX(-1);
-moz-transform: scaleX(-1);
-ms-transform: scaleX(-1);
transform: scaleX(-1);
}
.flipV {
-webkit-transform: scaleY(-1);
-moz-transform: scaleY(-1);
-ms-transform: scaleY(-1);
transform: scaleY(-1);
}
.flipH.flipV {
-webkit-transform: scaleX(-1) scaleY(-1);
-moz-transform: scaleX(-1) scaleY(-1);
-ms-transform: scaleX(-1) scaleY(-1);
transform: scaleX(-1) scaleY(-1);
}
.rotate90 {