Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mguth/susanne-theisen
base: e4756d37c0
...
head fork: mguth/susanne-theisen
compare: f1884a17ff
  • 2 commits
  • 33 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jun 30, 2011
@mguth again. 31799b6
Commits on Jan 09, 2012
@mguth Updating to Middleman 2 f1884a1
Showing with 191 additions and 40 deletions.
  1. +5 −1 .rvmrc
  2. +2 −6 Gemfile
  3. +94 −7 Gemfile.lock
  4. +33 −0 README.md
  5. +1 −1  build/index.html
  6. +55 −19 config.rb
  7. +0 −5 config.ru
  8. 0  {public → source}/images/backgrounds/1.jpg
  9. 0  {public → source}/images/backgrounds/3.jpg
  10. 0  {public → source}/images/backgrounds/5.jpg
  11. 0  {public → source}/images/backgrounds/box-background.png
  12. 0  {public → source}/images/backgrounds/portrait-l.jpg
  13. 0  {public → source}/images/backgrounds/portrait-m.jpg
  14. 0  {public → source}/images/backgrounds/portrait-s.jpg
  15. 0  {public → source}/images/backgrounds/portrait-xl.jpg
  16. 0  {public → source}/images/backgrounds/portrait-xs.jpg
  17. +1 −1  {views → source}/index.html.haml
  18. 0  {public → source}/javascripts/PIE.htc
  19. 0  {public → source}/javascripts/css3-mediaqueries.js
  20. 0  {public → source}/javascripts/html5.js
  21. 0  {public → source}/javascripts/jquery.min.js
  22. 0  {views → source}/layout.haml
  23. 0  {views → source}/partials/_footer.html.haml
  24. 0  {views → source}/partials/_header.html.haml
  25. 0  {views → source}/partials/_javascripts.html.haml
  26. 0  {views → source}/stylesheets/ie.sass
  27. 0  {views → source}/stylesheets/partials/_constants.sass
  28. 0  {views → source}/stylesheets/partials/_forms.sass
  29. 0  {views → source}/stylesheets/partials/_layout.sass
  30. 0  {views → source}/stylesheets/partials/_mixins.sass
  31. 0  {views → source}/stylesheets/partials/_typography.sass
  32. 0  {views → source}/stylesheets/print.sass
  33. 0  {views → source}/stylesheets/site.css.sass
