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

Merge branch 'master' into rkh-pusher

Browse Source 
Conflicts:
	public/javascripts/application.js
	public/stylesheets/application.css
This commit is contained in:
Konstantin Haase 2012-09-23 02:45:21 +02:00
commit 7ce79917dd
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/javascripts/app/templates/profile/tabs/hooks.hbs
View File

@ -17,7 +17,7 @@
<ul id="hooks">
{{#each hook in hooks}}
<li {{bindAttr class="active"}}>
<li {{bindAttr class="hook.active:active"}}>
<a {{bindAttr href="hook.urlGithub"}} rel="nofollow">{{hook.slug}}</a>
<p class="description">{{hook.description}}</p>

5
assets/stylesheets/profile/hooks.sass
View File

@ -33,6 +33,7 @@
.description
display: none
margin-left: 10px
line-height: 22px
font-size: $font-size-smaller
white-space: nowrap
overflow: hidden
@ -63,8 +64,8 @@
margin-left: 10px
background: inline-image('ui/off.png') no-repeat
cursor: pointer
&.active
background: inline-image('ui/on.png') no-repeat
&.active .switch
background: inline-image('ui/on.png') no-repeat
&:hover
> a

2
public/javascripts/application.js
View File

File diff suppressed because one or more lines are too long

17
public/stylesheets/application.css
View File

@ -4496,25 +4496,26 @@ pre#log .fold.open {
#hooks li .description {
display: none;
margin-left: 10px;
line-height: 22px;
font-size: 12px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #999999;
}
/* line 42, /Users/konstantin/Workspace/travis-ember/assets/stylesheets/profile/hooks.sass */
/* line 43, /Users/konstantin/Workspace/travis-ember/assets/stylesheets/profile/hooks.sass */
#hooks li .controls {
position: absolute;
top: 10px;
right: 0;
white-space: nowrap;
}
/* line 47, /Users/konstantin/Workspace/travis-ember/assets/stylesheets/profile/hooks.sass */
/* line 48, /Users/konstantin/Workspace/travis-ember/assets/stylesheets/profile/hooks.sass */
#hooks li .controls a {
float: left;
display: block;
}
/* line 51, /Users/konstantin/Workspace/travis-ember/assets/stylesheets/profile/hooks.sass */
/* line 52, /Users/konstantin/Workspace/travis-ember/assets/stylesheets/profile/hooks.sass */
#hooks li .github-admin {
position: relative;
height: 20px;
@ -4522,7 +4523,7 @@ pre#log .fold.open {
padding-right: 0;
background: url('data:image/png;base64,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') no-repeat 3px 4px;
}
/* line 60, /Users/konstantin/Workspace/travis-ember/assets/stylesheets/profile/hooks.sass */
/* line 61, /Users/konstantin/Workspace/travis-ember/assets/stylesheets/profile/hooks.sass */
#hooks li .switch {
height: 20px;
width: 80px;
@ -4530,15 +4531,15 @@ pre#log .fold.open {
background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAUCAYAAAAwaEt4AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sGEwoDBFgWWZEAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAEcUlEQVRYw81YTUvrTBR+ZjJp2lhjFaF+LESpXKQUxYW4UHBRUBF3gguX/in/hEtXIhQRRANWlIILFXTR+oWKpm1Kkpl38TIhkURvudd6D5TQfMyc88xznnNmSL1eF0dHR3AcB4ZhQAiBdowQEnk/OA4hBEIIOI6DSqWCRqOBVCrV9lzBcSmlkXO1a9J/QgharRbGxsZQLBZB9vb2RCaTgWEY8DwP32mUUiQSCZTLZVBKkU6n/yio7zDLssAYA3t5ecHIyMi3gwIAnHO0Wi3kcjlUq1UMDg7iXzNKKcrlMpiqqiCEgFIKIURsavztyRlj0HX9nwJFCAHGGLq7u8Gko50CRc4nwYnLe86578/HdJOaFbx+fBYM9mNccbEKIaAoClRVBZNOdjLX5ZxBAY1yUAZAKfUD4Zz71+D9YLoGFzoOgCCwQVMU5f9FC6ZRp0w6rChKLDCEELiui+vra5imidfXV2iahkKhgEKhgGQyCdd1cXJygvf39xDDVFXF7OwsTNOEbduhcT3Pw8LCApLJZCSTfDZTSmMd/C6TqxK1YsESenh4CNM00dPTg4mJCTw/P6NUKuHm5gbr6+totVq4urrC09OT32oQQpBIJAAAFxcXsG0buq77i+84DjzP8+eXDJTzhoChlIZe6ARb4mgu7f39HWdnZ+jt7cXm5qafIqVSCaZp4vz8HL9+/YKqqqCUYmNjA4lEwgcnmUxCVVUoioK1tTUYhhHSpDh9kuD4qdQp1ki6BhurKEbd3t6i0WigWCyCMQbOOYQQmJycRKVSQaVSQT6f94Or1Wo+U1KpFIaHhyGEAOcc9/f3aDab4JwjnU4jk8lECnUwxX8klTjn0DQN6XQ6llWO40AIgaGhIaRSKZ/RrutC13VYloV0Ou0L+Pb2ti/sk5OTGB8fB6UU9XodOzs74JzD8zzMz89jaWkpMkM452CMQdO0n6lKkhVR5VpWpO7ubhBC8Pr6itHR0RAwjUYD2Ww2xLzNzU1/vFQq5YOk6zpWVlZ8DZJ6E1cRpV8/UpUURYnVGCmIY2Nj0HUdBwcHGB8fh2EYcF0Xp6ensCwLi4uLvs9CCAwPD/vMkvelLg0MDKC/vz/0flyay1Rnn5XN79SYz5wkhCCTyWB6ehpHR0fY2tpCX18f6vU67u/vkcvlMDU1Bdd1Q0LqeV5k88Y5DwH2VWEIVaWfYkxcZaKUYnV1FV1dXTg+PkatVgMATE1NYXl5GYwxuK4LRVGgaVrkrlvTNP+dr6pgsH+ilILs7++LmZmZjmwipTWbTVSrVeTz+S+PF2QHbFkWEomED4L8SbbLChTcRshnv9uKyG8uLi5+po8JBvOVeZ4HQgi6urpC/+W3ckGj9lXtLnaQdazZbH6q0t8BjOd5fvf7JwdLv3to1i4wjUYDzLZtPDw8IJvNdgQYx3FweXmJfD7fsd18O6Dbto23tzcQ27bF7u4uent7I0/UPtv6f3acGaX2nufh8fERQ0NDMAzjr6xy3H6r3e9lz3R3d4e5uTn8B4YdbMcCfa97AAAAAElFTkSuQmCC') no-repeat;
cursor: pointer;
}
/* line 66, /Users/konstantin/Workspace/travis-ember/assets/stylesheets/profile/hooks.sass */
#hooks li .switch.active {
/* line 67, /Users/konstantin/Workspace/travis-ember/assets/stylesheets/profile/hooks.sass */
#hooks li.active .switch {
background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAAUCAIAAAC/CtwvAAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sGEwoEM6/qalkAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAFD0lEQVRYw71Xa4+dUxR+nrX2+75nzpw5bV1myrTaaolqiioZSlGtS1IiGpdIRAiCfyA+8EEI0YiEL+IagiC0aVqkbpXekGipuNUoU21ppy3nTM+c27v38uF0BnHOBD3tyv603/0+e69nrfXstfl7sfTI06ufW9F/wBIcGTOE4BLsu+Lc7usWnjRhXAd8gPD/A5JmLJVKkYv6+s7ivY+/+9jb1Xw+QxwpMwtDe++4vHrzFedUTX09JcRghwZKFanV/cDAgHv143TKrLM1NWMAeGQ8yg1/eencznLdmaUAD9kfAOaDj2OX1lOH5Ni4YzytDs+WHjV2bGxNwgAYCBgb8zSCZkZgZNpa8mMhqJfIZSgQaBvJEmGcOKdKEdKUHINXmFgIkYsiAQCkwRCGSUcLwYlYHNKyowQYKSZqviqQpmhB4ERSERG2ITx/qykB6CAEzQLJVsRaKnRMpLxz+ycv14q/WHbcpJnXZLpPNV9Kg68OfFGpHpgwbUGwYCLV37aV9n0zYfL5SMah6ZENMJAQEZi1NUoiIk5IM46FbRALfsd702TNI3cvnjq5d3D/78+/sWLdtm8y065OWLzq1N2d7sDyr1dXJl4qFub07J97yr6Vu4b2Y/wYURCKqloI7XWJpKMKBAhjpABR2X3bItx5w/17Sty4Ncya2vPEw6e9uWrNPSu/nzZ98u23LDlugutZvv7RjQXJjJvXN+v2hfPWLh0YLJo2S70AGCFCpZqyrS5pI1CCYHYwHZoMECfkh266su/X3/yVDxUfXOavf5KrPh9asvii83p31oLU6sHMX3PZnInlt+Ain9qoojQHbPAkDU7baQ1EEVEzgwHGpkcIhjOn57K5jqUry2V0eaaactmnrm7+xksm1WoeMG/4sZA8cOuc4R8/oro/ZbIFT2YmVFXRdhtJ15llR95oJOtN5SEYpvZ2Abpzz56e8bEAQEqtDBX9ib3H5bMUgQ/hxbWVB689864F7xT29gNnZLN2tKTKJukcQojqKiqiysMhD7nYZzMePqXETQUqGINlAJnI/qrrFUm9hVy6I+Om7PSZXFIkBXCfDXDL9uqt187/cOMmAJ2OuUSUoZlLQFyhNs5gbZcHITMqqs6petXwz+Gc/26QQFhyXs8vm1/YvnXDvi2rZuV+znbmP+j3mUhpwQATfWp9zTRz+YL5gIlaK0BVi+AEVCfttYOJ5xKJHBAEbEnYjoKs+6E6v2/2s13Jtz/9OvX42XNOP+mrXfVN/cjFCU28IRv5XQV9ZcPwLRd2ARabRirSDNMICp0kbU+8Rjm5SBkJII0+hy1aGHtmDQsH/MUzZ544Y0ZKt/Z7e2n9MBKRTL3scrk0VZV8HK3dxrkzhmf3Rq77mHgQ0qy/DoQXQExEDkstOYfIEcHQon8BALFAe/1TXb65lOuIa7VyscIoiiKxciVz32s1I4/KCX1qKktXmbd6HLvYNb9GA8WUB0Xc2nsvCUinURyLmHoEGfONA2YMSCpVEFFXZjTYiLMjPzoAiDo4wk6LHi/AK9Wg6sz7tvZ4AOEkrURqdVL/wyPskKgNgarZUK+QoEg7a0mkUqm57tqXwza508VAGO27/3T6sLyXpJrrfn/T1psnHes6j0Ljoj/kJyBgQ0OlYqHAvfsLj768brc/Gdl8QyHMwl96dTu4/J8A/31m9ItPFcO7pucHF80eHyVQ0kaKiiNE2r9QjtHFwVitVguF4gXz5/0BdY9rLIx0cN8AAAAASUVORK5CYII=') no-repeat;
}
/* line 70, /Users/konstantin/Workspace/travis-ember/assets/stylesheets/profile/hooks.sass */
/* line 71, /Users/konstantin/Workspace/travis-ember/assets/stylesheets/profile/hooks.sass */
#hooks li:hover > a {
color: #c7371a;
}
/* line 73, /Users/konstantin/Workspace/travis-ember/assets/stylesheets/profile/hooks.sass */
/* line 74, /Users/konstantin/Workspace/travis-ember/assets/stylesheets/profile/hooks.sass */
#hooks li:hover .description {
display: inline;
}