summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorArun Persaud <arun@nubati.net>2012-12-09 11:17:44 -0800
committerArun Persaud <arun@nubati.net>2012-12-09 11:17:44 -0800
commit9d2ee5fd928dc253e34ca6a0e0be92b1fa041240 (patch)
tree6ee5eb7f6f29b5a7cceb14ba9ac4ee2aea026211 /js
parent293b20963f2bbf0cfca1a146506d65d615b01c2c (diff)
downloade-DoKo-9d2ee5fd928dc253e34ca6a0e0be92b1fa041240.tar.gz
e-DoKo-9d2ee5fd928dc253e34ca6a0e0be92b1fa041240.tar.bz2
e-DoKo-9d2ee5fd928dc253e34ca6a0e0be92b1fa041240.zip
bootstrap: fixed login/register, footer, and navbar
* made navbar smaller, added icons, icons only (for smaller screen) * fixed login screen
Diffstat (limited to 'js')
-rw-r--r--js/game.js5
-rw-r--r--js/layout.js27
2 files changed, 25 insertions, 7 deletions
diff --git a/js/game.js b/js/game.js
index d1d8405..b0f5f5f 100644
--- a/js/game.js
+++ b/js/game.js
@@ -88,11 +88,6 @@ $(document).ready(
$(".gameshidesession").hide();
});
- $("ul.loginregister").click(function () {
- $(".dologin").slideToggle();
- $(".doregister").slideToggle();
- });
-
$(".message div div").parent().click ( function() { $(this).hide(); });
});
diff --git a/js/layout.js b/js/layout.js
index b98db8e..e0fb512 100644
--- a/js/layout.js
+++ b/js/layout.js
@@ -1,3 +1,26 @@
-$(".navbar .nav").addClass("pull-right");
$("table").addClass("table table-striped");
-$("ul.tricks").wrap('<div class="pagination">'); \ No newline at end of file
+$("ul.tricks").wrap('<div class="pagination">');
+
+$(".navigation").addClass("navbar-inner");
+$(".navbar-inner").wrap('<div class="navbar navbar-fixed-top">');
+$(".navbar .nav").addClass("pull-right");
+$(".navbar p").addClass("navbar-text");
+
+
+// enable tabs on login page
+$('a[data-toggle="tab"]').on('shown', function (e) {
+ e.target // activated tab
+ e.relatedTarget // previous tab
+})
+
+$('div.login').addClass("row-fluid");
+$('div.login ul').addClass("offset3 span6");
+$('div.login .tab-content').addClass("offset3 span6");
+
+$('.login input.submitbutton').addClass('btn btn-primary');
+$('.login input[type="submit"]').addClass('btn');
+
+$(".doregister div").addClass('control-group');
+$(".doregister label").wrap('<div class="control-label">');
+$(".doregister input").wrap('<div class="controls">');
+$(".doregister select").wrap('<div class="controls">');