diff --git a/Appcast.xml b/Appcast.xml index e6612e69..69383c67 100755 --- a/Appcast.xml +++ b/Appcast.xml @@ -5,6 +5,14 @@ https://raw.githubusercontent.com/nate-parrott/flashlight/master/Appcast.xml Most recent changes with links to updates. en + + Version 1.0 + http://flashlightupdates.42pag.es/1.0 + Fri, 30 Mar 2015 20:27:11 +0000 + + 10.10 + + Version 0.98.2 http://flashlightupdates.42pag.es/0.98.2 diff --git a/flashlightplugins/index.html b/flashlightplugins/index.html index 6e68ab58..ab8e0f92 100644 --- a/flashlightplugins/index.html +++ b/flashlightplugins/index.html @@ -1,97 +1,97 @@ -{% extends "base.html" %} - -{% block head %} -{{ super() }} - -{% endblock %} - -{% block outside_content %} - -
-
- -

Add over 160 plugins to OS X's Spotlight search box. Check the weather, search the web, send an iMessage, find an emoji, and more.

-

For OS X Yosemite. Completely open-source. No crazy installer. Uninstall with one click.

-

- - - Download beta - -

-
-
- -{% endblock %} - -{% block body %} - -
- -
- - -

Flashlight extends OS X’s Spotlight in a great direction The Next Web

- - -

Spotlight on steroids CNET

- - -

a glimpse of what an extendable Spotlight for Yosemite could be Macstories

- - -
-
- -{% endblock %} - -{% block footer %} - + + diff --git a/flashlightplugins/index3.html b/flashlightplugins/index3.html deleted file mode 100644 index 6bdc05da..00000000 --- a/flashlightplugins/index3.html +++ /dev/null @@ -1,97 +0,0 @@ - - - - Flashlight — do anything with a keystroke - - - - - - - - - - - - - - - - -
-
-
- -
-
-
-

Flashlight: Control your Mac with a keystroke.

- - - - - - Spotlight Search| - - - -

Search the web, save a note, add a reminder, or do over 160 other things, just by typing into your Mac's Spotlight search box. Or write your own plugins. Requires OS X Yosemite.

-
-
-
- -
-
-
-

Flashlight is an open platform for Spotlight, which allows developers to write plugins that extend OS X's built-in search with new features. Here are some of our favorites:

- -

- Browse all -

-
-
-
- -
-
-
-
-
-
- -
-
- -
- -
- -
- -
- -
- - -
-
- -

By Nate Parrott and many others.

