diff --git a/package.json b/package.json index 537b7a4e..c8a5cc36 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "c9", "description": "New Cloud9 Client", - "version": "3.1.423", + "version": "3.1.425", "author": "Ajax.org B.V. ", "private": true, "main": "bin/c9", diff --git a/plugins/c9.ide.layout.classic/images/c9-logo-blue.png b/plugins/c9.ide.layout.classic/images/c9-logo-blue.png new file mode 100644 index 00000000..c2ec1291 Binary files /dev/null and b/plugins/c9.ide.layout.classic/images/c9-logo-blue.png differ diff --git a/plugins/c9.ide.layout.classic/images/c9-logo-blue@2x.png b/plugins/c9.ide.layout.classic/images/c9-logo-blue@2x.png new file mode 100644 index 00000000..914e9494 Binary files /dev/null and b/plugins/c9.ide.layout.classic/images/c9-logo-blue@2x.png differ diff --git a/plugins/c9.ide.layout.classic/images/c9-logo-white.png b/plugins/c9.ide.layout.classic/images/c9-logo-white.png new file mode 100644 index 00000000..298bbe76 Binary files /dev/null and b/plugins/c9.ide.layout.classic/images/c9-logo-white.png differ diff --git a/plugins/c9.ide.layout.classic/images/c9-logo-white@2x.png b/plugins/c9.ide.layout.classic/images/c9-logo-white@2x.png new file mode 100644 index 00000000..038ac529 Binary files /dev/null and b/plugins/c9.ide.layout.classic/images/c9-logo-white@2x.png differ diff --git a/plugins/c9.ide.layout.classic/loading.css b/plugins/c9.ide.layout.classic/loading-classic.css similarity index 100% rename from plugins/c9.ide.layout.classic/loading.css rename to plugins/c9.ide.layout.classic/loading-classic.css diff --git a/plugins/c9.ide.layout.classic/loading-flat.css b/plugins/c9.ide.layout.classic/loading-flat.css new file mode 100644 index 00000000..d0751103 --- /dev/null +++ b/plugins/c9.ide.layout.classic/loading-flat.css @@ -0,0 +1,150 @@ +HTML.loading{ + background: -moz-linear-gradient(top, rgba(255,255,255,1) 0%, rgba(251,251,251,1) 100%); /* FF3.6-15 */ + background: -webkit-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(251,251,251,1) 100%); /* Chrome10-25,Safari5.1-6 */ + background: linear-gradient(to bottom, rgba(255,255,255,1) 0%,rgba(251,251,251,1) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ +} +HTML.loading.dark{ + background: -moz-linear-gradient(top, rgba(37,37,37,1) 0%, rgba(35,35,35,1) 100%); /* FF3.6-15 */ + background: -webkit-linear-gradient(top, rgba(37,37,37,1) 0%,rgba(35,35,35,1) 100%); /* Chrome10-25,Safari5.1-6 */ + background: linear-gradient(to bottom, rgba(37,37,37,1) 0%,rgba(35,35,35,1) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ +} + +#loadingide { + background-image: url(images/c9-logo-blue.png); + background-repeat: no-repeat; + background-position: 50% 30%; + font-style: normal; + height: 100%; + width: 100%; + position: fixed; + text-align: center; + z-index: 200000; + left: 0; + top: 0; + -webkit-font-smoothing: antialiased !important; + -moz-osx-font-smoothing: grayscale !important; +} +#loadingide.dark { + background-image: url(images/c9-logo-white.png); +} + +@media print, (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 1.25dppx) { + #loadingide { + background-image: url(images/c9-logo-blue@2x.png); + background-size: 300px 279px; + } + #loadingide.dark { + background-image: url(images/c9-logo-white@2x.png); + } +} + +#loadingide .loading-progress { + font-family: Myriad Pro, Arial; + font-size: 18px; + color: #9b9b9b; + height: 37px; + position: absolute; + margin: 0 auto; + bottom: 10%; + width: 100%; +} +#progress-msg { + position: relative; + width: 250px; + margin: 0 auto; +} +#loadingide .loading-msg { + color: #6d6d6d; + font-size : 14px; + margin-top : 15px; +} +#loadingide .footer { + font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; + font-size: 11px; + color: #333; + position:absolute; + bottom:5px; + right:10px; + text-align: right; + margin: 0; +} +#loadingide.dark .footer { + color: #818181; +} +#loadingide .footer, +#loadingide .footer > a:link, +#loadingide .footer > a:visited, +#loadingide .footer > a:active { + color: #333; + text-decoration: none; +} +#loadingide.dark .footer, +#loadingide.dark .footer > a:link, +#loadingide.dark .footer > a:visited, +#loadingide.dark .footer > a:active { + color: #909090; +} +#loadingide .footer > a:hover { + color: #444; + text-decoration: underline; +} +#loadingide.dark .footer > a:hover { + color: #f1f1f1; +} +#errorMessage { + display: block; + color: #c41117; + text-shadow: 0 1px 0 #eee; + background: rgba(255, 0, 0, 0.04); + padding: 10px; + margin: 50px auto; + border-radius: 10px; + + font-size: 15px; + text-align: center; + width: 560px; + line-height: 25px; +} +#errorMessage a { + font-size: 15px; + color: #720c10; + text-decoration: underline; +} + +#loadingide .status { + position: absolute; + left: 50%; + margin-left: -100px; + width: 200px; + text-align: center; + top: 57%; + margin-top: 200px; +} + +#loadingide .cool-message { + display: block; + font-family: Arial; + font-size: 30px; + color: #A7A7A7; + white-space: nowrap; + position: absolute; + top: 30%; + left: 50%; + width: 1000px; + text-align: center; + margin-left: -500px; + margin-top: 250px; +} +#loadingide.dark .cool-message { + color: #757575; +} + +#loadingide .spinner { + background: url(images/running_flat_light@2x.png); + background-size: 300px 20px; + animation: rotation 0.6s infinite steps(16); + width: 20px; + height: 20px; + background-repeat: no-repeat; + display: inline-block; +} \ No newline at end of file diff --git a/plugins/c9.vfs.standalone/views/standalone.html.ejs b/plugins/c9.vfs.standalone/views/standalone.html.ejs index 008507a3..8d6f4761 100644 --- a/plugins/c9.vfs.standalone/views/standalone.html.ejs +++ b/plugins/c9.vfs.standalone/views/standalone.html.ejs @@ -16,39 +16,11 @@ window.isLocalVersion = nRequire ? true : false; window.require = undefined; - -
-
-
- Loading your workspace -
-
-
It will be just as you left it
- -
-
- -
-
-
-
- Documentation | - Server Status | - Support -
-
- - + <% include ../../c9.ide.server/views/load-screen.ejs %> <% if (packed) { %> @@ -58,7 +30,7 @@ <% } %>