diff --git a/dev/Styles/Layout.less b/dev/Styles/Layout.less index d2175c46f..9eb913def 100644 --- a/dev/Styles/Layout.less +++ b/dev/Styles/Layout.less @@ -326,5 +326,7 @@ html.rl-ctrl-key-pressed { display: none; } -/*html.rl-changing-language { -}*/ +#rl-loading-error-additional { + margin-top: 20px; + font-size: 20px; +} diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less index 0f70cf73f..628906ec9 100644 --- a/dev/Styles/Login.less +++ b/dev/Styles/Login.less @@ -51,19 +51,11 @@ border-radius: 3px; } - .control-group { - .inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode { - font-size: 18px; - height: 30px; - line-height: 29px; - } - } - .controls { .inputLoginForm, .inputEmail, .inputLogin, .inputPassword, .inputAdditionalCode { font-size: 18px; height: 40px; - line-height: 39px; + line-height: 20px; } } diff --git a/dev/Styles/MessageView.less b/dev/Styles/MessageView.less index d98713a63..d2272624f 100644 --- a/dev/Styles/MessageView.less +++ b/dev/Styles/MessageView.less @@ -362,6 +362,12 @@ html.rl-no-preview-pane .messageView { } } +html.rl-bottom-preview-pane .messageView { + .b-content { + bottom: @rlBottomMargin; + } +} + html.cssanimations.rl-anim .messageItem .line-loading { height: 5px !important; } diff --git a/dev/Styles/SystemDropDown.less b/dev/Styles/SystemDropDown.less index 882e1238e..cc5840c6a 100644 --- a/dev/Styles/SystemDropDown.less +++ b/dev/Styles/SystemDropDown.less @@ -55,6 +55,8 @@ text-overflow: ellipsis; border-radius: 4px; font-weight: bold; + + white-space: nowrap; } .account-item { diff --git a/dev/Styles/_End.less b/dev/Styles/_End.less index cc3ba741b..551ef82b6 100644 --- a/dev/Styles/_End.less +++ b/dev/Styles/_End.less @@ -25,4 +25,8 @@ .pswp__img--placeholder { opacity: 0; -} \ No newline at end of file +} + +#rl-content { + display: block; +} diff --git a/dev/bootstrap.js b/dev/bootstrap.js index 2dd1bcd20..9b9b13058 100644 --- a/dev/bootstrap.js +++ b/dev/bootstrap.js @@ -51,6 +51,11 @@ $(function () { + if (!$('#rl-content').is(':visible')) + { + Globals.$html.addClass('no-css'); + } + if (window['rainloopTEMPLATES'] && window['rainloopTEMPLATES'][0]) { $('#rl-templates').html(window['rainloopTEMPLATES'][0]); diff --git a/gulpfile.js b/gulpfile.js index 7b4f29e90..a1fc2f0e9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -113,7 +113,7 @@ cfg.paths.js = { 'vendors/json2.min.js', 'vendors/labjs/LAB.min.js', 'vendors/simple-pace/simple-pace-1.0.min.js', - 'vendors/rl/rl-1.3.min.js' + 'vendors/rl/rl-1.4.min.js' ] }, openpgp: { @@ -386,8 +386,8 @@ regOtherMinTask('other:inputosaurus', 'vendors/inputosaurus/', 'inputosaurus.js' regOtherMinTask('other:pace', 'vendors/simple-pace/', 'simple-pace.js', 'simple-pace-1.0.min.js', '/*! RainLoop Simple Pace v1.0 (c) 2014 RainLoop Team; Licensed under MIT */\n'); -regOtherMinTask('other:rl', 'vendors/rl/', 'rl.js', 'rl-1.3.min.js', - '/*! RainLoop Index Helper v1.3 (c) 2014 RainLoop Team; Licensed under MIT */\n'); +regOtherMinTask('other:rl', 'vendors/rl/', 'rl.js', 'rl-1.4.min.js', + '/*! RainLoop Index Helper v1.4 (c) 2014 RainLoop Team; Licensed under MIT */\n'); gulp.task('fontastic-fonts:clear', function() { return cleanDir('rainloop/v/' + cfg.devVersion + '/static/css/fonts/rainloop.*'); diff --git a/package.json b/package.json index c5fa44de6..49392e081 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "RainLoop", "title": "RainLoop Webmail", "version": "1.7.2", - "release": "226", + "release": "229", "description": "Simple, modern & fast web-based email client", "homepage": "http://rainloop.net", "main": "gulpfile.js", diff --git a/rainloop/v/0.0.0/app/templates/Index.html b/rainloop/v/0.0.0/app/templates/Index.html index e76a42e05..d537e1f34 100644 --- a/rainloop/v/0.0.0/app/templates/Index.html +++ b/rainloop/v/0.0.0/app/templates/Index.html @@ -20,6 +20,7 @@ + @@ -66,6 +67,7 @@ An Error occurred,
please refresh the page and try again. +
diff --git a/rainloop/v/0.0.0/app/templates/Themes/template.less b/rainloop/v/0.0.0/app/templates/Themes/template.less index 0af2b518c..894a3b216 100644 --- a/rainloop/v/0.0.0/app/templates/Themes/template.less +++ b/rainloop/v/0.0.0/app/templates/Themes/template.less @@ -183,3 +183,27 @@ .thm-message-view-background-color { .thm-rgba-background-color(@message-background-color, @message-rgba-background-color); } + + +html.no-css { + + .thm-body { + color: #333; + background-color: #aaa; + background-image: none; + } + + .thm-loading { + color: #333 !important; + text-shadow: none !important; + + .e-spinner .e-bounce { + display: none !important; + } + } + + .thm-login-desc .desc { + color: #333 !important; + text-shadow: none !important; + } +} \ No newline at end of file diff --git a/rainloop/v/0.0.0/app/templates/Views/User/Login.html b/rainloop/v/0.0.0/app/templates/Views/User/Login.html index d7a39219e..1d1a4fb3f 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/Login.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/Login.html @@ -87,13 +87,13 @@
-
-
+
+
  -
+
diff --git a/rainloop/v/0.0.0/app/templates/Views/User/SystemDropDown.html b/rainloop/v/0.0.0/app/templates/Views/User/SystemDropDown.html index f2b102fc0..be1cb9d22 100644 --- a/rainloop/v/0.0.0/app/templates/Views/User/SystemDropDown.html +++ b/rainloop/v/0.0.0/app/templates/Views/User/SystemDropDown.html @@ -4,9 +4,8 @@
- -    - +