From 66e2c07a80dc06e66ff5264085654445d3d47dac Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Tue, 18 Sep 2012 09:15:42 +0200 Subject: [PATCH] extract _common mixin --- AssetFile | 1 + Gemfile.lock | 2 +- assets/javascripts/app/app.coffee | 8 +- assets/javascripts/lib/travis/auth.coffee | 21 ++-- assets/stylesheets/_common.sass | 2 + assets/stylesheets/application.sass | 16 +++ assets/stylesheets/left.sass | 2 +- assets/stylesheets/left/list.sass | 2 +- assets/stylesheets/main.sass | 2 + assets/stylesheets/main/list.sass | 2 +- assets/stylesheets/main/log.sass | 2 +- assets/stylesheets/main/repository.sass | 2 +- assets/stylesheets/main/summary.sass | 2 +- assets/stylesheets/main/tools.sass | 2 +- assets/stylesheets/profile.sass | 2 +- assets/stylesheets/profile/hooks.sass | 2 +- assets/stylesheets/right.sass | 2 +- assets/stylesheets/right/github.sass | 2 +- assets/stylesheets/right/lists.sass | 2 + assets/stylesheets/right/slider.sass | 2 + assets/stylesheets/right/sponsors.sass | 2 +- assets/stylesheets/stats.sass | 2 + assets/stylesheets/status.sass | 2 +- assets/stylesheets/tabs.sass | 2 +- assets/stylesheets/top.sass | 2 +- public/javascripts/application.js | 2 +- public/stylesheets/application.css | 137 +++++++++++++--------- 27 files changed, 142 insertions(+), 85 deletions(-) create mode 100644 assets/stylesheets/_common.sass diff --git a/AssetFile b/AssetFile index 5c2434d8..30c6763b 100644 --- a/AssetFile +++ b/AssetFile @@ -6,6 +6,7 @@ require 'rake-pipeline-web-filters' require 'compass' Compass.configuration.images_path = 'assets/images' +Compass.configuration.add_import_path File.expand_path('../assets/stylesheets', __FILE__) output 'public/javascripts' input 'assets/javascripts' do diff --git a/Gemfile.lock b/Gemfile.lock index b2b39a01..fafbc365 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,7 +22,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-api.git - revision: 957e9ee37896034237ad5e32abae9b432df9c228 + revision: 6606af4b43ef64d3ef97efeddda8524aff7c5281 branch: sf-use-services specs: travis-api (0.0.1) diff --git a/assets/javascripts/app/app.coffee b/assets/javascripts/app/app.coffee index c9f1d30a..171125ab 100644 --- a/assets/javascripts/app/app.coffee +++ b/assets/javascripts/app/app.coffee @@ -11,6 +11,7 @@ require 'views' require 'config/locales' require 'data/sponsors' +require 'travis/auth' # $.mockjaxSettings.log = false # Ember.LOG_BINDINGS = true @@ -37,9 +38,10 @@ Travis.reopen @setCurrentUser(JSON.parse($.cookie('user'))) signIn: -> - # Travis.Auth.signIn() - @setCurrentUser(@USER_PAYLOAD) - @render.apply(this, @get('returnTo') || ['home', 'index']) + user = Travis.Auth.signIn() + console.log(user) + # @setCurrentUser(@USER_PAYLOAD) + # @render.apply(this, @get('returnTo') || ['home', 'index']) signOut: -> @setCurrentUser() diff --git a/assets/javascripts/lib/travis/auth.coffee b/assets/javascripts/lib/travis/auth.coffee index 752d3bc9..0abcbc0c 100644 --- a/assets/javascripts/lib/travis/auth.coffee +++ b/assets/javascripts/lib/travis/auth.coffee @@ -1,10 +1,17 @@ -class @Travis.Auth - constructor: -> - @iframe = $('