diff --git a/app/controllers/repos.coffee b/app/controllers/repos.coffee index 7140daa6..42a7e613 100644 --- a/app/controllers/repos.coffee +++ b/app/controllers/repos.coffee @@ -65,9 +65,6 @@ Controller = Ember.ArrayController.extend @set('tab', tab) this["view_#{tab}".camelize()](params) - viewRecent: -> - @set('content', @get('recentRepos')) - viewOwned: -> @set('content', @get('userRepos')) diff --git a/app/routes/main.coffee b/app/routes/main.coffee index 44376f91..f639e34d 100644 --- a/app/routes/main.coffee +++ b/app/routes/main.coffee @@ -14,8 +14,7 @@ Route = TravisRoute.extend setupController: (controller)-> # TODO: this is redundant with repositories and recent routes - toActivate = if @signedIn() then 'owned' else 'recent' - @container.lookup('controller:repos').activate(toActivate) + @container.lookup('controller:repos').activate('owned') activate: -> # subscribe to pusher only if we're at a main route diff --git a/app/routes/main/index.coffee b/app/routes/main/index.coffee index 4ebea1c0..6e01861f 100644 --- a/app/routes/main/index.coffee +++ b/app/routes/main/index.coffee @@ -2,7 +2,9 @@ Route = TravisRoute.extend redirect: -> - target = if @signedIn() then 'repositories' else 'recent' - @transitionTo("main.#{target}") + if @signedIn() + @transitionTo('main.repositories') + else + @transitionTo('home') `export default Route` diff --git a/app/routes/main/recent.coffee b/app/routes/main/recent.coffee index 4c00c403..caf6d5b9 100644 --- a/app/routes/main/recent.coffee +++ b/app/routes/main/recent.coffee @@ -1,15 +1,7 @@ -`import TravisRoute from 'travis/routes/basic'` -`import MainTabRoute from 'travis/routes/main-tab'` +`import Ember from 'ember'` -Route = MainTabRoute.extend - reposTabName: 'recent' - - activate: -> - @_super.apply(this, arguments) - @store.set('isRecentTabOpen', true) - - deactivate: -> - @_super.apply(this, arguments) - @store.set('isRecentTabOpen', false) +Route = Ember.Route.extend + redirect: -> + @transitionTo('main') `export default Route` diff --git a/app/routes/simple-layout.coffee b/app/routes/simple-layout.coffee index 95540a86..c6f045cc 100644 --- a/app/routes/simple-layout.coffee +++ b/app/routes/simple-layout.coffee @@ -3,8 +3,7 @@ Route = TravisRoute.extend setupController: -> $('body').attr('id', 'simple') - toActivate = if @signedIn() then 'owned' else 'recent' - @container.lookup('controller:repos').activate(toActivate) + @container.lookup('controller:repos').activate('owned') @_super.apply(this, arguments) renderTemplate: -> diff --git a/app/styles/app/layout.sass b/app/styles/app/layout.sass index e75034fb..f63edbee 100644 --- a/app/styles/app/layout.sass +++ b/app/styles/app/layout.sass @@ -63,30 +63,35 @@ margin-left: -100% max-width: 325px - .wrapper-main + .wrapper-main.non-centered width: grid-calc(18, 24) float: left margin-left: grid-calc(6, 24) overflow: visible + .wrapper-main.centered + max-width: 1024px + margin-left: auto + margin-right: auto + @media #{$xlarge-up} #left width: grid-calc(7, 36) - .wrapper-main + .wrapper-main.non-centered width: grid-calc(29, 36) margin-left: grid-calc(7, 36) @media #{$xxlarge-up} #left width: grid-calc(6, 36) - .wrapper-main + .wrapper-main.non-centered width: grid-calc(30, 36) margin-left: grid-calc(6, 36) @media screen and (min-width: 2200px) #left width: grid-calc(5, 36) - .wrapper-main + .wrapper-main.non-centered width: grid-calc(31, 36) margin-left: grid-calc(5, 36) diff --git a/app/templates/layouts/home.hbs b/app/templates/layouts/home.hbs index c5d677d2..32485b27 100644 --- a/app/templates/layouts/home.hbs +++ b/app/templates/layouts/home.hbs @@ -6,7 +6,7 @@ {{render "flash"}} -