Merge Master and Fix a lot of shit

harnerdesigns · Mar 16, 2019 · 0d34602 · 0d34602
1 parent c7958ff
commit 0d34602
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ An extension for Google Firefox that provides the Color Codes for Google's Mater
 
 ## Install 
 
-<!-- ### [Download From The Google Chrome Store](https://chrome.google.com/webstore/detail/material-color-palette-cl/daejjicekmhkbpgahnhfmpmjhojhpane) -->
+# [MaterialColor.xyz](https://materialcolor.xyz)
 
 ### Install Locally
 
@@ -38,7 +38,7 @@ Harner Designs is a full service Web & Graphic Design studio. Providing Clean, R
 
 ## Like the App? Wanna Buy Us A Beer?
 
-If you like this Chrome Extension and would like to by us a beer, We'd be flattered.
+If you like this Extension and would like to by us a beer, We'd be flattered.
 
 | Paypal | Bitcoin | Litecoin |
 |------------------------------------------------------------------------------------------------------------------|------------------------------------|------------------------------------|

diff --git a/about.html b/about.html
@@ -3,7 +3,7 @@
 <html>
 
 <head>
-    <title>Color Picker Options</title>
+    <title>Material Color Palette > About</title>
     <meta charset="UTF-8">
     <script src="vendor/jquery.min.js"></script>
     <link rel="stylesheet" href="vendor/font-awesome.min.css" type="text/css" />
@@ -12,7 +12,7 @@
 
 <body>
     <header><a href="/popup.html"><h1><i class="fa fa-angle-left" aria-hidden="true"></i>
-Material Color Picker</h1></a>
+        Material Color Palette</h1></a>
         <span class="alert" id='headerAlert'></span>
         <nav>
             <ul>

diff --git a/manifest.json b/manifest.json
@@ -3,13 +3,11 @@
 
   "name": "Material Design Color Palette - Click to Copy",
   "description": "Click to copy Material Design color palette. Copy in #HEX HEX RGB( ) RGBA( ).",
-  // "options_page": "options.html",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "icons": { "16": "icon_16.png",
            "48": "icon_48.png",
           "128": "icon_128.png" },
   "short_name": "Material Design Color Palette",
-  // "offline_enabled": true,
 
   "browser_action": {"default_title": "Material Color Palette - Click to Copy",
     "default_icon": "icon.png",

diff --git a/options.html b/options.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-<head><title>Color Picker Options</title>
+<head><title>Material Color Palette > Options</title>
  <meta charset="UTF-8">
 
 <script src="vendor/jquery.min.js"></script>
@@ -11,8 +11,7 @@
 
 </head>
 <body>
-<header><a href="/popup.html"><h1><i class="fa fa-angle-left" aria-hidden="true"></i> 
-Material Color Picker</h1></a>
+<header><a href="/popup.html"><h1><i class="fa fa-angle-left" aria-hidden="true"></i> Material Color Palette</h1></a>
       <span class="alert" id='headerAlert'></span>
       <nav><ul>
         <li><a href="options.html"><i class="fa fa-cog fa-fw" aria-hidden="true"></i></a></li>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,4 +19,4 @@
   "devDependencies": {
     "jquery": "^3.2.1"
   }
-}
+}
diff --git a/popup.html b/popup.html
@@ -6,7 +6,7 @@
  --> 
 <html>
   <head>
-    <title>Material Color Picker</title>
+    <title>Material Color Palette</title>
 
  <meta charset="UTF-8">
     <!--
@@ -26,7 +26,7 @@
 
   <body class="pallete">
     <header><a href="/popup.html"><h1><i class="fa fa-angle-left" aria-hidden="true"></i> 
-Material Color Picker</h1></a>
+      Material Color Palette</h1></a>
       <span class="alert" id='headerAlert'></span>
       <select id="outputOptions" class="outputOptions">
         <option value="hashHex">#HEX</option>

diff --git a/scss/.sass-cache/174090b6755883b91e6c9606cf3ca7a95265fbdf/style.scssc b/scss/.sass-cache/174090b6755883b91e6c9606cf3ca7a95265fbdf/style.scssc
diff --git a/scss/.sass-cache/19e9d00d8a403abcb1e4c1ab2f7fe4f4ded85589/style.scssc b/scss/.sass-cache/19e9d00d8a403abcb1e4c1ab2f7fe4f4ded85589/style.scssc
diff --git a/scss/style.scss b/scss/style.scss
@@ -9,7 +9,7 @@ $maxWidth: $squareSize * $numberofColors;
     box-sizing: border-box;
 }
 
-html {
+html { 
 
     font-family: "Roboto", sans-serif;
 }
@@ -49,7 +49,7 @@ body {
 container {
     display: flex;
     align-items: center;
-    justify-conent: center;
+    justify-content: center;
     width: $maxWidth;
     max-width: 100vw;
     z-index: 8;
@@ -101,6 +101,14 @@ header {
             }
         }
     }
+
+    select{
+        padding: 0.25em;
+
+        option{
+            padding: 0.25em;
+        }
+    }
 }
 
 hr {

diff --git a/style.css b/style.css
diff --git a/style.css.map b/style.css.map
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,4 +19,4 @@ @@
       "devDependencies": {
         "jquery": "^3.2.1"
       }
-    }
+    }