Merge https://github.com/DavisDevelopment/pman

Author: jbw716

.gitignore

@@ -7,7 +7,7 @@ src/borner
 dist/scripts/content*.js
 dist/scripts/background*.js
 dist/scripts/worker*.js
-dist/scripts/all-libs*.js
+#dist/scripts/all-libs*.js
 dist/scripts/server*.js
 dist/scripts/lib/*.js
 dist/styles/theme.css

dist/pages/index.html

@@ -24,8 +24,8 @@
 
 	<!-- Foundation StyleSheets -->
 	<link href="../styles/foundation.min.css" rel="stylesheet" type="text/css"/>
-	<link href="../styles/foundation-flex.min.css" rel="stylesheet" type="text/css"/>
-	<link href="../styles/foundation-icons.css" rel="stylesheet" type="text/css"/>
+	<!--<link href="../styles/foundation-flex.min.css" rel="stylesheet" type="text/css"/>-->
+	<!--<link href="../styles/foundation-icons.css" rel="stylesheet" type="text/css"/>-->
 
 	<!-- JQueryUI StyleSheets -->
 	<link href="../styles/jquery-ui.min.css" rel="stylesheet" type="text/css" />

dist/pages/preferences.html

@@ -0,0 +1,24 @@
+
+<div class="row">
+    <div class="row">
+        <h3>PMan Preferences</h3>
+    </div>
+    <div class="row form">
+        <div class="columns small-4">
+                <label class="middle">AutoPlay &nbsp;&nbsp;&nbsp;<input id="autoPlay" type="checkbox"/></label>
+                </br>
+                <label class="middle">AutoRestore &nbsp;&nbsp;&nbsp;<input id="autoRestore" type="checkbox"/></label>
+                </br>
+                <label class="middle">Direct Rendering &nbsp;&nbsp;&nbsp;<input id="directRender" type="checkbox"/></label>
+                </br>
+                <label class="middle">Show Album Art &nbsp;&nbsp;&nbsp;<input id="showAlbumArt" type="checkbox"/></label>
+                </br>
+                <label class="middle">Show Snapshot &nbsp;&nbsp;&nbsp;<input id="showSnapshot" type="checkbox"/></label>
+                </br>
+        </div>
+        <div class="columns small-8">
+
+        </div>
+    </div>
+</div>
+

dist/scripts/all-libs.js

@@ -73,3 +73,7 @@
     padding: 20px;
     overflow: scroll;
 }
+
+.prefeditor {
+    background-color: white;
+}