From 5d9475c88cc8ac1d921814e8f613549acb18bf08 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Thu, 4 Dec 2014 23:01:12 +0000 Subject: [PATCH] Switch out custom tabs for Bootstrap --- app/assets/js/plugins/jquery/tabs.js | 25 ----------------- app/assets/js/start.js | 4 +-- app/views/dashboard/settings.blade.php | 20 +++++++------- .../{all-54061ae6.css => all-a955efc4.css} | 9 ++++--- public/build/css/all.css | 9 ++++--- .../js/{all-86e91591.js => all-c84ab03b.js} | 27 ------------------- public/build/js/all.js | 27 ------------------- public/build/rev-manifest.json | 4 +-- 8 files changed, 26 insertions(+), 99 deletions(-) delete mode 100644 app/assets/js/plugins/jquery/tabs.js rename public/build/css/{all-54061ae6.css => all-a955efc4.css} (99%) rename public/build/js/{all-86e91591.js => all-c84ab03b.js} (99%) diff --git a/app/assets/js/plugins/jquery/tabs.js b/app/assets/js/plugins/jquery/tabs.js deleted file mode 100644 index 536d233d..00000000 --- a/app/assets/js/plugins/jquery/tabs.js +++ /dev/null @@ -1,25 +0,0 @@ -/** - * jQuery Tab Plugin - */ -$.fn.tabs = function(options) { - // Default Settings - var settings = $.extend({ - state: "active", - active: 1, - }, options ); - - // Ensure only one given tab is displaying - $(this).next().children().not("#tab-" + settings.active).css("display", "none"); - - // When an tab andchor is clicked - $(this).on("click", "a", function (event) { - event.preventDefault(); - - $(this).parent().addClass(settings.state); - $(this).parent().siblings().removeClass(settings.state); - - var tab = $(this).attr("href"); - $('.tab-content').children().not(tab).css("display", "none"); - $(tab).css("display", "block"); - }); -}; diff --git a/app/assets/js/start.js b/app/assets/js/start.js index d6ff7838..3bf2bea8 100644 --- a/app/assets/js/start.js +++ b/app/assets/js/start.js @@ -1,9 +1,7 @@ $(function() { - $('.tabs').tabs({active: 2}); - $('#sidebar-toggle').click(function() { $('.wrapper').toggleClass('active'); }); -}); \ No newline at end of file +}); diff --git a/app/views/dashboard/settings.blade.php b/app/views/dashboard/settings.blade.php index a661a372..60b6ae5a 100644 --- a/app/views/dashboard/settings.blade.php +++ b/app/views/dashboard/settings.blade.php @@ -7,15 +7,17 @@
- -
-
General App settings
-
Server settings
-
Mail setitngs, host, SMTP, user and password.
+
+ +
+
General App settings
+
Server settings
+
Mail setitngs, host, SMTP, user and password.
+
diff --git a/public/build/css/all-54061ae6.css b/public/build/css/all-a955efc4.css similarity index 99% rename from public/build/css/all-54061ae6.css rename to public/build/css/all-a955efc4.css index 11559766..ae04aeb5 100644 --- a/public/build/css/all-54061ae6.css +++ b/public/build/css/all-a955efc4.css @@ -37,14 +37,16 @@ body.dashboard .wrapper { body.dashboard .wrapper .content { -webkit-transition: margin 0.2s; transition: margin 0.2s; - margin-left: 250px; } } + margin-left: 250px; } + } body.dashboard .wrapper.active .sidebar { margin-left: 0; } @media (min-width: 550px) { body.dashboard .wrapper.active .content { -webkit-transition: margin 0.2s; transition: margin 0.2s; - margin-left: 250px; } } + margin-left: 250px; } + } body.dashboard .navbar { z-index: 999; @@ -74,7 +76,8 @@ body.dashboard .navbar { padding-right: 10px; } body.dashboard .navbar a.navbar-brand span:before { font-family: FontAwesome; - content: "\f060"; } } + content: "\f060"; } + } body.dashboard .navbar .nav li a { height: 68px; line-height: 35px; } diff --git a/public/build/css/all.css b/public/build/css/all.css index 11559766..ae04aeb5 100644 --- a/public/build/css/all.css +++ b/public/build/css/all.css @@ -37,14 +37,16 @@ body.dashboard .wrapper { body.dashboard .wrapper .content { -webkit-transition: margin 0.2s; transition: margin 0.2s; - margin-left: 250px; } } + margin-left: 250px; } + } body.dashboard .wrapper.active .sidebar { margin-left: 0; } @media (min-width: 550px) { body.dashboard .wrapper.active .content { -webkit-transition: margin 0.2s; transition: margin 0.2s; - margin-left: 250px; } } + margin-left: 250px; } + } body.dashboard .navbar { z-index: 999; @@ -74,7 +76,8 @@ body.dashboard .navbar { padding-right: 10px; } body.dashboard .navbar a.navbar-brand span:before { font-family: FontAwesome; - content: "\f060"; } } + content: "\f060"; } + } body.dashboard .navbar .nav li a { height: 68px; line-height: 35px; } diff --git a/public/build/js/all-86e91591.js b/public/build/js/all-c84ab03b.js similarity index 99% rename from public/build/js/all-86e91591.js rename to public/build/js/all-c84ab03b.js index 9cecfe86..18fea24c 100644 --- a/public/build/js/all-86e91591.js +++ b/public/build/js/all-c84ab03b.js @@ -51,35 +51,8 @@ k),c.scaleShowGridLines?(b.lineWidth=c.scaleGridLineWidth,b.strokeStyle=c.scaleG b.moveTo(g,p);b.lineTo(g,p-d*v(a.datasets[e].data[f],j,k)+c.barStrokeWidth/2);b.lineTo(g+s,p-d*v(a.datasets[e].data[f],j,k)+c.barStrokeWidth/2);b.lineTo(g+s,p);c.barShowStroke&&b.stroke();b.closePath();b.fill()}}},b)},D=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(a){window.setTimeout(a,1E3/60)},F={}}; $(function() { - $('.tabs').tabs({active: 2}); - $('#sidebar-toggle').click(function() { $('.wrapper').toggleClass('active'); }); }); -/** - * jQuery Tab Plugin - */ -$.fn.tabs = function(options) { - // Default Settings - var settings = $.extend({ - state: "active", - active: 1, - }, options ); - - // Ensure only one given tab is displaying - $(this).next().children().not("#tab-" + settings.active).css("display", "none"); - - // When an tab andchor is clicked - $(this).on("click", "a", function (event) { - event.preventDefault(); - - $(this).parent().addClass(settings.state); - $(this).parent().siblings().removeClass(settings.state); - - var tab = $(this).attr("href"); - $('.tab-content').children().not(tab).css("display", "none"); - $(tab).css("display", "block"); - }); -}; diff --git a/public/build/js/all.js b/public/build/js/all.js index 9cecfe86..18fea24c 100644 --- a/public/build/js/all.js +++ b/public/build/js/all.js @@ -51,35 +51,8 @@ k),c.scaleShowGridLines?(b.lineWidth=c.scaleGridLineWidth,b.strokeStyle=c.scaleG b.moveTo(g,p);b.lineTo(g,p-d*v(a.datasets[e].data[f],j,k)+c.barStrokeWidth/2);b.lineTo(g+s,p-d*v(a.datasets[e].data[f],j,k)+c.barStrokeWidth/2);b.lineTo(g+s,p);c.barShowStroke&&b.stroke();b.closePath();b.fill()}}},b)},D=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(a){window.setTimeout(a,1E3/60)},F={}}; $(function() { - $('.tabs').tabs({active: 2}); - $('#sidebar-toggle').click(function() { $('.wrapper').toggleClass('active'); }); }); -/** - * jQuery Tab Plugin - */ -$.fn.tabs = function(options) { - // Default Settings - var settings = $.extend({ - state: "active", - active: 1, - }, options ); - - // Ensure only one given tab is displaying - $(this).next().children().not("#tab-" + settings.active).css("display", "none"); - - // When an tab andchor is clicked - $(this).on("click", "a", function (event) { - event.preventDefault(); - - $(this).parent().addClass(settings.state); - $(this).parent().siblings().removeClass(settings.state); - - var tab = $(this).attr("href"); - $('.tab-content').children().not(tab).css("display", "none"); - $(tab).css("display", "block"); - }); -}; diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json index c3905ead..efdc8f9e 100644 --- a/public/build/rev-manifest.json +++ b/public/build/rev-manifest.json @@ -1,4 +1,4 @@ { - "css/all.css": "css/all-54061ae6.css", - "js/all.js": "js/all-86e91591.js" + "css/all.css": "css/all-a955efc4.css", + "js/all.js": "js/all-c84ab03b.js" } \ No newline at end of file