Merge remote-tracking branch 'origin/detective'

Conflicts:
	static/partials/repo-admin.html
This commit is contained in:
jakedt 2014-04-14 16:15:32 -04:00
commit 52fdd60779
13 changed files with 759 additions and 131 deletions

View file

@ -3463,7 +3463,7 @@ pre.command:before {
position: relative;
height: 100px;
height: 75px;
opacity: 1;
}
@ -3614,10 +3614,10 @@ pre.command:before {
margin-right: 34px;
}
.trigger-option-section:not(:last-child) {
border-bottom: 1px solid #eee;
padding-bottom: 16px;
margin-bottom: 16px;
.trigger-option-section:not(:first-child) {
border-top: 1px solid #eee;
padding-top: 16px;
margin-top: 10px;
}
.trigger-option-section .entity-search-element .twitter-typeahead {