Merge branch 'chazmuzz-master'

This commit is contained in:
Naoki Takezoe
2015-09-30 02:30:44 +09:00
2 changed files with 9 additions and 3 deletions

View File

@@ -36,7 +36,7 @@
</div> </div>
} else { } else {
<div class="box-content-bottom" style="padding: 0px;"> <div class="box-content-bottom" style="padding: 0px;">
@defining(20){ max => @defining(3){ max =>
@userRepositories.zipWithIndex.map { case (repository, i) => @userRepositories.zipWithIndex.map { case (repository, i) =>
<div class="box-content-row repo-link" style="@if(i > max - 1){display:none;}"> <div class="box-content-row repo-link" style="@if(i > max - 1){display:none;}">
@helper.html.repositoryicon(repository, false) @helper.html.repositoryicon(repository, false)
@@ -66,7 +66,7 @@
} else { } else {
<div class="box-content-bottom" style="padding: 0px;"> <div class="box-content-bottom" style="padding: 0px;">
@recentRepositories.map { repository => @recentRepositories.map { repository =>
<div class="box-content-row"> <div class="box-content-row repo-link">
@helper.html.repositoryicon(repository, false) @helper.html.repositoryicon(repository, false)
<a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a> <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
</div> </div>
@@ -80,7 +80,7 @@
<script> <script>
$(function(){ $(function(){
$('#show-more-repos').click(function(e){ $('#show-more-repos').click(function(e){
$('div.repo-link').show(); $(e.target).parents('div.box-content-bottom').find('div.repo-link').show();
$(e.target).parents('div.show-more').remove(); $(e.target).parents('div.show-more').remove();
}); });
}); });

View File

@@ -297,6 +297,12 @@ div.box-content-row {
padding: 4px; padding: 4px;
} }
div.repo-link {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
div.box-content-bottom { div.box-content-bottom {
background-color: white; background-color: white;
border: 1px solid #d8d8d8; border: 1px solid #d8d8d8;