Merge branch 'Rauks-master'

Merging Rauks improvements CSS fixes, mobiles fixes etc
blomman9 · May 18, 2014 · 6b545f2 · 6b545f2
2 parents e853683 + f61214a
commit 6b545f2
Show file tree

Hide file tree

Showing 60 changed files with 1,125 additions and 12,181 deletions.
diff --git a/README.md b/README.md
@@ -1,18 +1,21 @@
-munstrap
+Munstrap
 ========
 
 Alternative Munin 2.x templates based on Twitter Bootstrap 3
 
 
 Installation
 ------------
+
 ```
 cd /etc/munin
+
 git clone https://github.com/Rauks/munstrap.git
-mv templates templates.dist
-mv static static.dist
-ln -s munstrap/templates 
-ln -s  munstrap/static 
+mv -b munstrap/templates .
+mv -b munstrap/static .
+rm -rf munstrap
+
+cd /var/www/munin
 rm -rf /var/www/munin/*
 ```
 

diff --git a/static/apple-touch-icon-114x114.png b/static/apple-touch-icon-114x114.png
diff --git a/static/apple-touch-icon-120x120.png b/static/apple-touch-icon-120x120.png
diff --git a/static/apple-touch-icon-144x144.png b/static/apple-touch-icon-144x144.png
diff --git a/static/apple-touch-icon-152x152.png b/static/apple-touch-icon-152x152.png
diff --git a/static/apple-touch-icon-57x57.png b/static/apple-touch-icon-57x57.png
diff --git a/static/apple-touch-icon-72x72.png b/static/apple-touch-icon-72x72.png
diff --git a/static/apple-touch-icon-76x76.png b/static/apple-touch-icon-76x76.png
diff --git a/static/apple-touch-icon.png b/static/apple-touch-icon.png
diff --git a/static/bootstrap/BootstrapLicense.txt b/static/bootstrap/BootstrapLicense.txt