fixes to boostrap, new icons, mobile view works

4 files changed, 39 insertions, 3 deletions

diff --git a/themes/default/img/freedombox-logo-250px.png b/themes/default/img/freedombox-logo-250px.png
new file mode 100644
index 0000000..b55d3c7
--- /dev/null
+++ b/themes/default/img/freedombox-logo-250px.png
diff --git a/themes/default/js/menu.js b/themes/default/js/menu.js
index eb6b5bb..8617d42 100644
--- a/themes/default/js/menu.js
+++ b/themes/default/js/menu.js
@@ -11,12 +11,16 @@ function main_menu(items) {
 	}
 
 	// Line break labels
-	label = i["label"];
+	/*label = i["label"];
 	if (label.search(" ") != -1) {
 	    label = label.replace(" ", "<br />");
 	} else {
 	    label = "&nbsp;<br />" + label;
-	}
+	}*/
+
+	// Add icon before labels
+	icon = '<i class="' + i["icon"] + ' icon-white nav-icon"></i>';
+	label = icon + i["label"];
 
 	output = output +'<li' + active + '><a href="' + i["url"] + '"' + active + '>' + label + "</a></li>";
     }
@@ -32,11 +36,20 @@ function render_items(items) {
 	// Handle active page
         if (i["active"]) {
 	    active = ' class="active"';
+
+	    // Add icon before labels
+	    icon = '<i class="' + i["icon"] + ' icon-white sidenav-icon"></i>';
+	    label = icon + i["label"];
         } else {
 	    active = '';
+
+	    // Add icon before labels
+	    icon = '<i class="' + i["icon"] + ' sidenav-icon"></i>';
+	    label = icon + i["label"];
 	}
 
-	output = output +'<li' + active + '><a href="' + i["url"] + '"' + active + '>' + i['label'] + "</a></li>";
+	output = output +'<li' + active + '><a href="' + i["url"] + '"' + active + '>' + label + "</a></li>";
+
 	if (i['subs']) {
 	    output += render_items(i['subs']);
 	}
diff --git a/themes/default/js/plugins.js b/themes/default/js/plugins.js
index b79bf73..07c4f2d 100644
--- a/themes/default/js/plugins.js
+++ b/themes/default/js/plugins.js
@@ -9,3 +9,26 @@ window.log = function f(){ log.history = log.history || []; log.history.push(arg
 

 // place any jQuery/helper plugins in here, instead of separate, slower script files.

 

+// remap jQuery to $

+(function($){})(window.jQuery);

+

+

+/* trigger when page is ready */

+$(document).ready(function (){

+

+	// your functions go here

+

+});

+

+

+/* optional triggers

+

+$(window).load(function() {

+	

+});

+

+$(window).resize(function() {

+	

+});

+

+*/

diff --git a/themes/default/screenshot.png b/themes/default/screenshot.png
index 42c9c52..5e4c621 100644
--- a/themes/default/screenshot.png
+++ b/themes/default/screenshot.png