Skip to content

Commit

Permalink
image and link changes
Browse files Browse the repository at this point in the history
cosmos and youtube iframe fix. still have to do breakpoints

Signed-off-by: Mark Poon <markpoon@me.com>
  • Loading branch information
markpoon committed Jul 19, 2013
1 parent a062e2c commit f647d4f
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 3 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions application.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[ "sinatra", "haml", "sass", "redcarpet", "pry", "mongoid", "coffee-script", "compass"].each { |gem| require gem}
["sinatra", "haml", "sass", "redcarpet", "pry", "mongoid", "coffee-script", "compass"].each { |gem| require gem}
enable :inline_templates
set :app_file, __FILE__
set :root, File.dirname(__FILE__)
Expand Down Expand Up @@ -87,7 +87,7 @@ def check(url)

not_found{ haml :'404'}
error{ @error = request.env['sinatra_error']; haml :'500'}
# Binding.pry
Binding.pry
__END__

@@layout
Expand Down
Binary file added static/images/bgnoise.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/images/thumb/cosmic.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/images/thumb/cosmos.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion static/stylesheets/screen.css

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions views/stylesheets/screen.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ html{
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eaeaea', endColorstr='#d3d3d3',GradientType=1 ); /* IE6-8 */
}
body{

@include blueprint-typography-body;
.row{
clear: both;
Expand Down Expand Up @@ -169,4 +170,21 @@ body{
margin-top: 20px;
margin-bottom: 20px;
}
}
.videoWrapper {
position: relative;
padding-bottom: 56.25%; /* 16:9 */
padding-top: 25px;
height: 0;
margin-top:20px;
margin-bottom: 20px;

}
.videoWrapper iframe {
@include shadow();
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}

0 comments on commit f647d4f

Please sign in to comment.