Permalink
Browse files

Merge pull request #5 from wpp/master

Help improving shoesrb website design
  • Loading branch information...
2 parents f5a46f4 + b2c48c7 commit 8b2462fc6322532cc52a348bf69259586a213eec @steveklabnik steveklabnik committed Jan 29, 2013
View
@@ -9,9 +9,12 @@ require "./template"
Shoes = Webmachine::Application.new do |app|
app.routes do
- add [], ShoesHomepage
+ add [], ShoesHomepage
+ add ["tutorials"], TutorialsPage
+ add ["about"], AboutPage
add ["blog"], BlogResource
add ["blog", :slug], BlogResource
+ add ["contribute"], ContributePage
add ['*'], StaticResource, :root => "public"
end
app.configure do |config|
View
@@ -58,6 +58,124 @@ img {
border: 0;
-ms-interpolation-mode: bicubic;
}
+.horse {
+ margin-bottom: 40px;
+}
+.platforms {
+ width: 100%;
+}
+.platform {
+ width: 100px;
+ height: 100px;
+}
+#lion{
+ background: url('/img/sprite.png') no-repeat -6px -59px;
+ width: 100px;
+ height: 100px;
+ margin: 40px;
+ display: inline-block;
+}
+#mountain_lion{
+ background: url('/img/sprite.png') no-repeat -6px -262px;
+ width: 100px;
+ height: 100px;
+ margin: 40px;
+ display: inline-block;
+}
+#windows{
+ background: url('/img/sprite.png') no-repeat 0 -369px;
+ width: 110px;
+ height: 99px;
+ margin: 40px;
+ display: inline-block;
+}
+#ubuntu{
+ background: url('/img/sprite.png') no-repeat -4px -161px;
+ width: 100px;
+ height: 100px;
+ margin: 40px;
+ display: inline-block;
+}
+#tutorials{
+ background: url('/img/sprite.png') no-repeat 0px -482px;
+ width: 45px;
+ height: 33px;
+ display: inline-block;
+ vertical-align: middle;
+ margin: 5px;
+}
+#blog{
+ background: url('/img/sprite.png') no-repeat -1px -524px;
+ width: 45px;
+ height: 35px;
+ display: inline-block;
+ vertical-align: middle;
+ margin: 5px;
+}
+#contribute{
+ background: url('/img/sprite.png') no-repeat -57px -515px;
+ width: 48px;
+ height: 44px;
+ display: inline-block;
+ vertical-align: middle;
+ margin: 5px;
+}
+#nobody{
+ position: absolute;
+ top: -50px;
+ right: -10px;
+
+ background: url('/img/sprite2.png') no-repeat -1px -52px;
+ width: 429px;
+ height: 178px;
+ display: inline-block;
+ vertical-align: middle;
+}
+#walk{
+ background: url('/img/sprite2.png') no-repeat -52px -4px;
+ width: 40px;
+ height: 42px;
+ display: inline-block;
+ vertical-align: middle;
+ margin: 2px;
+}
+#book{
+ background: url('/img/sprite2.png') no-repeat 0 0;
+ width: 44px;
+ height: 48px;
+ display: inline-block;
+ vertical-align: middle;
+ margin: 2px;
+}
+#manual{
+ background: url('/img/sprite2.png') no-repeat -163px -1px;
+ width: 62px;
+ height: 48px;
+ display: inline-block;
+ vertical-align: middle;
+ margin: 2px;
+}
+#rdocs{
+ background: url('/img/sprite2.png') no-repeat -95px 0;
+ width: 63px;
+ height: 49px;
+ display: inline-block;
+ vertical-align: middle;
+ margin: 2px;
+}
+.tut {
+ position: relative;
+}
+#team {
+ background: url('/img/team.jpg') no-repeat;
+ border: 5px solid #eee;
+ margin: 10px;
+}
+.headsupport {
+ position: absolute;
+ top: -40px;
+ right: 0px;
+}
button,
input,
select,
@@ -111,6 +229,11 @@ body {
line-height: 18px;
color: #333333;
background-color: #ffffff;
+ background: url('/img/background.jpg') no-repeat center center fixed;
+ -webkit-background-size: cover;
+ -moz-background-size: cover;
+ -o-background-size: cover;
+ background-size: cover;
}
a {
color: #0088cc;
@@ -121,9 +244,14 @@ a:hover {
text-decoration: underline;
}
.row {
+ padding: 20px;
+ background: #fff;
margin-left: -20px;
*zoom: 1;
}
+.center{
+ margin: 0 auto;
+}
.row:before, .row:after {
display: table;
content: "";
@@ -142,13 +270,14 @@ a:hover {
width: 140px;
}
.span3 {
- width: 220px;
+ width: 280px;
}
.span4 {
width: 300px;
}
.span5 {
width: 380px;
+ padding: 20px;
}
.span6 {
width: 460px;
@@ -309,6 +438,7 @@ h6 {
font-weight: bold;
color: #333333;
text-rendering: optimizelegibility;
+ display: inline-block;
}
h1 small,
h2 small,
@@ -3462,11 +3592,7 @@ a.thumbnail:hover {
}
.hero-unit {
padding: 60px;
- margin-bottom: 30px;
background-color: #f5f5f5;
- -webkit-border-radius: 6px;
- -moz-border-radius: 6px;
- border-radius: 6px;
}
.hero-unit h1 {
margin-bottom: 0;
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Deleted file not rendered
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -0,0 +1,5 @@
+class AboutPage < Webmachine::Resource
+ def to_html
+ Template.new(:about).render
+ end
+end
@@ -2,9 +2,9 @@
$posts = Dir["posts/*"].collect do |file|
Metadown.render(File.read(file))
-end.sort{|a,b| a.metadata["date"] <=> b.metadata["date"]}.reverse
+end.sort{|a,b| b.metadata["date"] <=> a.metadata["date"]}
-class BlogResource < Webmachine::Resource
+class BlogResource < Webmachine::Resource
def resource_exists?
return true unless request.path_info[:slug] #index
@@ -0,0 +1,5 @@
+class ContributePage < Webmachine::Resource
+ def to_html
+ Template.new(:contribute).render
+ end
+end
@@ -20,7 +20,7 @@ def last_modified
def serve_file
# Note this is probably not a good idea for big files.
# In the future, WM should be able to stream out IO objects.
- @pathname.read
+ @pathname.read
end
end
@@ -0,0 +1,5 @@
+class TutorialsPage < Webmachine::Resource
+ def to_html
+ Template.new(:tutorials).render
+ end
+end
View
@@ -0,0 +1,3 @@
+.row
+ %h1 About
+ %p Shoes is a GUI Toolkit originally developed by the legendery _why.
View
@@ -1,9 +1,10 @@
-%h1 The Shoes Blog
+.row
+ %h1 The Shoes Blog
-%p Welcome to the Shoes blog! Here's all the posts we have so far:
+ %p Welcome to the Shoes blog! Here's all the posts we have so far:
-- posts.each do |post|
- %h2 <a href="/blog/#{post.metadata['slug']}">#{post.metadata["title"]}</a>
- %h3= post.metadata["date"]
- %p= post.output
+ - posts.each do |post|
+ %h2 <a href="/blog/#{post.metadata['slug']}">#{post.metadata["title"]}</a>
+ %h3= post.metadata["date"]
+ %p= post.output
View
@@ -0,0 +1,31 @@
+.hero-unit
+ %h1 C
+ %img{:src => "/img/github.png"}
+ %h1 ntribute
+ %p ...and become a part of the Shoes Team!
+ %center
+ %img{:src => "/img/team.jpg", :id => "team"}
+
+.row{:class => "center"}
+ %img{:src => "/img/shoes-icon.png", :alt => "shoes logo", :style => "float:left;padding-left:20px;padding-right:20px;margin:20px;"}/
+
+ .span3
+ %h2 Shoes 4
+ %p Shoes 4 is a complete re-write of shoes.
+ %a{:href => "https://github.com/shoes/shoes4"} Shoes 4 on Github
+
+ .span3
+ %h2 Shoes
+ %p Original Shoes implementation.
+ %a{:href => "https://github.com/shoes/shoes"} Shoes on Github
+
+ .span3
+ %h2 shoesrb.com
+ %p Got some web skills? Help improving this website.
+ %a{:href => "https://github.com/shoes/shoesrb.com"} shoes.rb on Github
+
+ .span3
+ %h2 Brown Shoes
+ %p Another Ruby flavor of Shoes (it's brown).
+ %a{:href => "https://github.com/shoes/brown_shoes"} Brown Shoes on Github
+
View
@@ -1,39 +1,46 @@
.hero-unit
- %img{:src => "/img/shoes-icon.png", :alt => "shoes logo", :style => "float:left;padding-left:20px;padding-right:20px"}/
- %h1 Shoes!
- %p
- Ever wanted to build a GUI? Annoyed that it's so much effort? Shoes
- makes building for Mac, Windows, and Linux <em>super</em> simple.
- %p
- %a.btn.btn-primary.btn-large{:href => "/about"} Learn more »
-/ Example row of columns
+ .horse
+ %img{:src => "/img/shoes-icon.png", :alt => "shoes logo", :style => "float:left;padding-left:20px;padding-right:20px"}/
+ %h1 Shoes!
+ %p
+ Ever wanted to build a GUI? Annoyed that it's so much effort? Shoes
+ makes building for Mac, Windows, and Linux <em>super</em> simple.
+ %p
+ %a.btn.btn-primary.btn-large{:href => "/about"} Learn more »
+ .platforms
+ %img{:src => "/img/screen.jpg" }
+ #lion
+ #mountain_lion
+ #windows
+ #ubuntu
+ %p
+ GUI Awesomeness across all major platforms!
+ <em>Mac OS X</em>, <em>Linux</em> or <em>Windows</em>.
+ Shoes loves them all.
+
.row
- .span4
- %h2 About
- %p
- Basically, making desktop applications is really annoying. There's
- so many details to take care of, and you'd really rather just be
- building your application. Shoes handles doing all of the
- cross-platform stuff for you, and gives you native widgets on each
- platform.
- %p
- %a.btn{:href => "/about"} Read More »
- .span4
- %h2 Manual
- %p
- If you're already using Shoes, you'll probably need to look things
- up from time to time. There's a manual in Shoes already, but if
- you prefer to look things up on the web, we've also provided a
- manual for you as well.
- %p
- %a.btn{:href => "/manual/Hello.html"} Check it out »
- .span4
+ .span3
+ %h2 Tutorials
+ #tutorials
+ %p
+ New to Shoes? Great! There are tons of resources available to get
+ you started with Shoes.
+ %p
+ %a.btn{:href => "/tutorials", :class => "ikon"} Read More »
+ .span3
%h2 Blog
+ #blog
%p
- We're going to write from time to time about what's new in
- Shoes-land. It's not quite ready yet, but we'll be unveilling it
- in the near future. Keep up with the latest developments, see what
+ Keep up with the latest developments, see what
other people are building, and hear about new features as we build
them!
%p
- %a.btn{:href => "/blog"} Read the blog »
+ %a.btn{:href => "/blog"} Check it out »
+ .span3
+ %h2 Contribute
+ #contribute
+ %p
+ Want to contribute? Fantastic! The Shoes Team is always looking
+ for motivated contributers. Help us make Shoes even more better.
+ %p
+ %a.btn{:href => "/contribute"} Read the blog »
View
@@ -36,15 +36,13 @@
%li.active
%a{:href => "/"} Home
%li
- %a{:href => "/about"} About
- %li
- %a{:href => "/manual/Hello.html"} Manual
- %li
- %a{:href => "https://github.com/shoes/shoes"} Code
+ %a{:href => "/tutorials"} Tutorials
%li
%a{:href => "/blog"} Blog
%li
- %a{:href => "/team"} Team
+ %a{:href => "/contribute"} Contribute
+ %li
+ %a{:href => "/about"} About
/ /.nav-collapse
.container
= yield
Oops, something went wrong.

0 comments on commit 8b2462f

Please sign in to comment.