suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use separate classes for display and display-inline

Browse Source
This commit is contained in:
Sven Fuchs 2012-09-24 14:06:04 +02:00
parent a79b2e5183
commit f3da6b8d5c
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/javascripts/app/views/repo/list.coffee
View File

@ -44,7 +44,7 @@
classOwned: (-> classOwned: (->
classes = [] classes = []
classes.push('active') if @get('tab') == 'owned' classes.push('active') if @get('tab') == 'owned'
classes.push('display') if Travis.app.get('currentUser') classes.push('display-inline') if Travis.app.get('currentUser')
classes.join(' ') classes.join(' ')
).property('tab', 'Travis.app.currentUser') ).property('tab', 'Travis.app.currentUser')

8
assets/javascripts/app/views/repo/show.coffee
View File

@ -49,12 +49,12 @@
tab = @get('tab') tab = @get('tab')
classes = [] classes = []
classes.push('active') if tab == 'build' classes.push('active') if tab == 'build'
classes.push('display') if tab == 'build' || tab == 'job' classes.push('display-inline') if tab == 'build' || tab == 'job'
classes.join(' ') classes.join(' ')
).property('tab') ).property('tab')
classJob: (-> classJob: (->
'active display' if @get('tab') == 'job' 'active display-inline' if @get('tab') == 'job'
).property('tab') ).property('tab')
urlRepository: (-> urlRepository: (->
@ -90,8 +90,8 @@
tabBinding: 'controller.tab' tabBinding: 'controller.tab'
toggle: -> toggle: ->
element = $('#tools .pane').toggleClass('display') element = $('#tools .pane').toggleClass('display-inline')
@set('active', element.hasClass('display')) @set('active', element.hasClass('display-inline'))
branches: (-> branches: (->
@get('repository.branches') if @get('active') @get('repository.branches') if @get('active')

3
assets/stylesheets/application/misc.sass
View File

@ -3,6 +3,9 @@
.display .display
display: block !important display: block !important
.display-inline
display: inline-block !important
.emoji .emoji
vertical-align: middle vertical-align: middle
width: 20px width: 20px

2
assets/stylesheets/tabs.sass
View File

@ -53,8 +53,6 @@
#tab_build, #tab_build,
#tab_job #tab_job
display: none display: none
&.display
display: inline-block !important
#profile #profile
#main #main

2
public/javascripts/application.js
View File

File diff suppressed because one or more lines are too long

12
public/stylesheets/application.css
View File

@ -1565,6 +1565,11 @@ span.loading {
} }
/* line 6, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application/misc.sass */ /* line 6, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application/misc.sass */
.display-inline {
display: inline-block !important;
}
/* line 9, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/application/misc.sass */
.emoji { .emoji {
vertical-align: middle; vertical-align: middle;
width: 20px; width: 20px;
@ -6329,13 +6334,8 @@ table.list .red .number a {
#main #tab_job { #main #tab_job {
display: none; display: none;
} }
/* line 56, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/tabs.sass */
#main #tab_build.display,
#main #tab_job.display {
display: inline-block !important;
}
/* line 61, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/tabs.sass */ /* line 59, /Users/sven/Development/projects/travis/travis-ember/assets/stylesheets/tabs.sass */
#profile #main .tab { #profile #main .tab {
margin: 30px 0 0 12px; margin: 30px 0 0 12px;
} }