Switch to the new robot icon

This commit is contained in:
Joseph Schorr 2015-04-23 16:41:47 -04:00
parent 864bedf79b
commit 8663bcd1c7
19 changed files with 69 additions and 65 deletions

View file

@ -1198,7 +1198,7 @@
.co-alert.co-alert-danger:before { .co-alert.co-alert-danger:before {
font-family: core-icons; font-family: core-icons;
content: "\f107"; content: "\f108";
position: absolute; position: absolute;
top: 11px; top: 11px;
left: 12px; left: 12px;

View file

@ -2,6 +2,48 @@
margin-left: 6px; margin-left: 6px;
} }
.entity-reference .new-entity-reference .fa-wrench { .entity-reference .new-entity-reference .ci-robot {
width: 16px; width: 16px;
} }
.entity-reference .prefix {
color: #aaa;
}
.entity-reference.block-reference {
position: relative;
display: block;
}
.entity-reference.block-reference .entity-reference-element {
display: block;
}
.entity-reference.block-reference i.fa-exclamation-triangle {
position: absolute;
right: 10px;
top: 4px;
}
.entity-reference-element {
white-space: nowrap;
}
.entity-reference-element i.fa-exclamation-triangle {
color: #c09853;
margin-left: 10px;
}
.entity-reference-element i.fa-user {
margin-left: 2px;
margin-right: 7px;
}
.entity-reference-element i.ci-robot {
margin-left: 1px;
margin-right: 5px;
}
.entity-reference-element i.fa-group {
margin-right: 4px;
}

View file

