diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..45c1505 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +_site +.sass-cache +.jekyll-metadata diff --git a/js/card-generator.js b/js/card-generator.js index 6fa1fc3..a509a06 100644 --- a/js/card-generator.js +++ b/js/card-generator.js @@ -60,7 +60,7 @@ title = helpers.escapeHTML(title); from = helpers.escapeHTML(from); msg = helpers.escapeHTML(msg, true); img = helpers.escapeHTML(img); -colour = helpers.escapeHTML(colour); +colour = colour.replace(/[^#A-Za-z0-9\-_]/g, ''); // Get the image URL if (img) { @@ -93,8 +93,8 @@ if (imgurl) { // Set the text colour var morecss = ''; if (colour) { - morecss = ''; + morecss = ''; } var html = ` diff --git a/js/helpers.js b/js/helpers.js index 4ff6cdf..40e289e 100644 --- a/js/helpers.js +++ b/js/helpers.js @@ -136,5 +136,3 @@ helpers = { 'youtube-cinema': 2, }, }; - -// window.history.replaceState(null, document.title, '/js'); diff --git a/style.scss b/style.scss index 5208b56..3ea3eb3 100644 --- a/style.scss +++ b/style.scss @@ -228,28 +228,31 @@ a, button { .button, button, input[type=submit] { font-weight: 400 !important; font-size: 12px !important; - padding: 4px 4px !important; + padding: 5px 10px !important; text-decoration: none; background: $accent-colour; - border: 1px solid #000000; - border-radius: 5px; - color: #000000; + border: 1px solid rgba(0, 0, 0, 0.25); + border-radius: 10px; + color: black; display: inline-block; text-align: center; text-shadow: none; - box-shadow: 1px 1px 0 #000000; + box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3); + outline: none; &:hover { background: #FFFFFF; color: #111111; } + + &:active { + position: relative; + top: 1px; + left: 1px; + box-shadow: 0px 0px 0 #000000; + } } -.button:active, button:active, input[type=submit]:active { - position: relative; - top: 1px; - left: 1px; - box-shadow: 0px 0px 0 #000000; -} + input[type=checkbox] { background-color: #FFFFFF; }