diff --git a/public/cache.manifest b/public/cache.manifest
index 764f065b..b562af14 100644
--- a/public/cache.manifest
+++ b/public/cache.manifest
@@ -1,5 +1,5 @@
CACHE MANIFEST
-#Date Thu Oct 24 2013 21:59:15
+#Date Thu Oct 24 2013 22:54:22
CACHE:
res/worker.js
diff --git a/public/res-min/main.js b/public/res-min/main.js
index e6c9d86e..d76e21de 100644
--- a/public/res-min/main.js
+++ b/public/res-min/main.js
@@ -15431,22 +15431,20 @@ define("config", function() {}), define("storage", [ "underscore", "utils" ], fu
t.removeIndexFromArray(this.fileIndex + ".publish", e.publishIndex), delete this.publishLocations[e.publishIndex],
localStorage.removeItem(e.publishIndex);
}, i.prototype.composeTitle = function() {
- var t = [], n = e.values(this.syncLocations), i = [];
- e.chain(n).sortBy(function(e) {
+ var t = [];
+ return e.chain(this.syncLocations).sortBy(function(e) {
return e.provider.providerId;
}).each(function(e) {
- var t = "icon-provider-" + e.provider.providerId;
- e.isRealtime === !0 && (t += " realtime"), i.push('');
- }), 0 !== i.length && (t.push(''),
- t = t.concat(i), t.push(""));
- var o = e.values(this.publishLocations), r = [];
- return e.chain(o).sortBy(function(e) {
+ var n = "icon-provider-" + e.provider.providerId;
+ e.isRealtime === !0 && (n += " realtime"), t.push('');
+ }), 0 !== e.size(this.syncLocations) && t.push(''),
+ e.chain(this.publishLocations).sortBy(function(e) {
return e.provider.providerId;
}).each(function(e) {
- var t = "icon-provider-" + e.provider.providerId;
- e.isRealtime === !0 && (t += " realtime"), r.push('');
- }), 0 !== r.length && (t.push(''),
- t = t.concat(r), t.push("")), t.push(" "), t.push(this.title), t.join("");
+ var n = "icon-provider-" + e.provider.providerId;
+ e.isRealtime === !0 && (n += " realtime"), t.push('');
+ }), 0 !== e.size(this.publishLocations) && t.push(''),
+ t.push(this.title), t.join("");
}, i;
}), define("fileSystem", [ "underscore", "utils", "classes/FileDescriptor", "storage" ], function(e, t, n) {
var i = {};
diff --git a/public/res-min/themes/blue-gray.css b/public/res-min/themes/blue-gray.css
index 47aad9f6..df311397 100644
--- a/public/res-min/themes/blue-gray.css
+++ b/public/res-min/themes/blue-gray.css
@@ -1662,9 +1662,8 @@ div.dropdown-menu textarea{width:250px;height:150px;resize:none}
.icon-provider-wordpress{background-position:-108px 0}
.icon-provider-ssh{background-position:-126px 0}
.icon-provider-gplus{background-position:-144px 0}
-.title-icon-category{display:none}
-.file-title-navbar .title-icon-category{display:inline-block;font-size:16px;opacity:0.1;margin-left:-8px;margin-right:-8px;margin-top:-2px;vertical-align:top}
-.title-icon-container{display:inline-block;margin-right:10px}
+.title-icon-category{display:inline-block;opacity:0.1;margin-top:-4px;margin-left:-2px;margin-right:3px;font-size:12px;vertical-align:top}
+.file-title-navbar .title-icon-category{font-size:14px;margin-top:-2px;margin-left:-4px;margin-right:4px}
.picker-dialog{z-index:1050 !important}
.picker-dialog-bg{z-index:1040 !important}
.action-import-image-gplus{float:left}
@@ -1687,5 +1686,6 @@ div.jGrowl div.jGrowl-notification{min-height:80px}
.viewer .navbar .file-title-navbar{max-width:500px}
body.pdf{font-family:"DejaVu Sans";background-color:transparent}
body.pdf code,body.pdf pre{font-family:"DejaVu Sans Mono"}
+body.pdf blockquote{border-left:10px solid #eee}
.navbar .working-indicator.show{background-image:url("../img/loader-blue-gray.gif")}
@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-blue-gray2x.gif");background-size:50px 17px}}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-blue-gray2x.gif");background-size:50px 17px}}
diff --git a/public/res-min/themes/default.css b/public/res-min/themes/default.css
index b23db8eb..dba345d1 100644
--- a/public/res-min/themes/default.css
+++ b/public/res-min/themes/default.css
@@ -1662,9 +1662,8 @@ div.dropdown-menu textarea{width:250px;height:150px;resize:none}
.icon-provider-wordpress{background-position:-108px 0}
.icon-provider-ssh{background-position:-126px 0}
.icon-provider-gplus{background-position:-144px 0}
-.title-icon-category{display:none}
-.file-title-navbar .title-icon-category{display:inline-block;font-size:16px;opacity:0.1;margin-left:-8px;margin-right:-8px;margin-top:-2px;vertical-align:top}
-.title-icon-container{display:inline-block;margin-right:10px}
+.title-icon-category{display:inline-block;opacity:0.1;margin-top:-4px;margin-left:-2px;margin-right:3px;font-size:12px;vertical-align:top}
+.file-title-navbar .title-icon-category{font-size:14px;margin-top:-2px;margin-left:-4px;margin-right:4px}
.picker-dialog{z-index:1050 !important}
.picker-dialog-bg{z-index:1040 !important}
.action-import-image-gplus{float:left}
@@ -1687,3 +1686,4 @@ div.jGrowl div.jGrowl-notification{min-height:80px}
.viewer .navbar .file-title-navbar{max-width:500px}
body.pdf{font-family:"DejaVu Sans";background-color:transparent}
body.pdf code,body.pdf pre{font-family:"DejaVu Sans Mono"}
+body.pdf blockquote{border-left:10px solid #eee}
diff --git a/public/res-min/themes/night.css b/public/res-min/themes/night.css
index 57a0a818..c22dc0cc 100644
--- a/public/res-min/themes/night.css
+++ b/public/res-min/themes/night.css
@@ -1662,9 +1662,8 @@ div.dropdown-menu textarea{width:250px;height:150px;resize:none}
.icon-provider-wordpress{background-position:-108px 0}
.icon-provider-ssh{background-position:-126px 0}
.icon-provider-gplus{background-position:-144px 0}
-.title-icon-category{display:none}
-.file-title-navbar .title-icon-category{display:inline-block;font-size:16px;opacity:0.1;margin-left:-8px;margin-right:-8px;margin-top:-2px;vertical-align:top}
-.title-icon-container{display:inline-block;margin-right:10px}
+.title-icon-category{display:inline-block;opacity:0.1;margin-top:-4px;margin-left:-2px;margin-right:3px;font-size:12px;vertical-align:top}
+.file-title-navbar .title-icon-category{font-size:14px;margin-top:-2px;margin-left:-4px;margin-right:4px}
.picker-dialog{z-index:1050 !important}
.picker-dialog-bg{z-index:1040 !important}
.action-import-image-gplus{float:left}
@@ -1687,6 +1686,7 @@ div.jGrowl div.jGrowl-notification{min-height:80px}
.viewer .navbar .file-title-navbar{max-width:500px}
body.pdf{font-family:"DejaVu Sans";background-color:transparent}
body.pdf code,body.pdf pre{font-family:"DejaVu Sans Mono"}
+body.pdf blockquote{border-left:10px solid #eee}
.form-control:focus{-webkit-box-shadow:inset 0 1px 1px rgba(255,255,255,0),0 0 8px rgba(255,255,255,0.75);box-shadow:inset 0 1px 1px rgba(255,255,255,0),0 0 8px rgba(255,255,255,0.75)}
.navbar .working-indicator.show{background-image:url("../img/loader-night.gif")}
@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-night2x.gif");background-size:50px 17px}}@media only screen and (-webkit-min-device-pixel-ratio:2),only screen and (min--moz-device-pixel-ratio:2),only screen and (-o-min-device-pixel-ratio:2/1),only screen and (min-device-pixel-ratio:2),only screen and (min-resolution:192dpi),only screen and (min-resolution:2dppx){.navbar .working-indicator.show{background-image:url("../img/loader-night2x.gif");background-size:50px 17px}}.ace-tm .ace_cursor{border-left-color:#fff}
diff --git a/public/res-min/themes/school.css b/public/res-min/themes/school.css
index 465d3dec..3df87f4c 100644
--- a/public/res-min/themes/school.css
+++ b/public/res-min/themes/school.css
@@ -1662,9 +1662,8 @@ div.dropdown-menu textarea{width:250px;height:150px;resize:none}
.icon-provider-wordpress{background-position:-108px 0}
.icon-provider-ssh{background-position:-126px 0}
.icon-provider-gplus{background-position:-144px 0}
-.title-icon-category{display:none}
-.file-title-navbar .title-icon-category{display:inline-block;font-size:16px;opacity:0.1;margin-left:-8px;margin-right:-8px;margin-top:-2px;vertical-align:top}
-.title-icon-container{display:inline-block;margin-right:10px}
+.title-icon-category{display:inline-block;opacity:0.1;margin-top:-4px;margin-left:-2px;margin-right:3px;font-size:12px;vertical-align:top}
+.file-title-navbar .title-icon-category{font-size:14px;margin-top:-2px;margin-left:-4px;margin-right:4px}
.picker-dialog{z-index:1050 !important}
.picker-dialog-bg{z-index:1040 !important}
.action-import-image-gplus{float:left}
@@ -1687,6 +1686,7 @@ div.jGrowl div.jGrowl-notification{min-height:80px}
.viewer .navbar .file-title-navbar{max-width:500px}
body.pdf{font-family:"DejaVu Sans";background-color:transparent}
body.pdf code,body.pdf pre{font-family:"DejaVu Sans Mono"}
+body.pdf blockquote{border-left:10px solid #eee}
@font-face{font-family:'cursive_standardregular';src:url('../font/cursive_standard-webfont.eot');src:url('../font/cursive_standard-webfont.eot?#iefix') format('embedded-opentype'),url('../font/cursive_standard-webfont.woff') format('woff'),url('../font/cursive_standard-webfont.ttf') format('truetype'),url('../font/cursive_standard-webfont.svg#cursive_standardregular') format('svg');font-weight:normal;font-style:normal}.navbar{background-image:-webkit-gradient(linear, left 0, left 100%, from(#385e50), to(#34584b));background-image:-webkit-linear-gradient(top, #385e50, 0, #34584b, 100%);background-image:-moz-linear-gradient(top, #385e50 0, #34584b 100%);background-image:linear-gradient(to bottom, #385e50 0, #34584b 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff385e50', endColorstr='#ff34584b', GradientType=0)}
.ui-layout-resizer-north .resizer-decorator{position:absolute;width:100%;height:7px;background-color:#b9aa9f;-webkit-box-shadow:0 -1px 15px rgba(0,0,0,0.3);box-shadow:0 -1px 15px rgba(0,0,0,0.3);z-index:10;display:block !important}
.ui-layout-resizer-east{z-index:1 !important}
diff --git a/public/res/classes/FileDescriptor.js b/public/res/classes/FileDescriptor.js
index 0ce30d3a..5fec29a1 100644
--- a/public/res/classes/FileDescriptor.js
+++ b/public/res/classes/FileDescriptor.js
@@ -112,35 +112,26 @@ define([
FileDescriptor.prototype.composeTitle = function() {
var result = [];
- var syncAttributesList = _.values(this.syncLocations);
- var syncLocationIcon = [];
- _.chain(syncAttributesList).sortBy(function(attributes) {
+ _.chain(this.syncLocations).sortBy(function(attributes) {
return attributes.provider.providerId;
}).each(function(attributes) {
var classes = 'icon-provider-' + attributes.provider.providerId;
attributes.isRealtime === true && (classes += ' realtime');
- syncLocationIcon.push('');
+ result.push('');
});
- if(syncLocationIcon.length !== 0) {
- result.push('');
- result = result.concat(syncLocationIcon);
- result.push('');
+ if(_.size(this.syncLocations) !== 0) {
+ result.push('');
}
- var publishAttributesList = _.values(this.publishLocations);
- var publishLocationIcon = [];
- _.chain(publishAttributesList).sortBy(function(attributes) {
+ _.chain(this.publishLocations).sortBy(function(attributes) {
return attributes.provider.providerId;
}).each(function(attributes) {
var classes = 'icon-provider-' + attributes.provider.providerId;
attributes.isRealtime === true && (classes += ' realtime');
- publishLocationIcon.push('');
+ result.push('');
});
- if(publishLocationIcon.length !== 0) {
- result.push('');
- result = result.concat(publishLocationIcon);
- result.push('');
+ if(_.size(this.publishLocations) !== 0) {
+ result.push('');
}
- result.push(' ');
result.push(this.title);
return result.join('');
};
diff --git a/public/res/styles/main.less b/public/res/styles/main.less
index 2b30d6bd..3eb73257 100644
--- a/public/res/styles/main.less
+++ b/public/res/styles/main.less
@@ -1203,21 +1203,19 @@ div.dropdown-menu textarea {
// File titles
.title-icon-category {
- display: none;
- .file-title-navbar & {
- display: inline-block;
- font-size: 16px;
- opacity: 0.1;
- margin-left: -8px;
- margin-right: -8px;
- margin-top: -2px;
- vertical-align: top;
- }
-}
-
-.title-icon-container {
display: inline-block;
- margin-right: 10px;
+ opacity: 0.1;
+ margin-top: -4px;
+ margin-left: -2px;
+ margin-right: 3px;
+ font-size: 12px;
+ vertical-align: top;
+ .file-title-navbar & {
+ font-size: 14px;
+ margin-top: -2px;
+ margin-left: -4px;
+ margin-right: 4px;
+ }
}
@@ -1345,4 +1343,9 @@ body.pdf {
& code, & pre {
font-family: "DejaVu Sans Mono";
}
+
+ // Bug with PNG when using transparency (See #149)
+ blockquote{
+ border-left: 10px solid #eee;
+ }
}