Merge upstream.

This commit is contained in:
Brendan Dahl 2012-02-08 16:31:30 -08:00
commit a5d9ff8568
66 changed files with 6462 additions and 1424 deletions

View file

@ -9,7 +9,7 @@ body {
}
[hidden] {
display: none;
display: none !important;
}
/* === Toolbar === */
@ -241,6 +241,16 @@ canvas {
-webkit-box-shadow: 0px 2px 10px #ff0;
}
.loadingIcon {
position: absolute;
display: block;
left: 0;
top: 0;
right: 0;
bottom: 0;
background: url('images/loading-icon.gif') center no-repeat;
}
.textLayer {
position: absolute;
left: 0;