diff --git a/cache.manifest b/cache.manifest index e6c238ab..ca8d3724 100644 --- a/cache.manifest +++ b/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -# Sun 4 Aug 2013 18:48:24 IST +# Sun 4 Aug 2013 18:48:25 IST CACHE: index.html diff --git a/js/styles/highlight.css b/css/highlight.css similarity index 100% rename from js/styles/highlight.css rename to css/highlight.css diff --git a/css/jgrowl.css b/css/jgrowl.css new file mode 100644 index 00000000..e3d253b3 --- /dev/null +++ b/css/jgrowl.css @@ -0,0 +1,98 @@ + +div.jGrowl { + z-index: 1050; + color: #fff; +} + +/** Normal Style Positions **/ +div.jGrowl { + position: absolute; +} + +body > div.jGrowl { + position: fixed; +} + +div.jGrowl.top-left { + left: 0px; + top: 0px; +} + +div.jGrowl.top-right { + right: 0px; + top: 0px; +} + +div.jGrowl.bottom-left { + left: 0px; + bottom: 0px; +} + +div.jGrowl.bottom-right { + right: 0px; + bottom: 0px; +} + +div.jGrowl.center { + top: 0px; + width: 50%; + left: 25%; +} + +/** Cross Browser Styling **/ +div.center div.jGrowl-notification, div.center div.jGrowl-closer { + margin-left: auto; + margin-right: auto; +} + +div.jGrowl div.jGrowl-notification, div.jGrowl div.jGrowl-closer { + background-color: #777; + zoom: 1; + width: 235px; + padding: 15px 20px; + margin-top: 5px; + margin-bottom: 5px; + text-align: left; + display: none; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; +} + +div.jGrowl div.jGrowl-notification { + min-height: 40px; +} + +div.jGrowl div.jGrowl-notification, +div.jGrowl div.jGrowl-closer { + margin: 20px; +} + +div.jGrowl div.jGrowl-notification div.jGrowl-header { + font-weight: bold; + font-size: .85em; +} + +div.jGrowl div.jGrowl-notification div.jGrowl-close { + z-index: 99; + float: right; + font-weight: bold; + font-size: 1em; + cursor: pointer; +} + +div.jGrowl div.jGrowl-closer { + padding-top: 4px; + padding-bottom: 4px; + cursor: pointer; + font-size: .9em; + font-weight: bold; + text-align: center; +} + +/** Hide jGrowl when printing **/ +@media print { + div.jGrowl { + display: none; + } +} \ No newline at end of file diff --git a/js/styles/prettify.css b/css/prettify.css similarity index 100% rename from js/styles/prettify.css rename to css/prettify.css diff --git a/img/icons.png b/img/icons.png index d2b8a6ae..ae08e85f 100644 Binary files a/img/icons.png and b/img/icons.png differ diff --git a/img/icons2x.png b/img/icons2x.png new file mode 100644 index 00000000..29f40696 Binary files /dev/null and b/img/icons2x.png differ diff --git a/js/core.js b/js/core.js index 69a78972..e2dd03d5 100644 --- a/js/core.js +++ b/js/core.js @@ -11,7 +11,6 @@ define([ "text!html/settingsUserCustomExtensionTooltip.html", "storage", "config", - "libs/bootstrap", "libs/layout", "libs/Markdown.Editor" ], function($, _, utils, settings, eventMgr, mousetrap, bodyIndexHTML, bodyViewerHTML, settingsTemplateTooltipHTML, settingsUserCustomExtensionTooltipHTML) { diff --git a/js/eventMgr.js b/js/eventMgr.js index 72d7eb8e..27b3cacb 100644 --- a/js/eventMgr.js +++ b/js/eventMgr.js @@ -29,7 +29,7 @@ define([ "extensions/buttonHtmlCode", "extensions/buttonMarkdownSyntax", "extensions/buttonViewer", - "libs/bootstrap", + "libs/bootstrap/bootstrap", "libs/jquery.waitforimages" ], function($, _, crel, utils, Extension, settings, settingsExtensionsAccordionHTML) { diff --git a/js/extensions/documentSelector.js b/js/extensions/documentSelector.js index 4c1b12a6..c55cbc21 100644 --- a/js/extensions/documentSelector.js +++ b/js/extensions/documentSelector.js @@ -47,7 +47,7 @@ define([ _.chain(attributesList).sortBy(function(attributes) { return attributes.provider.providerId; }).each(function(attributes) { - var classes = 'icon-' + attributes.provider.providerId; + var classes = 'icon-provider-' + attributes.provider.providerId; if(attributes.isRealtime === true) { classes += " realtime"; } diff --git a/js/extensions/documentTitle.js b/js/extensions/documentTitle.js index 9f33e5f8..1b6d9c1a 100644 --- a/js/extensions/documentTitle.js +++ b/js/extensions/documentTitle.js @@ -25,7 +25,7 @@ define([ _.chain(attributesList).sortBy(function(attributes) { return attributes.provider.providerId; }).each(function(attributes) { - var classes = 'icon-' + attributes.provider.providerId; + var classes = 'icon-provider-' + attributes.provider.providerId; if(attributes.isRealtime === true) { classes += " realtime"; } diff --git a/js/html/bodyIndex.html b/js/html/bodyIndex.html index 53c754f8..5dd58db3 100644 --- a/js/html/bodyIndex.html +++ b/js/html/bodyIndex.html @@ -28,7 +28,7 @@