@ -398,49 +398,6 @@ i.toggle-icon:hover {
background: #eee; background: #eee;
} }
.entity-reference .prefix {
color: #aaa;
}
.entity-reference.block-reference {
position: relative;
display: block;
}
.entity-reference.block-reference .entity-reference-element {
display: block;
}
.entity-reference.block-reference i.fa-exclamation-triangle {
position: absolute;
right: 10px;
top: 4px;
}
.entity-reference-element {
white-space: nowrap;
}
.entity-reference-element i.fa-exclamation-triangle {
color: #c09853;
margin-left: 10px;
}
.entity-reference-element i.fa-user {
margin-left: 2px;
margin-right: 7px;
}
.entity-reference-element i.fa-wrench {
margin-left: 1px;
margin-right: 5px;
}
.entity-reference-element i.fa-group {
margin-right: 4px;
}
.docker-auth-dialog .token-dialog-body .well { .docker-auth-dialog .token-dialog-body .well {
margin-bottom: 0px; margin-bottom: 0px;
position: relative; position: relative;
@ -4692,3 +4649,4 @@ i.rocket-icon {
font-size: 27px; font-size: 27px;
color: #888; color: #888;
} }

View file

@ -30,7 +30,7 @@
<button type="button" class="btn btn-default" <button type="button" class="btn btn-default"
ng-class="is_public ? '' : 'active btn-info'" ng-class="is_public ? '' : 'active btn-info'"
ng-click="is_public = false"> ng-click="is_public = false">
<i class="fa fa-wrench"></i> <i class="fa ci-robot"></i>
Robot account Robot account
</button> </button>
</div> </div>

View file

@ -20,7 +20,7 @@
</li> </li>
<li role="presentation" ng-show="includeRobots && !lazyLoading && isAdmin"> <li role="presentation" ng-show="includeRobots && !lazyLoading && isAdmin">
<a role="menuitem" class="new-action" tabindex="-1" href="javascript:void(0)" ng-click="createRobot()"> <a role="menuitem" class="new-action" tabindex="-1" href="javascript:void(0)" ng-click="createRobot()">
<i class="fa fa-wrench"></i> <i class="fa ci-robot"></i>
Create robot account Create robot account
</a> </a>
</li> </li>
@ -70,7 +70,7 @@
<li class="menuitem" role="presentation" ng-repeat="robot in robots | orderBy:'name'" ng-show="!lazyLoading"> <li class="menuitem" role="presentation" ng-repeat="robot in robots | orderBy:'name'" ng-show="!lazyLoading">
<a role="menuitem" tabindex="-1" href="javascript:void(0)" ng-click="setEntity(robot.name, 'user', true)"> <a role="menuitem" tabindex="-1" href="javascript:void(0)" ng-click="setEntity(robot.name, 'user', true)">
<i class="fa fa-wrench"></i> <span>{{ robot.name }}</span> <i class="fa ci-robot"></i> <span>{{ robot.name }}</span>
</a> </a>
</li> </li>
</ul> </ul>

View file

@ -28,7 +28,7 @@
<!-- Robot --> <!-- Robot -->
<span ng-if="entity.is_robot"> <span ng-if="entity.is_robot">
<i class="fa fa-lg fa-wrench"></i> <i class="fa ci-robot fa-lg"></i>
<span class="entity-name anchor" href="{{ getRobotUrl(entity.name) }}" <span class="entity-name anchor" href="{{ getRobotUrl(entity.name) }}"
is-only-text="!getIsAdmin(getPrefix(entity.name))"> is-only-text="!getIsAdmin(getPrefix(entity.name))">
<span class="prefix">{{ getPrefix(entity.name) }}+</span> <span class="prefix">{{ getPrefix(entity.name) }}+</span>

View file

@ -84,7 +84,7 @@
</li> </li>
<li ng-if="canAdmin(getNamespace(currentPageContext))"> <li ng-if="canAdmin(getNamespace(currentPageContext))">
<a href="javascript:void(0)" ng-click="createRobot(currentPageContext)"> <a href="javascript:void(0)" ng-click="createRobot(currentPageContext)">
<i class="fa fa-wrench"></i> New Robot Account <i class="fa ci-robot"></i> New Robot Account
</a> </a>
</li> </li>
<li role="presentation" class="divider" ng-if="currentPageContext.repository"></li> <li role="presentation" class="divider" ng-if="currentPageContext.repository"></li>
@ -179,7 +179,7 @@
<span class="result-name">{{ result.name }}</span> <span class="result-name">{{ result.name }}</span>
</span> </span>
<span href="/user/{{ result.name }}" ng-switch-when="robot"> <span href="/user/{{ result.name }}" ng-switch-when="robot">
<i class="fa fa-wrench"></i> <i class="fa ci-robot"></i>
<span class="result-name">{{ result.name }}</span> <span class="result-name">{{ result.name }}</span>
</span> </span>
<span ng-switch-when="repository"> <span ng-switch-when="repository">

View file

@ -18,7 +18,7 @@
<span class="avatar" size="avatarSize || 16" data="entity.avatar" ng-if="showAvatar == 'true' && entity.avatar"></span> <span class="avatar" size="avatarSize || 16" data="entity.avatar" ng-if="showAvatar == 'true' && entity.avatar"></span>
<span ng-if="showAvatar != 'true' || !entity.avatar"> <span ng-if="showAvatar != 'true' || !entity.avatar">
<i class="fa fa-user" ng-show="!entity.is_robot" data-title="User" bs-tooltip="tooltip.title" data-container="body"></i> <i class="fa fa-user" ng-show="!entity.is_robot" data-title="User" bs-tooltip="tooltip.title" data-container="body"></i>
<i class="fa fa-wrench" ng-show="entity.is_robot" data-title="Robot Account" bs-tooltip="tooltip.title" data-container="body"></i> <i class="fa ci-robot" ng-show="entity.is_robot" data-title="Robot Account" bs-tooltip="tooltip.title" data-container="body"></i>
</span> </span>
<span class="entity-name" ng-if="entity.is_robot"> <span class="entity-name" ng-if="entity.is_robot">

View file

@ -75,7 +75,7 @@
<!-- Robot Permissions --> <!-- Robot Permissions -->
<tr class="co-table-header-row" <tr class="co-table-header-row"
ng-if="(permissionResources.user.value | objectFilter:onlyRobot).length"> ng-if="(permissionResources.user.value | objectFilter:onlyRobot).length">
<td colspan="3"><i class="fa fa-wrench"></i> Robot Account Permissions</td> <td colspan="3"><i class="fa ci-robot"></i> Robot Account Permissions</td>
</tr> </tr>
<tr class="indented-row" <tr class="indented-row"
ng-repeat="permission in (permissionResources.user.value | objectFilter:onlyRobot)"> ng-repeat="permission in (permissionResources.user.value | objectFilter:onlyRobot)">

View file

@ -52,7 +52,7 @@
</span> </span>
</td> </td>
<td class="robot"> <td class="robot">
<i class="fa fa-wrench hidden-xs"></i> <i class="fa ci-robot hidden-xs"></i>
<a ng-click="showRobot(robotInfo)"> <a ng-click="showRobot(robotInfo)">
<span class="prefix" bo-text="getPrefix(robotInfo.name) + '+'"></span> <span class="prefix" bo-text="getPrefix(robotInfo.name) + '+'"></span>
<span bo-text="getShortenedName(robotInfo.name)"></span> <span bo-text="getShortenedName(robotInfo.name)"></span>
@ -136,6 +136,6 @@
<div class="docker-auth-dialog" username="shownRobot.name" token="shownRobot.token" <div class="docker-auth-dialog" username="shownRobot.name" token="shownRobot.token"
shown="!!shownRobot" counter="showRobotCounter" supports-regenerate="true" regenerate="regenerateToken(username)"> shown="!!shownRobot" counter="showRobotCounter" supports-regenerate="true" regenerate="regenerateToken(username)">
<i class="fa fa-wrench"></i> {{ shownRobot.name }} <i class="fa ci-robot"></i> {{ shownRobot.name }}
</div> </div>
</div> </div>

View file

@ -72,7 +72,7 @@
<button type="button" class="btn btn-default" <button type="button" class="btn btn-default"
ng-class="pullInfo.is_public ? '' : 'active btn-info'" ng-class="pullInfo.is_public ? '' : 'active btn-info'"
ng-click="pullInfo.is_public = false"> ng-click="pullInfo.is_public = false">
<i class="fa fa-wrench"></i> <i class="fa ci-robot"></i>
Robot account Robot account
</button> </button>
</div> </div>

View file

@ -40,7 +40,7 @@
<a href="/user/{{ member.name }}" ng-if="!member.is_robot"> <a href="/user/{{ member.name }}" ng-if="!member.is_robot">
<span class="avatar" data="member.avatar" size="26"></span> <span class="avatar" data="member.avatar" size="26"></span>
</a> </a>
<i class="fa fa-wrench fa-lg" ng-if="member.is_robot"></i> <i class="fa ci-robot fa-lg" ng-if="member.is_robot"></i>
</span> </span>
</span> </span>
<span class="team-member-more" <span class="team-member-more"

View file

@ -261,7 +261,7 @@ angular.module('quay').directive('entitySearch', function () {
if (datum.entity.kind == 'user' && !datum.entity.is_robot) { if (datum.entity.kind == 'user' && !datum.entity.is_robot) {
template += '<i class="fa fa-user fa-lg"></i>'; template += '<i class="fa fa-user fa-lg"></i>';
} else if (datum.entity.kind == 'user' && datum.entity.is_robot) { } else if (datum.entity.kind == 'user' && datum.entity.is_robot) {
template += '<i class="fa fa-wrench fa-lg"></i>'; template += '<i class="fa ci-robot fa-lg"></i>';
} else if (datum.entity.kind == 'team') { } else if (datum.entity.kind == 'team') {
template += '<i class="fa fa-group fa-lg"></i>'; template += '<i class="fa fa-group fa-lg"></i>';
} else if (datum.entity.kind == 'org') { } else if (datum.entity.kind == 'org') {

View file

@ -51,7 +51,7 @@ angular.module('quay').factory('StringBuilderService', ['$sce', 'UtilService', f
'team': 'group', 'team': 'group',
'token': 'key', 'token': 'key',
'repo': 'hdd-o', 'repo': 'hdd-o',
'robot': 'wrench', 'robot': 'ci-robot',
'tag': 'tag', 'tag': 'tag',
'role': 'th-large', 'role': 'th-large',
'original_role': 'th-large', 'original_role': 'th-large',
@ -101,7 +101,11 @@ angular.module('quay').factory('StringBuilderService', ['$sce', 'UtilService', f
var icon = fieldIcons[key]; var icon = fieldIcons[key];
if (icon) { if (icon) {
markedDown = '<i class="fa fa-' + icon + '"></i>' + markedDown; if (icon.indexOf('ci-') < 0) {
icon = 'fa-' + icon;
}
markedDown = '<i class="fa ' + icon + '"></i>' + markedDown;
} }
description = description.replace('{' + key + '}', '<code title="' + safe + '">' + markedDown + '</code>'); description = description.replace('{' + key + '}', '<code title="' + safe + '">' + markedDown + '</code>');

View file

@ -29,7 +29,7 @@
</span> </span>
<span class="cor-tab" tab-title="Robot Accounts" tab-target="#robots" tab-init="showRobots()" <span class="cor-tab" tab-title="Robot Accounts" tab-target="#robots" tab-init="showRobots()"
ng-show="isAdmin"> ng-show="isAdmin">
<i class="fa fa-wrench"></i> <i class="fa ci-robot"></i>
</span> </span>
<span class="cor-tab" tab-title="Default Permissions" tab-target="#default" ng-show="isAdmin"> <span class="cor-tab" tab-title="Default Permissions" tab-target="#default" ng-show="isAdmin">
<i class="fa ci-stamp"></i> <i class="fa ci-stamp"></i>

View file

@ -25,7 +25,7 @@
data-title="Allows users or organizations to grant permissions in multiple repositories to the same non-login-capable account"> data-title="Allows users or organizations to grant permissions in multiple repositories to the same non-login-capable account">
Robot accounts Robot accounts
</span> </span>
<i class="fa fa-wrench visible-lg"></i> <i class="fa ci-robot visible-lg"></i>
</div> </div>
<div class="feature"> <div class="feature">
<span class="context-tooltip" bs-tooltip="tooltip.title" data-container="body" data-placement="right" <span class="context-tooltip" bs-tooltip="tooltip.title" data-container="body" data-placement="right"

View file

@ -289,7 +289,7 @@
<b class="caret"></b> <b class="caret"></b>
</button> </button>
<ul class="dropdown-menu dropdown-menu-right pull-right"> <ul class="dropdown-menu dropdown-menu-right pull-right">
<li><a href="javascript:void(0)" ng-click="setupTrigger(trigger)" ng-show="!trigger.is_active"><i class="fa fa-wrench"></i>Resume Setup</a></li> <li><a href="javascript:void(0)" ng-click="setupTrigger(trigger)" ng-show="!trigger.is_active"><i class="fa ci-robot"></i>Resume Setup</a></li>
<li><a href="javascript:void(0)" ng-click="startTrigger(trigger)" ng-show="trigger.is_active"><i class="fa fa-tasks"></i>Build Now</a></li> <li><a href="javascript:void(0)" ng-click="startTrigger(trigger)" ng-show="trigger.is_active"><i class="fa fa-tasks"></i>Build Now</a></li>
<li><a href="javascript:void(0)" ng-click="deleteTrigger(trigger)"><i class="fa fa-times"></i>Delete Trigger</a></li> <li><a href="javascript:void(0)" ng-click="deleteTrigger(trigger)"><i class="fa fa-times"></i>Delete Trigger</a></li>
</ul> </ul>

View file

@ -68,7 +68,7 @@
<!-- Robot Accounts --> <!-- Robot Accounts -->
<tr class="co-table-header-row" <tr class="co-table-header-row"
ng-if="(members | filter: filterFunction(false, true)).length"> ng-if="(members | filter: filterFunction(false, true)).length">
<td colspan="3"><i class="fa fa-wrench"></i> Robot Accounts</td> <td colspan="3"><i class="fa ci-robot"></i> Robot Accounts</td>
</tr> </tr>
<tr class="indented-row" <tr class="indented-row"

View file

@ -24,7 +24,7 @@
<i class="fa fa-hdd-o"></i> <i class="fa fa-hdd-o"></i>
</span> </span>
<span class="cor-tab" tab-title="Robot Accounts" tab-init="showRobots()" tab-target="#robots"> <span class="cor-tab" tab-title="Robot Accounts" tab-init="showRobots()" tab-target="#robots">
<i class="fa fa-wrench"></i> <i class="fa ci-robot"></i>
</span> </span>
<span class="cor-tab" tab-title="User Settings" tab-target="#settings"> <span class="cor-tab" tab-title="User Settings" tab-target="#settings">
<i class="fa fa-gears"></i> <i class="fa fa-gears"></i>