View
6 .rvmrc
@@ -1 +1,5 @@
-rvm 1.9.2@middleman
+rvm ruby-1.9.2@susanne-theisen --create
+if ! command -v bundle ; then
+ gem install bundler
+fi
+bundle | grep -v 'Using' | grep -v 'complete' | sed '/^$/d'
View
8 Gemfile
@@ -1,7 +1,3 @@
-source :rubygems
+source "http://rubygems.org"
-# HAML as template engine
-gem 'haml', '~> 3.1.1'
-
-# SASS for stylesheet creation
-gem 'compass', '~> 0.11.3'
+gem "middleman", "~>2.0.13"
View
101 Gemfile.lock
@@ -1,18 +1,105 @@
GEM
remote: http://rubygems.org/
specs:
- chunky_png (1.2.0)
- compass (0.11.3)
+ activesupport (3.1.3)
+ multi_json (~> 1.0)
+ addressable (2.2.6)
+ chunky_png (1.2.5)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.2.0)
+ compass (0.11.7)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
- fssm (0.2.7)
- haml (3.1.1)
- sass (3.1.2)
+ daemons (1.1.5)
+ em-websocket (0.3.6)
+ addressable (>= 2.1.1)
+ eventmachine (>= 0.12.9)
+ eventmachine (0.12.10)
+ execjs (1.2.13)
+ multi_json (~> 1.0)
+ fssm (0.2.8.1)
+ guard (0.6.3)
+ thor (~> 0.14.6)
+ guard-livereload (0.3.1)
+ em-websocket (>= 0.2.0)
+ guard (>= 0.4.0)
+ multi_json (~> 1.0.3)
+ haml (3.1.4)
+ hike (1.2.1)
+ http_router (0.10.2)
+ rack (>= 1.0.0)
+ url_mount (~> 0.2.1)
+ i18n (0.6.0)
+ maruku (0.6.0)
+ syntax (>= 1.0.0)
+ middleman (2.0.13.1)
+ coffee-script (~> 2.2.0)
+ compass (~> 0.11.3)
+ execjs (~> 1.2.7)
+ guard (~> 0.6.2)
+ haml (~> 3.1.0)
+ maruku (~> 0.6.0)
+ middleman-livereload (~> 0.2.0)
+ padrino-core (~> 0.10.5)
+ padrino-helpers (~> 0.10.5)
+ rack (~> 1.3.5)
+ rack-test (~> 0.6.1)
+ sass (~> 3.1.7)
+ sinatra (~> 1.3.1)
+ slim (~> 1.0.2)
+ sprockets (~> 2.0.3)
+ thin (~> 1.2.11)
+ thor (~> 0.14.0)
+ tilt (~> 1.3.1)
+ uglifier (~> 1.0.0)
+ middleman-livereload (0.2.1)
+ guard-livereload (~> 0.3.1)
+ multi_json (1.0.4)
+ padrino-core (0.10.5)
+ activesupport (~> 3.1.0)
+ http_router (~> 0.10.2)
+ sinatra (~> 1.3.1)
+ thor (~> 0.14.3)
+ tilt (~> 1.3.0)
+ padrino-helpers (0.10.5)
+ i18n (~> 0.6)
+ padrino-core (= 0.10.5)
+ rack (1.3.6)
+ rack-protection (1.2.0)
+ rack
+ rack-test (0.6.1)
+ rack (>= 1.0)
+ sass (3.1.12)
+ sinatra (1.3.2)
+ rack (~> 1.3, >= 1.3.6)
+ rack-protection (~> 1.2)
+ tilt (~> 1.3, >= 1.3.3)
+ slim (1.0.4)
+ temple (~> 0.3.4)
+ tilt (~> 1.3.2)
+ sprockets (2.0.3)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ syntax (1.0.0)
+ temple (0.3.5)
+ thin (1.2.11)
+ daemons (>= 1.0.9)
+ eventmachine (>= 0.12.6)
+ rack (>= 1.0.0)
+ thor (0.14.6)
+ tilt (1.3.3)
+ uglifier (1.0.4)
+ execjs (>= 0.3.0)
+ multi_json (>= 1.0.2)
+ url_mount (0.2.1)
+ rack
PLATFORMS
ruby
DEPENDENCIES
- compass (~> 0.11.3)
- haml (~> 3.1.1)
+ middleman (~> 2.0.13)
View
33 README.md
@@ -0,0 +1,33 @@
+Susanne Theisen
+==========================
+
+In this repository you’ll find the Middleman project for susanne-theisen.de. The files consist of Haml for markup, Sass for styling and JavaScript for interaction.
+
+Install
+-------
+
+If you have RVM installed, installation should be automatic the first time you change into this project directory (using `cd`). If this does not work you can setup the project manually with **4 Steps**:
+
+ rvm 1.9.2
+ rvm gemset create susanne-theisen
+ gem install bundler
+ bundle install
+
+Running
+-------
+
+### Building static pages
+
+You can build the site into a `build`-directory:
+
+ middleman build
+
+The `build` directory will contain the generated HTML, CSS and JavaScript and the contents can be uploaded to any standard web server.
+
+### With the built-in server
+
+To run:
+
+ middleman server
+
+You will see the generated HTML & CSS by navigating to <http://localhost:4567/>.
View
2  build/index.html
@@ -72,7 +72,7 @@
<a href='http://running-up-that-hill-lll.blogspot.com/' target='_blank' title='Besuchen Sie meinen Fotoblog'>→ Running Up That Hill</a>
</li>
<li>
- <a href='http://sutheisen.posterous.com/' target='_blank'>→ sublog (mit Arbeitsproben)</a>
+ <a href='http://sutheisen.posterous.com/' target='_blank'>→ suBlog (mit Arbeitsproben)</a>
</li>
</ul>
<ul class='meta'>
View
74 config.rb
@@ -1,25 +1,63 @@
+###
+# Compass
+###
+
+# Susy grids in Compass
+# First: gem install compass-susy-plugin
+# require 'susy'
+
+# Change Compass configuration
+# compass_config do |config|
+# config.output_style = :compact
+# end
+
+###
+# Haml
+###
+
# CodeRay syntax highlighting in Haml
-# activate :code_ray
+# First: gem install haml-coderay
+# require 'haml-coderay'
-# Automatic sitemaps (gem install middleman-slickmap)
-# require "middleman-slickmap"
-# activate :slickmap
+# CoffeeScript filters in Haml
+# First: gem install coffee-filter
+# require 'coffee-filter'
-# Automatic image dimension calculations
+# Automatic image dimensions on image_tag helper
# activate :automatic_image_sizes
-# Per-page layout changes
+###
+# Page command
+###
+
+# Per-page layout changes:
+#
# With no layout
# page "/path/to/file.html", :layout => false
+#
# With alternative layout
# page "/path/to/file.html", :layout => :otherlayout
+#
+# A path which all have the same layout
+# with_layout :admin do
+# page "/admin/*"
+# end
+
+# Proxy (fake) files
+# page "/this-page-has-no-template.html", :proxy => "/template-file.html" do
+# @which_fake_page = "Rendering a fake page with a variable"
+# end
+###
# Helpers
-helpers do
- def some_helper(*args)
- "Helping"
- end
-end
+###
+
+# Methods defined in the helpers block are available in templates
+# helpers do
+# def some_helper
+# "Helping"
+# end
+# end
# Change the CSS directory
# set :css_dir, "alternative_css_directory"
@@ -34,23 +72,21 @@ def some_helper(*args)
configure :build do
# For example, change the Compass output style for deployment
# activate :minify_css
-
+
# Minify Javascript on build
# activate :minify_javascript
-
+
# Enable cache buster
# activate :cache_buster
-
+
# Use relative URLs
# activate :relative_assets
-
- # Compress PNGs after build (gem install middleman-smusher)
+
+ # Compress PNGs after build
+ # First: gem install middleman-smusher
# require "middleman-smusher"
# activate :smusher
- # Generate ugly/obfuscated HTML from Haml
- # activate :ugly_haml
-
# Or use a different image path
# set :http_path, "/Content/images/"
end
View
5 config.ru
@@ -1,5 +0,0 @@
-require 'rubygems'
-require 'middleman'
-require 'compass'
-
-run Middleman::Server
View
0  public/images/backgrounds/1.jpg → source/images/backgrounds/1.jpg
File renamed without changes
View
0  public/images/backgrounds/3.jpg → source/images/backgrounds/3.jpg
File renamed without changes
View
0  public/images/backgrounds/5.jpg → source/images/backgrounds/5.jpg
File renamed without changes
View
0  public/images/backgrounds/box-background.png → source/images/backgrounds/box-background.png
File renamed without changes
View
0  public/images/backgrounds/portrait-l.jpg → source/images/backgrounds/portrait-l.jpg
File renamed without changes
View
0  public/images/backgrounds/portrait-m.jpg → source/images/backgrounds/portrait-m.jpg
File renamed without changes
View
0  public/images/backgrounds/portrait-s.jpg → source/images/backgrounds/portrait-s.jpg
File renamed without changes
View
0  public/images/backgrounds/portrait-xl.jpg → source/images/backgrounds/portrait-xl.jpg
File renamed without changes
View
0  public/images/backgrounds/portrait-xs.jpg → source/images/backgrounds/portrait-xs.jpg
File renamed without changes
View
2  views/index.html.haml → source/index.html.haml
@@ -87,7 +87,7 @@
%li
%a(href="http://running-up-that-hill-lll.blogspot.com/" title="Besuchen Sie meinen Fotoblog" target="_blank")→ Running Up That Hill
%li
- %a(href="http://sutheisen.posterous.com/" target="_blank")→ sublog (mit Arbeitsproben)
+ %a(href="http://sutheisen.posterous.com/" target="_blank")→ suBlog (mit Arbeitsproben)
%ul.meta
%li
View
0  public/javascripts/PIE.htc → source/javascripts/PIE.htc
File renamed without changes
View
0  public/javascripts/css3-mediaqueries.js → source/javascripts/css3-mediaqueries.js
File renamed without changes
View
0  public/javascripts/html5.js → source/javascripts/html5.js
File renamed without changes
View
0  public/javascripts/jquery.min.js → source/javascripts/jquery.min.js
File renamed without changes
View
0  views/layout.haml → source/layout.haml
File renamed without changes
View
0  views/partials/_footer.html.haml → source/partials/_footer.html.haml
File renamed without changes
View
0  views/partials/_header.html.haml → source/partials/_header.html.haml
File renamed without changes
View
0  views/partials/_javascripts.html.haml → source/partials/_javascripts.html.haml
File renamed without changes
View
0  views/stylesheets/ie.sass → source/stylesheets/ie.sass
File renamed without changes
View
0  views/stylesheets/partials/_constants.sass → source/stylesheets/partials/_constants.sass
File renamed without changes
View
0  views/stylesheets/partials/_forms.sass → source/stylesheets/partials/_forms.sass
File renamed without changes
View
0  views/stylesheets/partials/_layout.sass → source/stylesheets/partials/_layout.sass
File renamed without changes
View
0  views/stylesheets/partials/_mixins.sass → source/stylesheets/partials/_mixins.sass
File renamed without changes
View
0  views/stylesheets/partials/_typography.sass → source/stylesheets/partials/_typography.sass
File renamed without changes
View
0  views/stylesheets/print.sass → source/stylesheets/print.sass
File renamed without changes
View
0  views/stylesheets/site.css.sass → source/stylesheets/site.css.sass
File renamed without changes

No commit comments for this range

Something went wrong with that request. Please try again.