From 2bf04c5945cab9b7a450db43f4a978c647a059d4 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Sat, 22 Sep 2012 20:57:02 +0200 Subject: [PATCH] go back to the faux columns based layout --- .../javascripts/app/templates/builds/show.hbs | 14 +- .../app/templates/layouts/home.hbs | 22 +- .../app/templates/layouts/profile.hbs | 52 +- .../javascripts/app/templates/repos/list.hbs | 10 +- assets/stylesheets/layout.sass | 136 +----- assets/stylesheets/left.sass | 3 +- assets/stylesheets/left/list.sass | 25 +- assets/stylesheets/main/list.sass | 5 +- public/javascripts/application.js | 2 +- public/layout.html | 71 ++- public/stylesheets/application.css | 462 ++++++++++++------ 11 files changed, 459 insertions(+), 343 deletions(-) diff --git a/assets/javascripts/app/templates/builds/show.hbs b/assets/javascripts/app/templates/builds/show.hbs index 420a38dc..9b7c5fb6 100644 --- a/assets/javascripts/app/templates/builds/show.hbs +++ b/assets/javascripts/app/templates/builds/show.hbs @@ -41,14 +41,14 @@
{{formatConfig build.config}}
{{/unless}} - - {{#if build.isMatrix}} - {{view Travis.JobsView jobsBinding="build.requiredJobs" required="true"}} - {{view Travis.JobsView jobsBinding="build.allowedFailureJobs"}} - {{else}} - {{view Travis.LogView contextBinding="build.jobs.firstObject"}} - {{/if}} + + {{#if build.isMatrix}} + {{view Travis.JobsView jobsBinding="build.requiredJobs" required="true"}} + {{view Travis.JobsView jobsBinding="build.allowedFailureJobs"}} + {{else}} + {{view Travis.LogView contextBinding="build.jobs.firstObject"}} + {{/if}} {{else}}
Loading diff --git a/assets/javascripts/app/templates/layouts/home.hbs b/assets/javascripts/app/templates/layouts/home.hbs index 8e1dc46b..3e141ac8 100644 --- a/assets/javascripts/app/templates/layouts/home.hbs +++ b/assets/javascripts/app/templates/layouts/home.hbs @@ -2,16 +2,14 @@ {{outlet top}}
-
-
- {{outlet left}} -
- -
- {{outlet main}} -
- - +
+ {{outlet left}} +
+ +
+ {{outlet main}} +
+ + diff --git a/assets/javascripts/app/templates/layouts/profile.hbs b/assets/javascripts/app/templates/layouts/profile.hbs index b9aadd91..a6358705 100644 --- a/assets/javascripts/app/templates/layouts/profile.hbs +++ b/assets/javascripts/app/templates/layouts/profile.hbs @@ -2,34 +2,32 @@ {{outlet top}}
-
-
- {{outlet left}} +
+ {{outlet left}} +
+ +
+ {{outlet main}} +
+ +