From 5aba43d92c6b9fafb589420496737594ca3f3f1f Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Thu, 25 Aug 2016 16:09:55 +0300 Subject: Changes in the login form: * The alignment of the login form centered in WebKit * Indent after the reference password recovery --- src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css | 1 + src/Wallabag/UserBundle/Resources/views/Security/login.html.twig | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Wallabag') diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css index eb4eebd8..541096be 100755 --- a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css @@ -52,6 +52,7 @@ body { body.login main { padding: 0; + min-height: 100vh; } .border-bottom { diff --git a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig index 982a33b2..5835330d 100644 --- a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig +++ b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig @@ -39,7 +39,7 @@ -
+
{{ 'security.login.forgot_password'|trans }}
-- cgit v1.2.3 From 538587855a72be5b49962132b976816295a05ebc Mon Sep 17 00:00:00 2001 From: Alexandr Danilov Date: Thu, 25 Aug 2016 16:22:47 +0300 Subject: A new version of the plugin tinydot with update on window resize --- .../public/themes/material/js/jquery.tinydot.js | 94 ++++++++++++++++++---- .../themes/material/js/jquery.tinydot.min.js | 2 +- .../views/themes/material/Entry/entries.html.twig | 2 +- 3 files changed, 81 insertions(+), 17 deletions(-) (limited to 'src/Wallabag') diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.js b/src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.js index d2bf7fb6..bf9eadef 100644 --- a/src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.js +++ b/src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.js @@ -1,14 +1,14 @@ /* - * jQuery tinydot 0.1 + * jQuery tinydot 0.2.0 * - * Copyright (c) Alexander Danilov - * www.modos189.ru + * Copyright (c) Alexander Danilov + * modos189.ru * - * Plugin repository: - * https://gitlab.com/modos189/tinydot + * Plugin website: + * tinydot.modos189.ru * - * Licensed under the MIT license. - * http://en.wikipedia.org/wiki/MIT_License + * Licensed under the MIT license. + * http://en.wikipedia.org/wiki/MIT_License */ (function( $, undef ) @@ -19,21 +19,85 @@ } $.fn.tinydot = function( o ) { - var p=$(this).children('a'); - var divh=$(this).height(); - while ($(p).outerHeight()>divh) { - $(p).text(function (index, text) { - return text.replace(/\W*\s(\S)*$/, '...'); + + var $dot = this; + $dot.child = getChildOrDie($dot); + $dot.orgContent = $($dot.child).html(); + ellipsis( $dot ); + + $dot.watch = function() + { + $(window).on('resize', function(){ + if ( watchInt ) + { + clearInterval( watchInt ); + } + watchInt = setTimeout( + function() + { + reinitialize($dot); + }, 100 + ); }); + + return $dot; + }; + + var opts = $.extend( true, {}, $.fn.tinydot.defaults, o ), + watchInt = null; + + if ( opts.watch ) + { + $dot.watch(); } } + + // public + $.fn.tinydot.defaults = { + 'watch' : false + }; + + function getChildOrDie( $elem ) + { + var childrens = $elem.children(); + if (childrens.length == 0) { + // create children + var data = $($elem).html(); + $elem.html(''); + $elem.append(''); + return $elem.children('span').html(data); + } else { + return childrens[0]; + } + } + + function reinitialize( $elem ) + { + $($elem.child).html($elem.orgContent); + ellipsis( $elem ); + } + + function ellipsis( $elem ) { + var divh=$($elem).height(); + while ($($elem.child).outerHeight()>divh) { + $($elem.child).html(function (index, html) { + return html.replace(/\W*\s(\S)*$/, '...'); + }); + } + } + })( jQuery ); jQuery(document).ready(function($) { //We only invoke jQuery.tinydot on elements that have dot-ellipsis class $(".dot-ellipsis").each(function(){ - var x = new Object(); - $(this).tinydot(x); + //Checking if update on window resize required + var watch_window=$(this).hasClass("dot-resize-update"); + + //Invoking jQuery.tinydot + var x = new Object(); + if (watch_window) + x.watch='window'; + $(this).tinydot(x); }); - }); diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.min.js b/src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.min.js index 32c5799f..74754629 100644 --- a/src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.min.js +++ b/src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.min.js @@ -1 +1 @@ -!function(t,n){t.fn.tinydot||(t.fn.tinydot=function(n){for(var e=t(this).children("a"),i=t(this).height();t(e).outerHeight()>i;)t(e).text(function(t,n){return n.replace(/\W*\s(\S)*$/,"...")})})}(jQuery),jQuery(document).ready(function(t){t(".dot-ellipsis").each(function(){var n=new Object;t(this).tinydot(n)})}); +!function(a,b){function c(b){var c=b.children();if(0==c.length){var d=a(b).html();return b.html(""),b.append(""),b.children("span").html(d)}return c[0]}function d(b){a(b.child).html(b.orgContent),e(b)}function e(b){for(var c=a(b).height();a(b.child).outerHeight()>c;)a(b.child).html(function(a,b){return b.replace(/\W*\s(\S)*$/,"...")})}a.fn.tinydot||(a.fn.tinydot=function(b){var f=this;f.child=c(f),f.orgContent=a(f.child).html(),e(f),f.watch=function(){return a(window).on("resize",function(){h&&clearInterval(h),h=setTimeout(function(){d(f)},100)}),f};var g=a.extend(!0,{},a.fn.tinydot.defaults,b),h=null;g.watch&&f.watch()},a.fn.tinydot.defaults={watch:!1})}(jQuery),jQuery(document).ready(function(a){a(".dot-ellipsis").each(function(){var b=a(this).hasClass("dot-resize-update"),c=new Object;b&&(c.watch="window"),a(this).tinydot(c)})}); diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 2110b889..f6941ca5 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -35,7 +35,7 @@ {% endif %} - {{ entry.title|striptags|raw }} + {{ entry.title|striptags|raw }}
-- cgit v1.2.3