Skip to content
Browse files

Style

  • Loading branch information...
1 parent fd53659 commit 6accade142a3dd7d93676d2ccf4bc9e3dffc11e4 myfreeweb committed Feb 20, 2011
Showing with 28 additions and 21 deletions.
  1. +1 −0 Gemfile
  2. +3 −0 Gemfile.lock
  3. +2 −1 views/head.haml
  4. +6 −5 views/header.haml
  5. +15 −14 views/pages.haml
  6. +1 −1 views/settings.haml
View
1 Gemfile
@@ -1,6 +1,7 @@
source :rubygems
gem 'sinatra'
gem 'haml'
+gem 'compass'
gem 'dropbox'
gem 'sequel'
gem 'rack-flash'
View
3 Gemfile.lock
@@ -3,6 +3,8 @@ GEM
specs:
RedCloth (4.2.7)
columnize (0.3.2)
+ compass (0.10.6)
+ haml (>= 3.0.4)
dropbox (1.2.3)
json (>= 1.2.0)
mechanize (>= 1.0.0)
@@ -40,6 +42,7 @@ PLATFORMS
DEPENDENCIES
RedCloth
+ compass
dropbox
haml
pg
View
3 views/head.haml
@@ -1 +1,2 @@
-%meta{:charset => "utf-8"}/
+%meta{:charset => "utf-8"}
+%link{:rel => "stylesheet", :media => "screen", :href => "/screen.css"}
View
11 views/header.haml
@@ -1,10 +1,11 @@
%header
- %h1 Wikibox
+ %h1
+ %a{:href => "/"} Wikibox
%nav
%strong= @user.email
%a{:href => "/settings"} settings
%a{:href => "/logout"} log out
-= if flash[:error]
- %div.error= flash[:error]
-= if flash[:info]
- %div.info= flash[:info]
+- if flash[:error]
+ %div.flash.error= flash[:error]
+- if flash[:info]
+ %div.flash.info= flash[:info]
View
29 views/pages.haml
@@ -3,18 +3,19 @@
%head
%title Wikibox
= haml :head
- %body
+ %body.page
= haml :header
- %nav
- %ul
- = for page in @pages
- %li
- %a{:href => "/pages/#{page}"}= page
- %article
- %header
- %h1= @cur_page[:name]
- %a{:href => "/pages/#{@cur_page[:name]}/delete"} delete
- = wikify(@cur_page)
- %form{:method => "post", :action => ""}
- %textarea{:name => "text"}= @cur_page[:text]
- %button{:type => "submit"} Save
+ #wrapper
+ %nav
+ %ul
+ - for page in @pages
+ %li
+ %a{:href => "/pages/#{page}", :class => ("active" if page == @cur_page[:name])}= page
+ %article
+ %header
+ %h1= @cur_page[:name]
+ %a{:href => "/pages/#{@cur_page[:name]}/delete"} delete
+ = wikify(@cur_page)
+ %form{:method => "post", :action => ""}
+ %textarea{:name => "text"}= @cur_page[:text]
+ %button{:type => "submit"} Save
View
2 views/settings.haml
@@ -3,7 +3,7 @@
%head
%title Settings / Wikibox
= haml :head
- %body
+ %body.settings
= haml :header
%h1 Settings
%form{:method => "post", :action => ""}

0 comments on commit 6accade

Please sign in to comment.
Something went wrong with that request. Please try again.