Permalink
Browse files

Cleaned up more and began rudimentary implemenation of mailing, but m…

…emory serves me badly so that's quite wrong.
  • Loading branch information...
1 parent 6199104 commit bf31e5250454acbdbedc924f6f2c6aa79eb56116 @chadoh committed Apr 9, 2010
Showing with 76 additions and 75 deletions.
  1. +1 −1 TODO
  2. +7 −6 TODO~
  3. +8 −2 controls.rb
  4. +16 −2 controls.rb~
  5. +18 −32 views/styles.sass
  6. +26 −32 views/styles.sass~
View
@@ -9,7 +9,7 @@ Later
http://code.google.com/apis/blogger/
(can this pull profile information, too?)
- Clearn up styles.sass, remove duplication
+ Clear up styles.sass, remove duplication
FORK into chadoh
View
@@ -1,15 +1,16 @@
-6 April
- Get it looking like blogger
- Get it on GitHub
+make contact form functional
-7 April
- Link to blogger profile for blog page
+Look into Heroku
+
+Link to blogger profile for blog page
Later
Use blogger data api to reproduce blogger content natively
http://code.google.com/apis/blogger/
(can this pull profile information, too?)
-
+
+ Clear up styles.sass, remove duplication
+
FORK into chadoh
Embed Gwave for blog
View
@@ -2,6 +2,7 @@
require 'sinatra'
require 'haml'
require 'sass'
+#require 'pony'
set :sass, { :style => :compact }
@@ -32,6 +33,11 @@ def current_tab_if(route)
haml :not_found
end
-post "/contact/?" do
- #figure this out (need interwebs for that...)
+post "/contact" do
+ #Pony.mail {
+ # :to => "chad.ostrowski@gmail.com",
+ # :from => '"' + params[:name] + '" <' + params[:email] + '>',
+ # :subject => "Email submitted on Lisli.net",
+ # :message => params[:message]
+ #}
end
View
@@ -2,6 +2,7 @@ require 'rubygems'
require 'sinatra'
require 'haml'
require 'sass'
+#require 'pony'
set :sass, { :style => :compact }
@@ -12,7 +13,7 @@ end
helpers do
def current_tab_if(route)
- "current" if request.path_info == "/language_assistance"
+ "current" if request.path_info == route
end
end
@@ -24,6 +25,19 @@ get "/:page/?" do
begin
haml params[:page].to_sym
rescue Errno::ENOENT
- haml :home
+ haml :not_found
end
end
+
+not_found do
+ haml :not_found
+end
+
+post "/contact/?" do
+ #Pony.mail {
+ # :to => "chad.ostrowski@gmail.com",
+ # :from => '"' + params[:name] + '" <' + params[:email] + '>',
+ # :subject => "Email submitted on Lisli.net",
+ # :message => params[:message]
+ #}
+end
View
@@ -1,23 +1,9 @@
// modeling this after lisli.net
//variables
-!grey = #555
-
!tab_radius = 5px
-!simple_border = 1px "solid" !grey
-
//mixins
-=simple_border
- border: !simple_border
-
-=fancy_fonts
- font:
- family: Georgia, Serif
- weight: normal
- style: normal
- color = !grey
-
=sans-heading-font
font: normal normal normal 78%/1.4em 'Trebuchet MS', Trebuchet, Arial, Verdana, sans-serif
text-transform: uppercase
@@ -86,6 +72,15 @@ iframe
margin: 0px auto
width: 660px
+h2
+ color: #999
+ +sans-heading-font
+ letter-spacing: 0.2em
+ margin: 1.5em 0px 0.75em
+a
+ text-decoration: none
+ color = #58A
+
div
display: block
@@ -128,6 +123,13 @@ p
width: 660px
h2
display: none
+ h1
+ display: block
+ +sans-heading-font
+ font-size: 1.5em
+ color: #666
+ margin: 0.67em 0px
+
#main
float: left
@@ -141,22 +143,6 @@ p
border: 1px solid #ddd
padding: 4px
-h2
- color: #999
- +sans-heading-font
- letter-spacing: 0.2em
- margin: 1.5em 0px 0.75em
-h1
- display: block
- +sans-heading-font
- font-size: 1.5em
- color: #777
- margin: 0.67em 0px
-
-a
- text-decoration: none
- color = #58A
-
.post-title
color: #c60
font-size: 140%
@@ -282,12 +268,12 @@ dt
/*
inputs
label
- background = !grey
+ background: #666
color: #fff
padding: 3px
input[type="text"], textarea
width: 300px
- border = 3px "solid" !grey
+ border: 3px solid #666
font-size: 18px
padding: 7px
display: block
View
@@ -1,23 +1,9 @@
// modeling this after lisli.net
//variables
-!grey = #555
-
!tab_radius = 5px
-!simple_border = 1px "solid" !grey
-
//mixins
-=simple_border
- border: !simple_border
-
-=fancy_fonts
- font:
- family: Georgia, Serif
- weight: normal
- style: normal
- color = !grey
-
=sans-heading-font
font: normal normal normal 78%/1.4em 'Trebuchet MS', Trebuchet, Arial, Verdana, sans-serif
text-transform: uppercase
@@ -86,6 +72,15 @@ iframe
margin: 0px auto
width: 660px
+h2
+ color: #999
+ +sans-heading-font
+ letter-spacing: 0.2em
+ margin: 1.5em 0px 0.75em
+a
+ text-decoration: none
+ color = #58A
+
div
display: block
@@ -100,12 +95,11 @@ div
margin: 5px 5px 0px
padding: 20px 20px 0.25em
text-transform: uppercase
-
-h1
- display: block
- font-size: 2em
- font-weight: bold
- margin: 0.67em 0px
+ h1
+ display: block
+ font-size: 2em
+ font-weight: bold
+ margin: 0.67em 0px
p
display: block
@@ -129,6 +123,13 @@ p
width: 660px
h2
display: none
+ h1
+ display: block
+ +sans-heading-font
+ font-size: 1.5em
+ color: #666
+ margin: 0.67em 0px
+
#main
float: left
@@ -142,12 +143,6 @@ p
border: 1px solid #ddd
padding: 4px
-h2
- color: #999
- +sans-heading-font
- letter-spacing: 0.2em
- margin: 1.5em 0px 0.75em
-
.post-title
color: #c60
font-size: 140%
@@ -258,13 +253,10 @@ dt
color: #000
text-decoration: underline
width: 216px
- margin-top:-1px
+ margin-top: -1px
/*
typography
- a
- text-decoration: none
- color = #58A
h2
padding: 0 0 10px 0
@@ -276,14 +268,16 @@ dt
/*
inputs
label
- background = !grey
+ background: #666
color: #fff
padding: 3px
input[type="text"], textarea
width: 300px
- border = 3px "solid" !grey
+ border: 3px solid #666
font-size: 18px
padding: 7px
display: block
+ font: large Georgia, serif
+ margin: 2px 0 37px
textarea
height: 150px

0 comments on commit bf31e52

Please sign in to comment.