From 9fc759e4f25540f0a30a133220010c1a2481b290 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 23 Feb 2014 21:23:20 -0500 Subject: [PATCH] The extension now has its own dedicated page and embeds core.html. --- Makefile | 1 + common.css | 11 +++++++++++ core.css | 2 +- extension.css | 29 +++++++++++++++++++++++++++++ extension.html | 11 +++++++++++ hosted.css | 8 -------- manifest.json | 2 +- 7 files changed, 54 insertions(+), 10 deletions(-) create mode 100644 extension.css create mode 100644 extension.html diff --git a/Makefile b/Makefile index 5d95f46..f78ddb9 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ ZIP_FILES=manifest.json \ + extension.html \ core.html \ core.css \ core.js \ diff --git a/common.css b/common.css index 6e2557f..911f31d 100644 --- a/common.css +++ b/common.css @@ -28,3 +28,14 @@ body { font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: .8em; } + +iframe { + border: none; + padding: 0; + overflow: hidden; + + width: 37em; + display: block; + margin-left: auto; + margin-right: auto; +} diff --git a/core.css b/core.css index ebf84bd..443aebb 100644 --- a/core.css +++ b/core.css @@ -80,7 +80,7 @@ hr { clear: both; } -@media screen and (max-width: 800px) { +@media screen and (max-width: 450px) { body { margin: 0; padding: 0; diff --git a/extension.css b/extension.css new file mode 100644 index 0000000..896e0dd --- /dev/null +++ b/extension.css @@ -0,0 +1,29 @@ +/* Copyright (c) 2014 Robert Sesek + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +body { + width: 36em; + padding: .2em; +} + +iframe { + height: 14.5em; +} diff --git a/extension.html b/extension.html new file mode 100644 index 0000000..19dc7c3 --- /dev/null +++ b/extension.html @@ -0,0 +1,11 @@ + + + + Skeleton Key Chrome Extension + + + + + + + diff --git a/hosted.css b/hosted.css index a66ee9e..26c0fd3 100644 --- a/hosted.css +++ b/hosted.css @@ -30,16 +30,8 @@ p { } iframe { - border: none; - padding: 0; - overflow: hidden; margin: 3em 0; - width: 37em; - display: block; - margin-left: auto; - margin-right: auto; - background-color: #FFF; border-color: #CCC; border-style: solid; diff --git a/manifest.json b/manifest.json index a423cb5..3b49f77 100644 --- a/manifest.json +++ b/manifest.json @@ -18,7 +18,7 @@ "browser_action": { "default_title": "Skeleton Key", - "default_popup": "core.html", + "default_popup": "extension.html", "default_icon": "icon19.png" } } -- 2.43.5