Merge pull request #886 from noc06140728/fix-octicon

Replace some icon to octicon
This commit is contained in:
Naoki Takezoe
2015-08-21 02:12:15 +09:00
20 changed files with 43 additions and 27 deletions

View File

@@ -1,6 +1,6 @@
@(condition: => Boolean)
@if(condition){
<i class="icon-ok"></i>
<i class="octicon octicon-check"></i>
} else {
<i class="icon-white"></i>
}

View File

@@ -24,8 +24,8 @@
</span>
<span class="pull-right">
@if(hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false)){
<a href="#" data-comment-id="@comment.commentId"><i class="icon-pencil"></i></a>&nbsp;
<a href="#" data-comment-id="@comment.commentId"><i class="icon-remove-circle"></i></a>
<a href="#" data-comment-id="@comment.commentId"><i class="octicon octicon-pencil"></i></a>&nbsp;
<a href="#" data-comment-id="@comment.commentId"><i class="octicon octicon-x"></i></a>
}
</span>
</div>

View File

@@ -1,7 +1,7 @@
@(id: String, value: String, prepend: Boolean = false)(html: Html)
<div class="input-append @if(prepend){input-prepend}" style="margin-bottom: 0px;">
@html
<span id="@id" class="add-on btn" data-clipboard-text="@value" data-placement="bottom" title="copy to clipboard"><i class="icon-check"></i></span>
<span id="@id" class="add-on btn" data-clipboard-text="@value" data-placement="bottom" title="copy to clipboard"><i class="octicon octicon-clippy"></i></span>
</div>
<script>
// copy to clipboard

View File

@@ -2,7 +2,7 @@
@import gitbucket.core.view.helpers
<div id="@name" class="input-append date" data-date-format="yyyy-mm-dd" data-date="@value.map(helpers.date)">
<input class="span2" name="@name" type="text" readonly="" value="@value.map(helpers.date)" size="16"/>
<span class="add-on"><i class="icon-calendar"></i></span>
<span class="add-on"><i class="octicon octicon-calendar"></i></span>
</div>
<script>
$(function(){

View File

@@ -9,7 +9,7 @@
@if(flat){style="border: none; background-color: #eee;"}
class="dropdown-toggle @if(!flat){btn} else {flat} @if(mini){btn-mini} else {btn-small}" data-toggle="dropdown">
@if(value.isEmpty){
<i class="icon-cog"></i>
<i class="octicon octicon-gear"></i>
} else {
@if(prefix.nonEmpty){
<span class="muted">@prefix:</span>