Bootstrap and menu left padding updates

Greblys · Dec 24, 2012 · ff2c420 · ff2c420
1 parent cc02864
commit ff2c420
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ Modules/energygroup
 Modules/raspberrypi
 Modules/site
 Modules/command
+Modules/sap
diff --git a/Lib/bootstrap/css/bootstrap-responsive.min.css b/Lib/bootstrap/css/bootstrap-responsive.min.css
diff --git a/Lib/bootstrap/css/bootstrap.min.css b/Lib/bootstrap/css/bootstrap.min.css
diff --git a/Lib/bootstrap/img/glyphicons-halflings.png b/Lib/bootstrap/img/glyphicons-halflings.png
diff --git a/Lib/bootstrap/js/bootstrap.min.js b/Lib/bootstrap/js/bootstrap.min.js
diff --git a/Theme/basic/menu_view.php b/Theme/basic/menu_view.php
@@ -13,7 +13,14 @@
 
 ?>
 
-<ul class="nav">
+<style>
+#mainnav li:first-child a
+{
+  padding-left: 0px;
+}
+</style>
+
+<ul id="mainnav" class="nav" style="padding-left: 0px;">
 
 <?php 
 

diff --git a/Theme/basic/theme.php b/Theme/basic/theme.php
@@ -19,7 +19,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <!-- Thanks to Baptiste Gaultier for the emoncms dial icon http://bit.ly/zXgScz -->
     <link rel="shortcut icon" href="<?php echo $path; ?>Theme/basic/favicon.png" />
-    <link href="<?php print $GLOBALS['path']; ?>Lib/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="<?php print $GLOBALS['path']; ?>Lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link rel="stylesheet" type="text/css" href="<?php echo $path; ?>Theme/basic/style.css" />
 
     <!-- APPLE TWEAKS - thanks to Paul Dreed -->
@@ -36,7 +36,7 @@
      *------------------------------------------------------
      */
     ?>
-    <div class="navbar navbar-fixed-top">
+    <div class="navbar navbar-inverse navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
           <?php if (!isset($runmenu)) $runmenu = '';