Skip to content

Commit

Permalink
Merge pull request #5132 from svbergerem/remove-unused-login-js
Browse files Browse the repository at this point in the history
Remove unused js code for login page
  • Loading branch information
jhass committed Aug 19, 2014
2 parents 8654e1b + 9e32eb3 commit 2b50001
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 40 deletions.
1 change: 0 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 0 additions & 5 deletions app/assets/javascripts/app/router.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
app.Router = Backbone.Router.extend({
routes: {
"users/sign_in": "login",
"help": "help",

//new hotness
Expand Down Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion app/assets/javascripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,3 @@
//= require bootstrap-dropdown
//= require bootstrap-modal
//= require osmlocator
//= require flexime
33 changes: 0 additions & 33 deletions lib/assets/javascripts/flexime.js

This file was deleted.

0 comments on commit 2b50001

Please sign in to comment.