Merge "Update fontawesome to version 5"
This commit is contained in:
commit
a76dc8d48e
13
Gruntfile.js
13
Gruntfile.js
|
@ -46,7 +46,8 @@ module.exports = function (grunt) {
|
|||
test: './test',
|
||||
output: './dist',
|
||||
report: './reports',
|
||||
node_modules: './node_modules'
|
||||
node_modules: './node_modules',
|
||||
fontawesome: './node_modules/@fortawesome/fontawesome-free-webfonts'
|
||||
};
|
||||
|
||||
var proxies = {
|
||||
|
@ -152,9 +153,9 @@ module.exports = function (grunt) {
|
|||
dir.theme + '/custom/',
|
||||
dir.theme + '/storyboard/',
|
||||
dir.node_modules + '/bootstrap/less/',
|
||||
dir.node_modules + '/font-awesome/less/',
|
||||
dir.node_modules + '/highlightjs/styles/',
|
||||
dir.node_modules + '/ng-sortable/dist/'
|
||||
dir.node_modules + '/ng-sortable/dist/',
|
||||
dir.fontawesome + '/less/'
|
||||
];
|
||||
},
|
||||
cleancss: true,
|
||||
|
@ -252,10 +253,10 @@ module.exports = function (grunt) {
|
|||
{
|
||||
expand: true,
|
||||
dot: true,
|
||||
cwd: dir.node_modules + '/font-awesome',
|
||||
dest: dir.output,
|
||||
cwd: dir.fontawesome + '/webfonts/',
|
||||
dest: dir.output + '/fonts',
|
||||
src: [
|
||||
'fonts/*.*'
|
||||
'*.*'
|
||||
]
|
||||
},
|
||||
{
|
||||
|
|
|
@ -64,6 +64,7 @@
|
|||
"selenium-standalone": "2.43.1-2.9.0-1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fortawesome/fontawesome-free-webfonts": "^1.0.3",
|
||||
"@uirouter/angularjs": "^1.0.12",
|
||||
"angular": "1.5.8",
|
||||
"angular-bootstrap": "0.12.2",
|
||||
|
@ -77,7 +78,6 @@
|
|||
"angular-scenario": "1.5.8",
|
||||
"angularjs-viewhead": "0.0.1",
|
||||
"bootstrap": "3.3.7",
|
||||
"font-awesome": "4.5.0",
|
||||
"gifsicle": "1.0.0",
|
||||
"highlightjs": "9.10.0",
|
||||
"markdown-it": "8.4.0",
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
ng-enter="search()"
|
||||
placeholder="Search Teams">
|
||||
<span class="form-control-feedback text-muted form-control-feedback-sm">
|
||||
<i class="fa fa-refresh fa-spin"
|
||||
<i class="fa fa-sync fa-spin"
|
||||
ng-hide="teams.$resolved"></i>
|
||||
<i class="fa fa-search"
|
||||
ng-show="teams.$resolved"></i>
|
||||
|
@ -63,7 +63,7 @@
|
|||
<tr>
|
||||
<td>
|
||||
<span class="text-muted text-center">
|
||||
<i class="fa fa-spin fa-refresh"></i>
|
||||
<i class="fa fa-spin fa-sync"></i>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<i class="fa fa-sb-team"></i> {{team.name}}
|
||||
<small>
|
||||
<a ng-click="toggleEdit()">
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</a>
|
||||
</small>
|
||||
</h1>
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
ng-enter="search()"
|
||||
placeholder="Search Users">
|
||||
<span class="form-control-feedback text-muted form-control-feedback-sm">
|
||||
<i class="fa fa-refresh fa-spin"
|
||||
<i class="fa fa-sync fa-spin"
|
||||
ng-hide="users.$resolved"></i>
|
||||
<i class="fa fa-search"
|
||||
ng-show="users.$resolved"></i>
|
||||
|
@ -66,7 +66,7 @@
|
|||
<tr>
|
||||
<td>
|
||||
<span class="text-muted text-center">
|
||||
<i class="fa fa-spin fa-refresh"></i>
|
||||
<i class="fa fa-spin fa-sync"></i>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
<div class="col-xs-12">
|
||||
<p class="text-center text-muted">
|
||||
<br/>
|
||||
<i class="fa fa-refresh fa-lg fa-spin"></i>
|
||||
<i class="fa fa-sync fa-lg fa-spin"></i>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
</div>
|
||||
<div class="row target-date" ng-show="item.resolved_due_date">
|
||||
<div class="col-xs-1">
|
||||
<i class="fa fa-clock-o text-muted"></i>
|
||||
<i class="fa fa-clock text-muted"></i>
|
||||
</div>
|
||||
<div class="col-xs-10">
|
||||
<span time-moment
|
||||
|
@ -68,7 +68,7 @@
|
|||
</div>
|
||||
<div class="row target-date" ng-show="item.resolved_due_date">
|
||||
<div class="col-xs-1">
|
||||
<i class="fa fa-clock-o text-muted"></i>
|
||||
<i class="fa fa-clock text-muted"></i>
|
||||
</div>
|
||||
<div class="col-xs-10">
|
||||
<span time-moment
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
</div>
|
||||
<div class="row target-date" ng-show="item.resolved_due_date">
|
||||
<div class="col-xs-1">
|
||||
<i class="fa fa-clock-o text-muted"></i>
|
||||
<i class="fa fa-clock text-muted"></i>
|
||||
</div>
|
||||
<div class="col-xs-10">
|
||||
<span time-moment
|
||||
|
@ -57,7 +57,7 @@
|
|||
</div>
|
||||
<div class="row target-date" ng-show="item.resolved_due_date">
|
||||
<div class="col-xs-1">
|
||||
<i class="fa fa-clock-o text-muted"></i>
|
||||
<i class="fa fa-clock text-muted"></i>
|
||||
</div>
|
||||
<div class="col-xs-10">
|
||||
<span time-moment
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
{{card.task.title}}
|
||||
<small ng-show="permissions.moveCards || permissions.editBoard">
|
||||
<a href ng-click="toggleEditTitle()">
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</a>
|
||||
</small>
|
||||
</span>
|
||||
|
@ -151,7 +151,7 @@
|
|||
ng-click="toggleEditDueDate(); toggleDueDateDropdown()">
|
||||
<div class="row">
|
||||
<div class="col-xs-1">
|
||||
<i class="fa fa-clock-o"></i>
|
||||
<i class="fa fa-clock"></i>
|
||||
</div>
|
||||
<div class="col-xs-11" ng-show="!editingDueDate">
|
||||
<span ng-show="validDueDate(card.resolved_due_date)">
|
||||
|
@ -275,7 +275,7 @@
|
|||
</a>
|
||||
<small>
|
||||
<a href ng-click="toggleEditTitle()">
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</a>
|
||||
</small>
|
||||
</span>
|
||||
|
@ -375,7 +375,7 @@
|
|||
ng-click="toggleEditDueDate(); toggleDueDateDropdown()">
|
||||
<div class="row">
|
||||
<div class="col-xs-1">
|
||||
<i class="fa fa-clock-o"></i>
|
||||
<i class="fa fa-clock"></i>
|
||||
</div>
|
||||
<div class="col-xs-11" ng-show="!editingDueDate">
|
||||
<span ng-show="validDueDate(card.resolved_due_date)">
|
||||
|
|
|
@ -64,7 +64,7 @@
|
|||
<small>
|
||||
<a ng-click="toggleEditMode()"
|
||||
ng-show="permissions.editBoard">
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</a>
|
||||
</small>
|
||||
</h1>
|
||||
|
@ -105,7 +105,7 @@
|
|||
<td class="col-xs-1 text-right">
|
||||
<a href ng-click="editDueDate(dueDate)"
|
||||
ng-if="dueDate.editable">
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</a>
|
||||
</td>
|
||||
<td class="col-xs-1 text-right">
|
||||
|
@ -360,7 +360,7 @@
|
|||
{{ lane.worklist.title }}
|
||||
</a>
|
||||
<a href ng-click="editWorklist(lane.worklist)">
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</a>
|
||||
<button type="button" class="close" title="Remove"
|
||||
ng-click="removeLane(lane)">
|
||||
|
|
|
@ -61,7 +61,7 @@
|
|||
<span class="form-control-feedback text-muted">
|
||||
<i class="fa fa-search"
|
||||
ng-hide="loadingCriteria"></i>
|
||||
<i class="fa fa-refresh fa-spin"
|
||||
<i class="fa fa-sync fa-spin"
|
||||
ng-show="loadingCriteria"></i>
|
||||
</span>
|
||||
|
||||
|
@ -85,7 +85,7 @@
|
|||
</tbody>
|
||||
<tbody ng-show="isSearching">
|
||||
<td colspan="3" class="text-center">
|
||||
<i class="fa fa-refresh fa-spin fa-lg"></i>
|
||||
<i class="fa fa-sync fa-spin fa-lg"></i>
|
||||
</td>
|
||||
</tbody>
|
||||
</table>
|
||||
|
@ -134,7 +134,7 @@
|
|||
<span class="form-control-feedback text-muted">
|
||||
<i class="fa fa-search"
|
||||
ng-hide="loadingCriteria"></i>
|
||||
<i class="fa fa-refresh fa-spin"
|
||||
<i class="fa fa-sync fa-spin"
|
||||
ng-show="loadingCriteria"></i>
|
||||
</span>
|
||||
|
||||
|
@ -158,7 +158,7 @@
|
|||
</tbody>
|
||||
<tbody ng-show="isSearching">
|
||||
<td colspan="3" class="text-center">
|
||||
<i class="fa fa-refresh fa-spin fa-lg"></i>
|
||||
<i class="fa fa-sync fa-spin fa-lg"></i>
|
||||
</td>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
|
@ -111,7 +111,7 @@
|
|||
|
||||
<a ng-click="toggleEdit(worklist)">
|
||||
{{worklist.title}}
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</a>
|
||||
<button type="button" class="close" title="Remove"
|
||||
ng-click="removeLane(worklist)">
|
||||
|
|
|
@ -88,7 +88,7 @@
|
|||
/>
|
||||
<span class="form-control-feedback text-muted
|
||||
form-control-feedback-sm">
|
||||
<i class="fa fa-refresh fa-spin" ng-show="loadingProjects"></i>
|
||||
<i class="fa fa-sync fa-spin" ng-show="loadingProjects"></i>
|
||||
<i class="fa fa-search" ng-hide="loadingProjects"></i>
|
||||
</span>
|
||||
</div>
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
{{projectGroup.title}}
|
||||
<small>
|
||||
<a href="#!/project_group/{{projectGroup.id}}/edit" permission="is_superuser">
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</a>
|
||||
<subscribe resource="project_group"
|
||||
resource-id="projectGroup.id"
|
||||
|
@ -116,7 +116,7 @@
|
|||
|
||||
<tbody ng-if="!stories.$resolved && (showMerged || showInvalid || showActive)">
|
||||
<td class="text-center text-muted">
|
||||
<i class="fa fa-refresh fa-spin"></i>
|
||||
<i class="fa fa-sync fa-spin"></i>
|
||||
</td>
|
||||
</tbody>
|
||||
|
||||
|
|
|
@ -162,7 +162,7 @@
|
|||
/>
|
||||
<span class="form-control-feedback text-muted
|
||||
form-control-feedback-sm">
|
||||
<i class="fa fa-refresh fa-spin" ng-show="loadingProjects"></i>
|
||||
<i class="fa fa-sync fa-spin" ng-show="loadingProjects"></i>
|
||||
<i class="fa fa-search" ng-hide="loadingProjects"></i>
|
||||
</span>
|
||||
</div>
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
<span class="form-control-feedback text-muted">
|
||||
<i class="fa fa-search"
|
||||
ng-hide="loadingCriteria"></i>
|
||||
<i class="fa fa-refresh fa-spin"
|
||||
<i class="fa fa-sync fa-spin"
|
||||
ng-show="loadingCriteria"></i>
|
||||
</span>
|
||||
<result-set-pager
|
||||
|
@ -112,7 +112,7 @@
|
|||
|
||||
<tbody ng-if="isSearching">
|
||||
<td colspan="3" class="text-center">
|
||||
<small class="fa fa-spin fa-lg fa-refresh text-muted">
|
||||
<small class="fa fa-spin fa-lg fa-sync text-muted">
|
||||
</small>
|
||||
</td>
|
||||
</tbody>
|
||||
|
|
|
@ -158,7 +158,7 @@
|
|||
/>
|
||||
<span class="form-control-feedback text-muted
|
||||
form-control-feedback-sm">
|
||||
<i class="fa fa-refresh fa-spin" ng-show="loadingProjects"></i>
|
||||
<i class="fa fa-sync fa-spin" ng-show="loadingProjects"></i>
|
||||
<i class="fa fa-search" ng-hide="loadingProjects"></i>
|
||||
</span>
|
||||
</div>
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
</em>
|
||||
<small ng-show="isLoggedIn">
|
||||
<a href="" ng-click="toggleEditMode()" permission="is_superuser">
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</a>
|
||||
<subscribe resource="project"
|
||||
resource-id="project.id"
|
||||
|
@ -232,7 +232,7 @@
|
|||
<div ng-show="isSearching">
|
||||
<hr/>
|
||||
<p class="text-center">
|
||||
<i class="fa fa-refresh fa-spin fa-lg"></i>
|
||||
<i class="fa fa-sync fa-spin fa-lg"></i>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
<span class="form-control-feedback text-muted">
|
||||
<i class="fa fa-search"
|
||||
ng-hide="loadingCriteria"></i>
|
||||
<i class="fa fa-refresh fa-spin"
|
||||
<i class="fa fa-sync fa-spin"
|
||||
ng-show="loadingCriteria"></i>
|
||||
</span>
|
||||
<result-set-pager
|
||||
|
@ -110,7 +110,7 @@
|
|||
|
||||
<tbody ng-if="isSearching">
|
||||
<td colspan="2" class="text-center">
|
||||
<small class="fa fa-spin fa-lg fa-refresh text-muted">
|
||||
<small class="fa fa-spin fa-lg fa-sync text-muted">
|
||||
</small>
|
||||
</td>
|
||||
</tbody>
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
<span class="form-control-feedback text-muted">
|
||||
<i class="fa fa-search"
|
||||
ng-hide="loadingCriteria"></i>
|
||||
<i class="fa fa-refresh fa-spin"
|
||||
<i class="fa fa-sync fa-spin"
|
||||
ng-show="loadingCriteria"></i>
|
||||
</span>
|
||||
</div>
|
||||
|
@ -95,7 +95,7 @@
|
|||
|
||||
<tbody ng-if="isSearching">
|
||||
<td colspan="2">
|
||||
<small class="fa fa-spin fa-refresh text-muted">
|
||||
<small class="fa fa-spin fa-sync text-muted">
|
||||
</small>
|
||||
</td>
|
||||
</tbody>
|
||||
|
@ -140,7 +140,7 @@
|
|||
|
||||
<tbody ng-if="isSearching">
|
||||
<td colspan="2">
|
||||
<small class="fa fa-spin fa-refresh text-muted">
|
||||
<small class="fa fa-spin fa-sync text-muted">
|
||||
</small>
|
||||
</td>
|
||||
</tbody>
|
||||
|
@ -185,7 +185,7 @@
|
|||
|
||||
<tbody ng-if="isSearching">
|
||||
<td colspan="2">
|
||||
<small class="fa fa-spin fa-refresh text-muted">
|
||||
<small class="fa fa-spin fa-sync text-muted">
|
||||
</small>
|
||||
</td>
|
||||
</tbody>
|
||||
|
@ -230,7 +230,7 @@
|
|||
|
||||
<tbody ng-if="isSearching">
|
||||
<td colspan="2">
|
||||
<small class="fa fa-spin fa-refresh text-muted">
|
||||
<small class="fa fa-spin fa-sync text-muted">
|
||||
</small>
|
||||
</td>
|
||||
</tbody>
|
||||
|
@ -276,7 +276,7 @@
|
|||
|
||||
<tbody ng-if="isSearching">
|
||||
<td colspan="2">
|
||||
<small class="fa fa-spin fa-refresh text-muted">
|
||||
<small class="fa fa-spin fa-sync text-muted">
|
||||
</small>
|
||||
</td>
|
||||
</tbody>
|
||||
|
@ -321,7 +321,7 @@
|
|||
|
||||
<tbody ng-if="isSearching">
|
||||
<td colspan="2">
|
||||
<small class="fa fa-spin fa-refresh text-muted">
|
||||
<small class="fa fa-spin fa-sync text-muted">
|
||||
</small>
|
||||
</td>
|
||||
</tbody>
|
||||
|
@ -366,7 +366,7 @@
|
|||
|
||||
<tbody ng-if="isSearching">
|
||||
<td colspan="2">
|
||||
<small class="fa fa-spin fa-refresh text-muted">
|
||||
<small class="fa fa-spin fa-sync text-muted">
|
||||
</small>
|
||||
</td>
|
||||
</tbody>
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
<tr>
|
||||
<td>
|
||||
<span class="text-muted text-center">
|
||||
<i class="fa fa-spin fa-refresh"></i>
|
||||
<i class="fa fa-spin fa-sync"></i>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
<div>
|
||||
<button class="btn btn-xs btn-default"
|
||||
dropdown-toggle>
|
||||
<i class="fa fa-gear"></i>
|
||||
<i class="fa fa-cog"></i>
|
||||
</button>
|
||||
</div>
|
||||
<ul class="dropdown-menu dropdown-menu-right" role="menu">
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
<span class="form-control-feedback text-muted">
|
||||
<i class="fa fa-search"
|
||||
ng-hide="loadingCriteria"></i>
|
||||
<i class="fa fa-refresh fa-spin"
|
||||
<i class="fa fa-sync fa-spin"
|
||||
ng-show="loadingCriteria"></i>
|
||||
</span>
|
||||
</div>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<div class="discussion-comment text-muted" ng-if="display_events_task_priority_changed">
|
||||
<p class="discussion-comment-icon">
|
||||
<i class="fa fa-exchange"></i>
|
||||
<i class="fas fa-exchange-alt"></i>
|
||||
</p>
|
||||
<p class="discussion-event">
|
||||
<span>{{event.author.full_name}} updated the priority of the task
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<div class="discussion-comment text-muted" ng-if="display_events_task_status_changed">
|
||||
<p class="discussion-comment-icon">
|
||||
<i class="fa fa-exchange"></i>
|
||||
<i class="fas fa-exchange-alt"></i>
|
||||
</p>
|
||||
<p class="discussion-event">
|
||||
<span>
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
<button class="btn btn-default btn-xs" ng-click="edit(event)"
|
||||
ng-show="isAuthor(event) && enableEditableComments"
|
||||
title="Edit">
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</button>
|
||||
<span ng-show="isAuthor(event) && enableEditableComments"> </span>
|
||||
<button class="btn btn-default btn-xs" ng-click="quote(event)" ng-show="isLoggedIn"
|
||||
|
|
|
@ -71,7 +71,7 @@
|
|||
|
||||
<small ng-show="isLoggedIn">
|
||||
<a href="" ng-click="toggleEditMode()" >
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</a>
|
||||
<subscribe resource="story"
|
||||
resource-id="story.id">
|
||||
|
@ -88,7 +88,7 @@
|
|||
None
|
||||
</em>
|
||||
<span ng-show="story.creator_id && !creator.$resolved">
|
||||
<i class="fa fa-refresh fa-spin"></i>
|
||||
<i class="fa fa-sync fa-spin"></i>
|
||||
</span>
|
||||
<span ng-show="creator.full_name">
|
||||
{{creator.full_name}}
|
||||
|
@ -356,7 +356,7 @@
|
|||
<h4>
|
||||
<span class="label label-warning">
|
||||
{{tag}}
|
||||
<i class="fa fa-remove" ng-show="isLoggedIn"
|
||||
<i class="fa fa-times" ng-show="isLoggedIn"
|
||||
ng-click="removeTag(tag)"></i>
|
||||
</span>
|
||||
</h4>
|
||||
|
@ -530,7 +530,7 @@
|
|||
<button class="btn btn-primary btn-xs pull-right"
|
||||
ng-show="!task.editing && task.link && isLoggedIn"
|
||||
ng-click="editNotes(task)">
|
||||
<i class="fa fa-pencil"></i> Edit
|
||||
<i class="fa fa-pencil-alt"></i> Edit
|
||||
</button>
|
||||
<insert-markdown content="task.link" ng-show="!task.editing"></insert-markdown>
|
||||
<insert-markdown content="task.tempNotes" ng-show="task.editing && notesPreview"></insert-markdown>
|
||||
|
@ -572,7 +572,7 @@
|
|||
<div class="padded-row pull-right" ng-show="!task.editing && !task.link">
|
||||
<button class="btn btn-primary btn-xs"
|
||||
ng-click="editNotes(task)">
|
||||
<i class="fa fa-pencil"></i> Add notes
|
||||
<i class="fa fa-pencil-alt"></i> Add notes
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -772,7 +772,7 @@
|
|||
<h4>Events Timeline and Comments</h4>
|
||||
</div>
|
||||
<div class="discussion-overlay text-center" ng-show="isSearching">
|
||||
<i class="fa fa-lg fa-refresh fa-spin text-muted"></i>
|
||||
<i class="fa fa-lg fa-sync fa-spin text-muted"></i>
|
||||
</div>
|
||||
<div class="discussion" ng-class="{'discussion-faded': isSearching}">
|
||||
<div class="alert alert-warning"
|
||||
|
|
|
@ -52,7 +52,7 @@
|
|||
<span class="form-control-feedback text-muted">
|
||||
<i class="fa fa-search"
|
||||
ng-hide="loadingCriteria"></i>
|
||||
<i class="fa fa-refresh fa-spin"
|
||||
<i class="fa fa-sync fa-spin"
|
||||
ng-show="loadingCriteria"></i>
|
||||
</span>
|
||||
<result-set-pager
|
||||
|
@ -148,7 +148,7 @@
|
|||
|
||||
<tbody ng-if="isSearching">
|
||||
<td colspan="5" class="text-center">
|
||||
<small class="fa fa-spin fa-lg fa-refresh text-muted">
|
||||
<small class="fa fa-spin fa-lg fa-sync text-muted">
|
||||
</small>
|
||||
</td>
|
||||
</tbody>
|
||||
|
|
|
@ -217,7 +217,7 @@
|
|||
/>
|
||||
<span class="form-control-feedback text-muted
|
||||
form-control-feedback-sm">
|
||||
<i class="fa fa-refresh fa-spin" ng-show="loadingProjects"></i>
|
||||
<i class="fa fa-sync fa-spin" ng-show="loadingProjects"></i>
|
||||
<i class="fa fa-search" ng-hide="loadingProjects"></i>
|
||||
</span>
|
||||
</div>
|
||||
|
|
|
@ -228,7 +228,7 @@
|
|||
<h4>
|
||||
<span class="label label-warning">
|
||||
{{tag}}
|
||||
<i class="fa fa-remove" ng-show="isLoggedIn"
|
||||
<i class="fa fa-times" ng-show="isLoggedIn"
|
||||
ng-click="removeTag(tag)"></i>
|
||||
</span>
|
||||
</h4>
|
||||
|
@ -387,7 +387,7 @@
|
|||
<button class="btn btn-primary btn-xs pull-right"
|
||||
ng-show="!task.editing && task.link && isLoggedIn"
|
||||
ng-click="editNotes(task)">
|
||||
<i class="fa fa-pencil"></i> Edit
|
||||
<i class="fa fa-pencil-alt"></i> Edit
|
||||
</button>
|
||||
<insert-markdown content="task.link" ng-show="!task.editing"></insert-markdown>
|
||||
<insert-markdown content="task.tempNotes" ng-show="task.editing && notesPreview"></insert-markdown>
|
||||
|
@ -429,7 +429,7 @@
|
|||
<div class="padded-row pull-right" ng-show="!task.editing && !task.link">
|
||||
<button class="btn btn-primary btn-xs"
|
||||
ng-click="editNotes(task)">
|
||||
<i class="fa fa-pencil"></i> Add notes
|
||||
<i class="fa fa-pencil-alt"></i> Add notes
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -89,7 +89,7 @@
|
|||
<ul class="nav navbar-nav navbar-right">
|
||||
<li ng-hide="isLoggedIn">
|
||||
<a href="#!/auth/authorize">
|
||||
<i class="fa fa-sign-in"></i>
|
||||
<i class="fa fa-sign-in-alt"></i>
|
||||
Login
|
||||
</a>
|
||||
</li>
|
||||
|
@ -107,7 +107,7 @@
|
|||
<ul class="dropdown-menu">
|
||||
<li>
|
||||
<a href="#!/auth/deauthorize">
|
||||
<i class="fa fa-sign-out"></i>
|
||||
<i class="fa fa-sign-out-alt"></i>
|
||||
Logout
|
||||
</a>
|
||||
</li>
|
||||
|
@ -131,7 +131,7 @@
|
|||
typeahead-template-url="app/search/template/typeahead_criteria_item.html"
|
||||
/>
|
||||
<span class="form-control-feedback text-muted">
|
||||
<i class="fa fa-spin fa-refresh"
|
||||
<i class="fa fa-spin fa-sync"
|
||||
ng-show="headerCriteriaLoading"></i>
|
||||
</span>
|
||||
</div>
|
||||
|
@ -148,12 +148,12 @@
|
|||
class="btn btn-sm btn-primary navbar-btn pull-right"
|
||||
ng-click="showMobileMenu = !showMobileMenu"
|
||||
ng-show="isLoggedIn">
|
||||
<i class="fa fa-gear"></i>
|
||||
<i class="fa fa-cog"></i>
|
||||
</button>
|
||||
<a href="#!/auth/authorize"
|
||||
class="btn btn-sm btn-primary navbar-btn pull-right"
|
||||
ng-hide="isLoggedIn">
|
||||
<i class="fa fa-sign-in"></i>
|
||||
<i class="fa fa-sign-in-alt"></i>
|
||||
</a>
|
||||
<button type="button"
|
||||
ng-click="showMobileNewMenu = !showMobileNewMenu"
|
||||
|
@ -222,7 +222,7 @@
|
|||
<li class="divider"></li>
|
||||
<li><a href="#!/auth/deauthorize"
|
||||
ng-click="showMobileMenu = false">
|
||||
<i class="fa fa-sign-out"></i>
|
||||
<i class="fa fa-sign-out-alt"></i>
|
||||
Logout
|
||||
</a></li>
|
||||
</ul>
|
||||
|
|
|
@ -30,8 +30,8 @@
|
|||
<li class="nav-divider"></li>
|
||||
<li active-path="^\/(dashboard\/.*)?$" ng-if="isLoggedIn">
|
||||
<a href="#!/">
|
||||
<i class="fa fa-dashboard fa-lg visible-sm visible-xs"></i>
|
||||
<i class="fa fa-dashboard fa-3x visible-lg visible-md"></i>
|
||||
<i class="fa fa-tachometer-alt fa-lg visible-sm visible-xs"></i>
|
||||
<i class="fa fa-tachometer-alt fa-3x visible-lg visible-md"></i>
|
||||
<small class="visible-lg visible-md">Dashboard</small>
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
<i ng-if="subscribed"
|
||||
class="fa fa-star"></i>
|
||||
<i ng-if="!subscribed"
|
||||
class="fa fa-star-o"></i>
|
||||
class="far fa-star"></i>
|
||||
</span>
|
||||
<span ng-if="resolving"
|
||||
class="text-muted">
|
||||
<i class="fa fa-spin fa-refresh"></i>
|
||||
<i class="fa fa-spin fa-sync"></i>
|
||||
</span>
|
||||
<a ng-if="enabled && !resolving"
|
||||
href=""
|
||||
|
@ -16,5 +16,5 @@
|
|||
<i ng-if="subscribed"
|
||||
class="fa fa-star"></i>
|
||||
<i ng-if="!subscribed"
|
||||
class="fa fa-star-o"></i>
|
||||
class="far fa-star"></i>
|
||||
</a>
|
||||
|
|
|
@ -10,11 +10,11 @@
|
|||
ng-click="toggleForm()"
|
||||
ng-if="!showForm && enabled">
|
||||
<span ng-if="inputText">
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</span>
|
||||
<em ng-if="!inputText" class="text-muted">
|
||||
{{emptyPrompt}}
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</em>
|
||||
</a>
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<p class="form-control-static">
|
||||
<i class="fa fa-sb-project text-muted"
|
||||
ng-if="!project || project.$resolved"></i>
|
||||
<i class="fa fa-spin fa-refresh text-muted"
|
||||
<i class="fa fa-spin fa-sync text-muted"
|
||||
ng-if="project && !project.$resolved"></i>
|
||||
|
||||
|
||||
|
@ -16,11 +16,11 @@
|
|||
ng-click="toggleForm()"
|
||||
ng-if="!showForm && enabled">
|
||||
<span ng-if="project">
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</span>
|
||||
<em ng-if="!project" class="text-muted">
|
||||
{{emptyPrompt}}
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</em>
|
||||
</a>
|
||||
|
||||
|
@ -51,6 +51,6 @@
|
|||
|
||||
<span class="form-control-feedback text-muted">
|
||||
<i class="fa fa-search" ng-if="!loadingProjects"></i>
|
||||
<i class="fa fa-spin fa-refresh" ng-if="loadingProjects"></i>
|
||||
<i class="fa fa-spin fa-sync" ng-if="loadingProjects"></i>
|
||||
</span>
|
||||
</div>
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<p class="form-control-static">
|
||||
<i class="fa fa-sb-user text-muted"
|
||||
ng-if="!user || user.$resolved"></i>
|
||||
<i class="fa fa-spin fa-refresh text-muted"
|
||||
<i class="fa fa-spin fa-sync text-muted"
|
||||
ng-if="user && !user.$resolved"></i>
|
||||
|
||||
|
||||
|
@ -16,11 +16,11 @@
|
|||
ng-click="toggleForm()"
|
||||
ng-if="!showForm && enabled">
|
||||
<span ng-if="user">
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</span>
|
||||
<em ng-if="!user" class="text-muted">
|
||||
{{emptyPrompt}}
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</em>
|
||||
</a>
|
||||
|
||||
|
@ -57,6 +57,6 @@
|
|||
|
||||
<span class="form-control-feedback text-muted">
|
||||
<i class="fa fa-search" ng-if="!loadingUsers"></i>
|
||||
<i class="fa fa-spin fa-refresh" ng-if="loadingUsers"></i>
|
||||
<i class="fa fa-spin fa-sync" ng-if="loadingUsers"></i>
|
||||
</span>
|
||||
</div>
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
</div>
|
||||
<span class="form-control-feedback text-muted
|
||||
form-control-feedback-sm">
|
||||
<i class="fa fa-refresh fa-spin" ng-show="loadingItems"></i>
|
||||
<i class="fa fa-sync fa-spin" ng-show="loadingItems"></i>
|
||||
<i class="fa fa-search" ng-hide="loadingItems"></i>
|
||||
</span>
|
||||
</div>
|
||||
|
@ -160,7 +160,7 @@
|
|||
<tbody ng-show="item.loadingTasks">
|
||||
<tr>
|
||||
<td class="text-center">
|
||||
<i class="fa fa-spin fa-refresh"></i>
|
||||
<i class="fa fa-spin fa-sync"></i>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
|
|
@ -60,7 +60,7 @@
|
|||
<small ng-show="isLoggedIn">
|
||||
<a ng-click="toggleEditMode()"
|
||||
ng-show="permissions.editWorklist">
|
||||
<i class="fa fa-pencil"></i>
|
||||
<i class="fa fa-pencil-alt"></i>
|
||||
</a>
|
||||
<subscribe resource="worklist"
|
||||
resource-id="worklist.id">
|
||||
|
@ -391,7 +391,7 @@
|
|||
</div>
|
||||
<div class="row target-date" ng-show="item.resolved_due_date">
|
||||
<div class="col-xs-1">
|
||||
<i class="fa fa-clock-o text-muted"></i>
|
||||
<i class="fa fa-clock text-muted"></i>
|
||||
</div>
|
||||
<div class="col-xs-11">
|
||||
<span time-moment
|
||||
|
@ -422,7 +422,7 @@
|
|||
</div>
|
||||
<div class="row target-date" ng-show="item.resolved_due_date">
|
||||
<div class="col-xs-1">
|
||||
<i class="fa fa-clock-o text-muted"></i>
|
||||
<i class="fa fa-clock text-muted"></i>
|
||||
</div>
|
||||
<div class="col-xs-10">
|
||||
<span time-moment
|
||||
|
@ -476,7 +476,7 @@
|
|||
</div>
|
||||
<div class="row target-date" ng-show="item.resolved_due_date">
|
||||
<div class="col-xs-1">
|
||||
<i class="fa fa-clock-o text-muted"></i>
|
||||
<i class="fa fa-clock text-muted"></i>
|
||||
</div>
|
||||
<div class="col-xs-11">
|
||||
<span time-moment
|
||||
|
@ -501,7 +501,7 @@
|
|||
</div>
|
||||
<div class="row target-date" ng-show="item.resolved_due_date">
|
||||
<div class="col-xs-1">
|
||||
<i class="fa fa-clock-o text-muted"></i>
|
||||
<i class="fa fa-clock text-muted"></i>
|
||||
</div>
|
||||
<div class="col-xs-10">
|
||||
<span time-moment
|
||||
|
|
|
@ -61,7 +61,7 @@
|
|||
<div class="col-xs-12">
|
||||
<p class="text-center text-muted">
|
||||
<br/>
|
||||
<i class="fa fa-refresh fa-lg fa-spin"></i>
|
||||
<i class="fa fa-sync fa-lg fa-spin"></i>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -26,9 +26,9 @@
|
|||
.@{fa-css-prefix}-sb-project:before { content: @fa-var-cube; }
|
||||
.@{fa-css-prefix}-sb-project-group:before { content: @fa-var-cubes; }
|
||||
.@{fa-css-prefix}-sb-team:before { content: @fa-var-users; }
|
||||
.@{fa-css-prefix}-sb-admin:before { content: @fa-var-gears; }
|
||||
.@{fa-css-prefix}-sb-admin:before { content: @fa-var-cogs; }
|
||||
.@{fa-css-prefix}-sb-profile:before { content: @fa-var-user; }
|
||||
.@{fa-css-prefix}-sb-profile-preferences:before { content: @fa-var-gear; }
|
||||
.@{fa-css-prefix}-sb-profile-preferences:before { content: @fa-var-cog; }
|
||||
.@{fa-css-prefix}-sb-profile-tokens:before { content: @fa-var-key; }
|
||||
.@{fa-css-prefix}-sb-board:before { content: @fa-var-tasks; }
|
||||
.@{fa-css-prefix}-sb-worklist:before { content: @fa-var-tasks; }
|
||||
|
|
|
@ -20,10 +20,16 @@
|
|||
* Note that this is the only LESS file that is compiled - if you want a
|
||||
* a specific stylesheet to be included, it must be linked here.
|
||||
*/
|
||||
|
||||
|
||||
// Library inclusions
|
||||
@import './bootstrap.less';
|
||||
@import './base/bootstrap/navbar.less';
|
||||
@import './font-awesome.less';
|
||||
@import './fontawesome.less';
|
||||
|
||||
@fa-font-path: '../fonts';
|
||||
@import './fa-solid.less';
|
||||
@import './fa-regular.less';
|
||||
|
||||
// HighlightJS theme
|
||||
@import (less) './default.css';
|
||||
|
|
|
@ -2,6 +2,10 @@
|
|||
# yarn lockfile v1
|
||||
|
||||
|
||||
"@fortawesome/fontawesome-free-webfonts@^1.0.3":
|
||||
version "1.0.4"
|
||||
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.4.tgz#bac5d89755bf3bc2d2b4deee47d92febf641bb1f"
|
||||
|
||||
"@uirouter/angularjs@^1.0.12":
|
||||
version "1.0.12"
|
||||
resolved "https://registry.yarnpkg.com/@uirouter/angularjs/-/angularjs-1.0.12.tgz#b2275b7e33e0024a485f96568a18d350539880f3"
|
||||
|
@ -1906,10 +1910,6 @@ first-chunk-stream@^1.0.0:
|
|||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
|
||||
|
||||
font-awesome@4.5.0:
|
||||
version "4.5.0"
|
||||
resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.5.0.tgz#1e9d7ccf7d63bdbe57000e18d5188cb2557e70f8"
|
||||
|
||||
for-in@^1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
|
||||
|
|
Loading…
Reference in New Issue