fix assets order
This commit is contained in:
parent
152dde6e05
commit
38ea058afc
|
@ -4,10 +4,10 @@ require 'rake-pipeline-web-filters'
|
|||
require 'rake-pipeline/travis'
|
||||
require 'compass'
|
||||
|
||||
roots ||= [Pathname.new(File.expand_path('.'))]
|
||||
ROOTS ||= [Pathname.new(File.expand_path('.'))]
|
||||
|
||||
paths = %w(styles scripts images static vendor).inject({}) do |paths, type|
|
||||
paths.merge(type.to_sym => roots.map { |root| root.join("assets/#{type}").to_s })
|
||||
paths.merge(type.to_sym => ROOTS.map { |root| root.join("assets/#{type}").to_s })
|
||||
end
|
||||
|
||||
Compass.configuration.images_path = paths[:images].first
|
||||
|
|
|
@ -60,7 +60,7 @@ GIT
|
|||
|
||||
GIT
|
||||
remote: git://github.com/travis-ci/travis-core.git
|
||||
revision: c40cee1a6d66d0cc18034e6e5e90c335349ead97
|
||||
revision: 9fccbb2ccf1ecfacf146e397eeac1c9c6e443e42
|
||||
branch: sf-travis-api
|
||||
specs:
|
||||
travis-core (0.0.1)
|
||||
|
|
|
@ -12,6 +12,10 @@
|
|||
</div>
|
||||
|
||||
<div id="right">
|
||||
<a id="github" href="https://github.com/travis-ci" title="Fork me on GitHub">
|
||||
{{t layouts.application.fork_me}}
|
||||
</a>
|
||||
|
||||
<div id="slider" {{action toggle target="Travis.app.slider"}}>
|
||||
<div class='icon'></div>
|
||||
</div>
|
||||
|
|
|
@ -6,10 +6,10 @@ require 'ext/ember/namespace'
|
|||
$("##{event.target.name}").toggleClass('display')
|
||||
|
||||
@Travis.reopen
|
||||
HomeView: Travis.View.extend(templateName: 'layouts/home')
|
||||
HomeView: Travis.View.extend(templateName: 'layouts/home')
|
||||
ProfileLayoutView: Travis.View.extend(templateName: 'layouts/profile')
|
||||
StatsLayoutView: Travis.View.extend(templateName: 'layouts/simple')
|
||||
ApplicationView: Travis.View.extend(templateName: 'application')
|
||||
ApplicationView: Travis.View.extend(templateName: 'application')
|
||||
|
||||
require 'views/accounts'
|
||||
require 'views/build'
|
||||
|
|
|
@ -18,6 +18,5 @@
|
|||
#top .profile
|
||||
margin-right: 140px
|
||||
|
||||
#profile #top .profile,
|
||||
.maximized #top .profile
|
||||
margin-right: 40px
|
||||
|
|
File diff suppressed because one or more lines are too long
2
public/scripts/app.min.js
vendored
2
public/scripts/app.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -4340,7 +4340,6 @@ pre#log .fold.open {
|
|||
}
|
||||
|
||||
/* line 21, /Users/sven/Development/projects/travis/travis-web/assets/styles/maximize.sass */
|
||||
#profile #top .profile,
|
||||
.maximized #top .profile {
|
||||
margin-right: 40px;
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
b424b81b
|
||||
56cfce1b
|
Loading…
Reference in New Issue
Block a user