Skip to content

Commit bceeb84

Browse files
committed
Use consistent icons in dropdown
1 parent 2485bd2 commit bceeb84

File tree

4 files changed

+22
-7
lines changed

4 files changed

+22
-7
lines changed

components/branches/branches.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@
99
<ul class="dropdown-menu pull-right" role="menu">
1010
<div class="option" onclick="event.stopPropagation()">
1111
<label>
12+
<input class="glyphicon" type="checkbox" data-bind="checked: isShowRemote, css: { 'glyphicon-check': isShowRemote, 'glyphicon-unchecked': !isShowRemote() }" />
1213
Remote
13-
<input type="checkbox" data-bind="checked: isShowRemote"/>
1414
</label>
1515
<label>
16+
<input class="glyphicon" type="checkbox" data-bind="checked: isShowBranch, css: { 'glyphicon-check': isShowBranch, 'glyphicon-unchecked': !isShowBranch() }" />
1617
Branch
17-
<input type="checkbox" data-bind="checked: isShowBranch"/>
1818
</label>
1919
<label>
20+
<input class="glyphicon" type="checkbox" data-bind="checked: isShowTag, css: { 'glyphicon-check': isShowTag, 'glyphicon-unchecked': !isShowTag() }" />
2021
Tag
21-
<input type="checkbox" data-bind="checked: isShowTag"/>
2222
</label>
2323
</div>
2424
<div class="dropdown-divider"></div>
2525
<!-- ko foreach: branchesAndLocalTags -->
2626
<li>
2727
<a href="#" data-bind="html: displayName, click: $parent.checkoutBranch.bind($parent), attr: { 'data-ta-clickable': 'checkout' + name }"></a>
28-
<a href="#" class="list-link list-remove" data-bind="click: $parent.branchRemove.bind($parent), attr: { 'data-ta-clickable': name + '-remove' }">X</a>
28+
<a href="#" class="list-link list-remove octicon octicon-x" data-bind="click: $parent.branchRemove.bind($parent), attr: { 'data-ta-clickable': name + '-remove' }"></a>
2929
</li>
3030
<!-- /ko -->
3131
</ul>

components/branches/branches.less

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
11
.branch .dropdown-menu .option {
2+
font-size: 100%;
23
min-width: 250px;
4+
5+
label {
6+
cursor: pointer;
7+
font-weight: normal;
8+
margin-right: 15px;
9+
}
10+
11+
input {
12+
-moz-appearance: none;
13+
-webkit-appearance: none;
14+
appearance: none;
15+
}
316
}

components/remotes/remotes.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<!-- ko foreach: remotes -->
1111
<li>
1212
<a href="#" data-bind="text: name, click: changeRemote, attr: { 'data-ta-clickable': name }"></a>
13-
<a href="#" class="list-link list-remove" data-bind="text: 'X', click: $parent.remoteRemove.bind($parent), attr: { 'data-ta-clickable': name + '-remove' }"></a>
13+
<a href="#" class="list-link list-remove octicon octicon-x" data-bind="click: $parent.remoteRemove.bind($parent), attr: { 'data-ta-clickable': name + '-remove' }"></a>
1414
</li>
1515
<!-- /ko -->
1616
<li class="divider"></li>

components/submodules/submodules.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
<!-- ko foreach: submodules -->
1111
<li>
1212
<a href="#" data-bind="text: name, click: $parent.submodulePathClick, attr: { 'data-ta-clickable': name }"></a>
13-
<a href="#" class="list-link list-url" data-bind="text: '@', click: $parent.submoduleLinkClick, attr: { 'data-ta-clickable': name + '-weblink' }"></a>
14-
<a href="#" class="list-link list-remove" data-bind="text: 'X', click: $parent.submoduleRemove.bind($parent), attr: { 'data-ta-clickable': name + '-remove' }"></a>
13+
<a href="#" class="list-link list-url octicon octicon-link-external" data-bind="click: $parent.submoduleLinkClick, attr: { 'data-ta-clickable': name + '-weblink' }"></a>
14+
<a href="#" class="list-link list-remove octicon octicon-x" data-bind="click: $parent.submoduleRemove.bind($parent), attr: { 'data-ta-clickable': name + '-remove' }"></a>
1515
</li>
1616
<!-- /ko -->
17+
<!-- ko if: submodules().length-->
1718
<li class="divider"></li>
1819
<li><a href="#" class="update-submodule" data-bind="click: updateSubmodules">Update Submodules</a></li>
1920
<li class="divider"></li>
21+
<!-- /ko -->
2022
<li><a href="#" class="add-submodule" data-bind="click: showAddSubmoduleDialog">Add Submodules</a></li>
2123
</ul>
2224
</div>

0 commit comments

Comments
 (0)