diff --git a/files/wireframes/homepage03.png b/files/wireframes/homepage03.png new file mode 100644 index 00000000..8bffb861 Binary files /dev/null and b/files/wireframes/homepage03.png differ diff --git a/files/wireframes/homepage03x.png b/files/wireframes/homepage03x.png new file mode 100644 index 00000000..b230e573 Binary files /dev/null and b/files/wireframes/homepage03x.png differ diff --git a/views/about.slim b/views/about.slim index d391cd65..03fc47c3 100644 --- a/views/about.slim +++ b/views/about.slim @@ -18,12 +18,12 @@ p The technology has become affordable enough where we can provide this creative space without requiring a business plan that involves selling people out to the marketing industry. But it still costs money, especially since server demand is so high right now. And there are some possible surprise costs I haven't figured out yet (bandwidth estimates are difficult). But if NeoCities can get enough donations, NeoCities can survive! Together, we can prevent what happened to GeoCities from happening again. - p Our creativity is too important to be commercialized. Help keep this idea alive by donating! $100, $20, $5, a free round of beers at your pub, speaking invites to conferences so I can spread the word, free server hosting, anything helps. Thank you! + p Our creativity is too important to be commercialized. Help keep this idea alive by donating! $100, $20, $5, a free round of beers at your pub, speaking invites (I put on a pretty good show) so I can spread the word, free server hosting, anything helps. Thank you! .row .span12 h2.text-center Where your Money Goes - + .row .span8.offset2 h4 $150 provides hosting for 2 million NeoCities sites for 1 month. @@ -33,9 +33,13 @@ .row .span12.text-center h2 How to Donate - + div - h3 Bitcoin: preferred + h3 Gittip: + script data-gittip-username="kyledrake" src="https://www.gittip.com/assets/widgets/0002.js" + + div + h3 Bitcoin: h4: b 1MPYyfoWK8CkAzhLzLLtZGa9dwEGT5dm2T div style="margin-top: 30px" @@ -46,12 +50,8 @@ - - div - h3 Gittip: - iframe style="border: 0; margin: 0; padding: 0;" src="https://www.gittip.com/kyledrake/widget.html" width="48pt" height="22pt" - - h3 Sponsorships, alternative payments: + + h3 Sponsorships, press, speaking invites, general inquiries: h3: a href="mailto:kyledrake@gmail.com" Contact Me Directly - + h4 style="margin-top: 30px; margin-bottom: 30px" Thanks. You are great! Now go and make an awesome web site! diff --git a/views/layout.slim b/views/layout.slim index 65a34b3f..09908089 100644 --- a/views/layout.slim +++ b/views/layout.slim @@ -23,6 +23,7 @@ html a.brand href="/" NeoCities ul.nav li: a href="/browse" Browse + li: a href="/blog" Blog li: a href="/about" About ul.nav.pull-right diff --git a/views/site_files/text_editor.slim b/views/site_files/text_editor.slim index 457848f9..ca3c411f 100644 --- a/views/site_files/text_editor.slim +++ b/views/site_files/text_editor.slim @@ -65,7 +65,7 @@ css: div id="editorUpdates" class="alert alert-success hidden" span -script src="http://rawgithub.com/ajaxorg/ace-builds/master/src-noconflict/ace.js" type="text/javascript" charset="utf-8" +script src="/js/ace/ace.js" type="text/javascript" charset="utf-8" javascript: function setTheme(name) { diff --git a/views/templates/index.slim b/views/templates/index.slim index 97b7e721..7a8d2fc7 100644 --- a/views/templates/index.slim +++ b/views/templates/index.slim @@ -8,10 +8,10 @@ html meta name="description" content="" meta name="keywords" content="" - link href="http://groundfloor.neocities.org/default.css" rel="stylesheet" type="text/css" media="all" + link href="//groundfloor.neocities.org/default.css" rel="stylesheet" type="text/css" media="all" body @@ -25,7 +25,7 @@ html main p This is a new page! Coming soon. - p This page uses Ground Floor NC to style the page, click here to see some code examples. You can opt-out of this style and make your own design by removing the "default.css" link in the HTML. + p This page uses Ground Floor to style the page, click here to see some code examples. You can opt-out of this style and make your own design by removing the "default.css" link in the HTML. footer p Copyright 2013 \ No newline at end of file diff --git a/views/templates/not_found.slim b/views/templates/not_found.slim index 7a10b338..857a71ed 100644 --- a/views/templates/not_found.slim +++ b/views/templates/not_found.slim @@ -5,10 +5,10 @@ html title #{template_site_title @site.username} - Not Found - link href="http://groundfloor.neocities.org/default.css" rel="stylesheet" type="text/css" media="all" + link href="//groundfloor.neocities.org/default.css" rel="stylesheet" type="text/css" media="all" body