- -
-
-
- - diff --git a/flashlightplugins/main.py b/flashlightplugins/main.py index 28aa3a26..4b9daa4f 100755 --- a/flashlightplugins/main.py +++ b/flashlightplugins/main.py @@ -31,17 +31,13 @@ def send_upload_form(request, message=None): "message": message, "admin": users.is_current_user_admin()})) -class MainHandler(webapp2.RequestHandler): - def get(self): - self.response.write(template("index.html")) - -class MainHandler2(webapp2.RequestHandler): +class PreviewHandler(webapp2.RequestHandler): def get(self): self.response.write(template("index2.html")) -class MainHandler3(webapp2.RequestHandler): +class MainHandler(webapp2.RequestHandler): def get(self): - key = 'main.MainHandler3.rendered' + key = 'main.MainHandler.rendered' rendered = memcache.get(key) if not rendered: rendered = self.render() @@ -52,7 +48,7 @@ def render(self): args = { "featured_html": directory_html(category='Featured', browse=True) } - return template("index3.html", args) + return template("index.html", args) class UploadHandler(webapp2.RequestHandler): def get(self): @@ -264,8 +260,7 @@ def get(self): return Redir app = webapp2.WSGIApplication([('/', MainHandler), - ('/preview', MainHandler2), - ('/preview3', MainHandler3), + ('/preview', PreviewHandler), ('/browse', BrowseHandler), ('/plugin/(.+)/latest\.zip', PluginZipRedirectHandler), ('/plugin/(.+)', PluginPageHandler), diff --git a/flashlightplugins/static/base.css b/flashlightplugins/static/base.css index 9f7e132a..90d8589a 100644 --- a/flashlightplugins/static/base.css +++ b/flashlightplugins/static/base.css @@ -4,7 +4,7 @@ body { line-height: 1.25; color: white; font-family: "Helvetica Neue", "Helvetica", sans-serif; - background-color: #333334; + background-color: #06A6FF; margin: 0 !important; margin-bottom: 2em; padding: 0; diff --git a/flashlightplugins/static/index.css b/flashlightplugins/static/index.css index f900a571..7421a547 100644 --- a/flashlightplugins/static/index.css +++ b/flashlightplugins/static/index.css @@ -1,110 +1,168 @@ -/* index */ -#splash h2 { - font-size: 1.2em; - margin: auto; - width: 80%; - max-width: 800px; - font-weight: normal; - text-shadow: 0px 0px 5px black; +html, body { + margin: 0; + line-height: 1.5; + font-family: "HelveticaNeue", sans-serif; + height: 100%; } -body, html, #splash { - height: 100%; + +.screen { + width: 100%; + min-height: 100%; + display: table; +} +.screen > div { + display: table-cell; + vertical-align: middle; + text-align: center; + padding: 10px; +} + +.section > div { + text-align: center; + padding: 10px; +} +.section > div > div > p:first-child { + margin-top: 0; +} + +.section > div > div > p:last-child { + margin-bottom: 0; +} + +@media screen and (min-width: 700px) { + .screen > div, .section > div { + padding: 25px; + } +} + +.screen > div > div, .section > div > div { + width: 100%; + max-width: 800px; + display: inline-block; } -#splash { - display: table; - width: 100%; - background-image: url(/static/images/yosemite-small2.jpg); - background-size: cover; - background-position: center; - border-bottom: 2px solid gray; +#animation { + width: 100%; + max-width: 600px; } -#splash img.main { - max-width: 500px; + +#background-container { + z-index: -1; + position: absolute; width: 100%; - margin-top: 20px; + height: 100%; + left: 0; + top: 0; + overflow: hidden; } -h1 { - margin: 0; + +#background { + position: absolute; + top: 50%; + left: 50%; + width: 100vmax; + height: 100vmax; + margin-top: -50vmax; + margin-left: -50vmax; + background-color: #06A6FF; + color: white; } -#splash > div { - display: table-cell; - vertical-align: middle; - text-align: center; - padding: 10px; - padding-top: 40px; - padding-bottom: 40px; -} -@media screen and (max-width: 540px) { - #splash h2 { - font-size: 0.9em; - width: 100%; - } + +.splash-sprite { + position: absolute; + font-size: 17px !important; } -#images { - margin-top: 2em; +@media screen and (min-width: 700px) { + .splash-sprite { + font-size: 25px !important; + } } -#images img { - width: 385px; + +#main { + color: white; } -@media screen and (max-width: 768px) { - #images img { - width: 300px; - } + +a:link, a:visited { + color: inherit; +} + +#main h1 { + margin-top: 0; + margin-bottom: 0; + /*text-shadow: 2px 2px 0px rgba(0,0,0,0.4);*/ + line-height: 1.3; +} + +@media screen and (max-width: 500px) { + #main h1 { + font-size: 17px; + } } -#footer-links a { - display: inline-block; - text-decoration: none; - padding: 1em; -} -a:hover { - text-decoration: underline; -} -.small { - font-size: small; - opacity: 0.7; -} -#top { - position: absolute; - top: 16px; - left: 0; - width: 100%; -} -#whatif { - width: 90%; - max-width: 776px; -} -#download { - display: inline-block; - font-size: 1.0em; - text-decoration: none; - padding: 10px; - background-color: rgba(255,255,255,1); - color: black; - font-weight: 200; - letter-spacing: 2px; - text-transform: uppercase; - position: relative; -} -#download .fa { - display: none; -} -#download .beta { + +#actions { + margin-top: -1em; + margin-bottom: -4px; +} + +#actions a:link, #actions a:visited, .button { display: inline-block; + padding: 4px 10px; + color: #06A6FF; + font-weight: bold; + text-transform: uppercase; + background-color: rgba(255,255,255,0.6); + font-size: small; + text-decoration: none; } -#images { - margin-top: -3em; - text-align: center; + +.button, .button:link, .button:visited { + background-color: #06A6FF; + color: white; +} + +.button:hover { + opacity: 0.7; +} + +.button:active { + opacity: 0.4; +} + +#actions a:link, #actions a:visited { + margin-bottom: 4px; } -#images img { - margin-bottom: -1.5em; + +#actions:not(:hover) a#download, #actions a:hover { + background-color: white; +} + +#featured { + text-align: left; +} + +#featured #ideas { + display: none; +} + +/* social */ +#social { + display: table; + margin: auto; } -#images > p { - margin: 6px; - font-weight: 200; +#social > div { + padding: 0 10px; + display: table-cell; + text-align: center; + vertical-align: middle; +} +#social .fb-like { + position: relative; + top: -5px; } -cite:before { - content: "– "; +@media screen and (max-width: 500px) { + #social > div { + display: inline-block; + } } diff --git a/flashlightplugins/static/index3.css b/flashlightplugins/static/index3.css deleted file mode 100644 index 7421a547..00000000 --- a/flashlightplugins/static/index3.css +++ /dev/null @@ -1,168 +0,0 @@ -html, body { - margin: 0; - line-height: 1.5; - font-family: "HelveticaNeue", sans-serif; - height: 100%; -} - -.screen { - width: 100%; - min-height: 100%; - display: table; -} -.screen > div { - display: table-cell; - vertical-align: middle; - text-align: center; - padding: 10px; -} - -.section > div { - text-align: center; - padding: 10px; -} -.section > div > div > p:first-child { - margin-top: 0; -} - -.section > div > div > p:last-child { - margin-bottom: 0; -} - -@media screen and (min-width: 700px) { - .screen > div, .section > div { - padding: 25px; - } -} - -.screen > div > div, .section > div > div { - width: 100%; - max-width: 800px; - display: inline-block; -} - -#animation { - width: 100%; - max-width: 600px; -} - -#background-container { - z-index: -1; - position: absolute; - width: 100%; - height: 100%; - left: 0; - top: 0; - overflow: hidden; -} - -#background { - position: absolute; - top: 50%; - left: 50%; - width: 100vmax; - height: 100vmax; - margin-top: -50vmax; - margin-left: -50vmax; - background-color: #06A6FF; - color: white; -} - -.splash-sprite { - position: absolute; - font-size: 17px !important; -} - -@media screen and (min-width: 700px) { - .splash-sprite { - font-size: 25px !important; - } -} - -#main { - color: white; -} - -a:link, a:visited { - color: inherit; -} - -#main h1 { - margin-top: 0; - margin-bottom: 0; - /*text-shadow: 2px 2px 0px rgba(0,0,0,0.4);*/ - line-height: 1.3; -} - -@media screen and (max-width: 500px) { - #main h1 { - font-size: 17px; - } -} - -#actions { - margin-top: -1em; - margin-bottom: -4px; -} - -#actions a:link, #actions a:visited, .button { - display: inline-block; - padding: 4px 10px; - color: #06A6FF; - font-weight: bold; - text-transform: uppercase; - background-color: rgba(255,255,255,0.6); - font-size: small; - text-decoration: none; -} - -.button, .button:link, .button:visited { - background-color: #06A6FF; - color: white; -} - -.button:hover { - opacity: 0.7; -} - -.button:active { - opacity: 0.4; -} - -#actions a:link, #actions a:visited { - margin-bottom: 4px; -} - -#actions:not(:hover) a#download, #actions a:hover { - background-color: white; -} - -#featured { - text-align: left; -} - -#featured #ideas { - display: none; -} - -/* social */ -#social { - display: table; - margin: auto; -} -#social > div { - padding: 0 10px; - display: table-cell; - text-align: center; - vertical-align: middle; -} -#social .fb-like { - position: relative; - top: -5px; -} -@media screen and (max-width: 500px) { - #social > div { - display: inline-block; - } -} - diff --git a/flashlightplugins/static/plugin_page.css b/flashlightplugins/static/plugin_page.css index 424e48ac..f34c8b5f 100644 --- a/flashlightplugins/static/plugin_page.css +++ b/flashlightplugins/static/plugin_page.css @@ -1,3 +1,6 @@ +body { + background-color: #0086dF !important; +} #hint { font-weight: 200; font-size: 0.7em; @@ -45,7 +48,6 @@ h6 { text-transform: uppercase; letter-spacing: 2px; font-size: small; - color: #eee; vertical-align: bottom; position: relative; top: 2px; @@ -63,15 +65,16 @@ h6 { margin-top: 0; } #show-button { - background-color: #eee; - padding: 10px; + background-color: white; + padding: 10px 15px; display: inline-block; - color: #333; + color: #06A6FF; text-decoration: none; font-weight: bold; text-transform: uppercase; letter-spacing: 2px; font-size: small; + border-radius: 18px; } #reqs-flashlight { font-size: small; @@ -85,9 +88,6 @@ h6 { margin-right: 1em; text-align: center; } -#social { - color: #eee; -} #splash h2 { @@ -104,10 +104,7 @@ body, html, #splash { #splash { display: table; width: 100%; - background-image: url(/static/images/yosemite-small2.jpg); - background-size: cover; - background-position: center; - border-bottom: 2px solid gray; + border-bottom: 2px solid rgba(255,255,255,0.5); } h1 { margin: 0; @@ -119,6 +116,8 @@ h1 { padding: 10px; padding-top: 73px; padding-bottom: 73px; + background-color: #06A6FF; + color: white; } #top { position: absolute;