diff --git a/Changelog.md b/Changelog.md index 88c4a9603..cfc751b00 100644 --- a/Changelog.md +++ b/Changelog.md @@ -18,7 +18,6 @@ * Fix live updating when renaming an aspect [#5049](https://github.com/diaspora/diaspora/pull/5049) * Use double quotes when embedding translations into Javascript [#5055](https://github.com/diaspora/diaspora/issues/5055) * Fix regression in mobile sign-in ([commit](https://github.com/diaspora/diaspora/commit/4a2836b108f8a9eb6f46ca58cfcb7b23f40bb076)) -* Fit pod name to page size on the sign in page [#5056](https://github.com/diaspora/diaspora/pull/5056) * Set mention notification as read when viewing post [#5006](https://github.com/diaspora/diaspora/pull/5006) * Set sharing notification as read when viewing profile [#5009](https://github.com/diaspora/diaspora/pull/5009) * Ensure a consistent border on text input elements [#5069](https://github.com/diaspora/diaspora/pull/5069) diff --git a/app/assets/javascripts/app/router.js b/app/assets/javascripts/app/router.js index 2062e68c3..d795f0e7d 100644 --- a/app/assets/javascripts/app/router.js +++ b/app/assets/javascripts/app/router.js @@ -1,6 +1,5 @@ app.Router = Backbone.Router.extend({ routes: { - "users/sign_in": "login", "help": "help", //new hotness @@ -32,10 +31,6 @@ app.Router = Backbone.Router.extend({ this.route(/^bookmarklet(?:\?(.*))?/, "bookmarklet"); }, - login: function() { - $('#huge-text').flexime(1.05, {responsive:true}); - }, - help: function() { app.help = new app.views.Help(); $("#help").prepend(app.help.el); diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index d87cc97dc..389e824af 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -40,4 +40,3 @@ //= require bootstrap-dropdown //= require bootstrap-modal //= require osmlocator -//= require flexime diff --git a/lib/assets/javascripts/flexime.js b/lib/assets/javascripts/flexime.js deleted file mode 100644 index d6d8e4150..000000000 --- a/lib/assets/javascripts/flexime.js +++ /dev/null @@ -1,33 +0,0 @@ -/* - * - * flexime.js - * Flexible font-size for huge text (pod name) in login page. - * - */ - -jQuery.fn.flexime = function (refine, options) { - - var opt = $.extend({ - responsive: false - }, options); - - var $this = $(this); - var r = refine || 1; - var max_size = 200; // #huge-text default size - - var resize = function () { - var clone = $this.clone(); - clone.css({'font-size':'10px','display':'inline-block','visibility':'hidden'}).appendTo('body'); - var size = Math.floor(($this.width() / clone.width()) * 10 / r); - if (size < max_size) $this.css({'font-size':size+'px', 'line-height':Math.floor(size*.2)+'px'}); - - clone.remove(); - }; - - resize(); - - if (opt.responsive) - $(window).on('resize', resize); - - return this; -}