From c327c3046db03fd1c08eec3314ad70b006482923 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Sun, 23 Sep 2012 15:39:58 +0200 Subject: [PATCH] try a flex-box layout --- Gemfile.lock | 2 +- .../app/templates/layouts/home.hbs | 18 +- .../app/templates/layouts/profile.hbs | 52 +- .../app/templates/layouts/simple.hbs | 6 +- .../javascripts/app/templates/layouts/top.hbs | 4 +- .../{right => application}/github.sass | 0 assets/stylesheets/layout.sass | 66 +- assets/stylesheets/left.sass | 5 +- assets/stylesheets/left/list.sass | 4 +- assets/stylesheets/main/repository.sass | 4 +- assets/stylesheets/maximize.sass | 23 + assets/stylesheets/right.sass | 18 + assets/stylesheets/right/slider.sass | 44 - assets/stylesheets/top.sass | 6 - public/flex.html | 807 +++++++++++ public/javascripts/application.js | 2 +- public/layout.html | 65 +- public/stylesheets/application.css | 1249 ++++++++--------- 18 files changed, 1506 insertions(+), 869 deletions(-) rename assets/stylesheets/{right => application}/github.sass (100%) create mode 100644 assets/stylesheets/maximize.sass delete mode 100644 assets/stylesheets/right/slider.sass create mode 100644 public/flex.html diff --git a/Gemfile.lock b/Gemfile.lock index adecbb25..e9d6725b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,7 +35,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-api.git - revision: f05f841a46dbd9601e57676f8c4a356b21234cf2 + revision: e8d2604ec3e466856f64f20c42b03829d7cff996 specs: travis-api (0.0.1) backports (~> 2.5) diff --git a/assets/javascripts/app/templates/layouts/home.hbs b/assets/javascripts/app/templates/layouts/home.hbs index 3e141ac8..8e1dc46b 100644 --- a/assets/javascripts/app/templates/layouts/home.hbs +++ b/assets/javascripts/app/templates/layouts/home.hbs @@ -2,14 +2,16 @@ {{outlet top}} -
- {{outlet left}} -
+
+
+ {{outlet left}} +
-
- {{outlet main}} -
+
+ {{outlet main}} +
- diff --git a/assets/javascripts/app/templates/layouts/profile.hbs b/assets/javascripts/app/templates/layouts/profile.hbs index dc277f95..72205db7 100644 --- a/assets/javascripts/app/templates/layouts/profile.hbs +++ b/assets/javascripts/app/templates/layouts/profile.hbs @@ -2,32 +2,34 @@ {{outlet top}}
-
- {{outlet left}} -
- -
- {{outlet main}} -
- -