diff --git a/Gruntfile.js b/Gruntfile.js index c71e8098..48426b84 100644 --- a/Gruntfile.js +++ b/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/*.*' + '*.*' ] }, { diff --git a/package.json b/package.json index e3ceee42..aa41ba20 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/app/admin/template/team.html b/src/app/admin/template/team.html index 3c3658e4..0e0925d6 100644 --- a/src/app/admin/template/team.html +++ b/src/app/admin/template/team.html @@ -40,7 +40,7 @@ ng-enter="search()" placeholder="Search Teams"> - @@ -63,7 +63,7 @@ - + diff --git a/src/app/admin/template/team_edit.html b/src/app/admin/template/team_edit.html index b03da965..9fffb21f 100644 --- a/src/app/admin/template/team_edit.html +++ b/src/app/admin/template/team_edit.html @@ -22,7 +22,7 @@ {{team.name}} - + diff --git a/src/app/admin/template/user.html b/src/app/admin/template/user.html index 0f0dd3ab..84e8fb95 100644 --- a/src/app/admin/template/user.html +++ b/src/app/admin/template/user.html @@ -41,7 +41,7 @@ ng-enter="search()" placeholder="Search Users"> - @@ -66,7 +66,7 @@ - + diff --git a/src/app/auth/template/busy.html b/src/app/auth/template/busy.html index 56f851cd..114c9447 100644 --- a/src/app/auth/template/busy.html +++ b/src/app/auth/template/busy.html @@ -19,7 +19,7 @@


- +

diff --git a/src/app/boards/template/board_contents/kanban_lane_contents.html b/src/app/boards/template/board_contents/kanban_lane_contents.html index e8bb1065..a0ee00ad 100644 --- a/src/app/boards/template/board_contents/kanban_lane_contents.html +++ b/src/app/boards/template/board_contents/kanban_lane_contents.html @@ -39,7 +39,7 @@
- +
- +
- +
- +
- + @@ -151,7 +151,7 @@ ng-click="toggleEditDueDate(); toggleDueDateDropdown()">
- +
@@ -275,7 +275,7 @@ - + @@ -375,7 +375,7 @@ ng-click="toggleEditDueDate(); toggleDueDateDropdown()">
- +
diff --git a/src/app/boards/template/detail.html b/src/app/boards/template/detail.html index 43003950..07f65593 100644 --- a/src/app/boards/template/detail.html +++ b/src/app/boards/template/detail.html @@ -64,7 +64,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -360,7 +360,7 @@ {{ lane.worklist.title }} - +
diff --git a/src/app/project_group/template/detail.html b/src/app/project_group/template/detail.html index cdb6fada..4f23c60e 100644 --- a/src/app/project_group/template/detail.html +++ b/src/app/project_group/template/detail.html @@ -7,7 +7,7 @@ {{projectGroup.title}} - + - + diff --git a/src/app/project_group/template/edit.html b/src/app/project_group/template/edit.html index 4025f094..eec425e5 100644 --- a/src/app/project_group/template/edit.html +++ b/src/app/project_group/template/edit.html @@ -162,7 +162,7 @@ />
diff --git a/src/app/project_group/template/list.html b/src/app/project_group/template/list.html index 5d3ff78c..9c30c8f5 100644 --- a/src/app/project_group/template/list.html +++ b/src/app/project_group/template/list.html @@ -51,7 +51,7 @@ - + diff --git a/src/app/project_group/template/new.html b/src/app/project_group/template/new.html index 08567f8c..df2bc59b 100644 --- a/src/app/project_group/template/new.html +++ b/src/app/project_group/template/new.html @@ -158,7 +158,7 @@ />
diff --git a/src/app/projects/template/detail.html b/src/app/projects/template/detail.html index 48b58a83..e2ce03a7 100644 --- a/src/app/projects/template/detail.html +++ b/src/app/projects/template/detail.html @@ -41,7 +41,7 @@ - +

- +

diff --git a/src/app/projects/template/list.html b/src/app/projects/template/list.html index 339fdde4..91a231c2 100644 --- a/src/app/projects/template/list.html +++ b/src/app/projects/template/list.html @@ -53,7 +53,7 @@ - + diff --git a/src/app/search/template/index.html b/src/app/search/template/index.html index fd929ab1..56a0ac81 100644 --- a/src/app/search/template/index.html +++ b/src/app/search/template/index.html @@ -37,7 +37,7 @@
@@ -95,7 +95,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -230,7 +230,7 @@ - + @@ -276,7 +276,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -366,7 +366,7 @@ - + diff --git a/src/app/search/template/project_group_search_item.html b/src/app/search/template/project_group_search_item.html index 6d7f3257..af722c53 100644 --- a/src/app/search/template/project_group_search_item.html +++ b/src/app/search/template/project_group_search_item.html @@ -17,7 +17,7 @@ - + diff --git a/src/app/services/template/result_set_pager.html b/src/app/services/template/result_set_pager.html index a39f4a29..b9df9227 100644 --- a/src/app/services/template/result_set_pager.html +++ b/src/app/services/template/result_set_pager.html @@ -34,7 +34,7 @@
diff --git a/src/app/stories/template/comments/task_priority_changed.html b/src/app/stories/template/comments/task_priority_changed.html index 43b61619..9a2f55fa 100644 --- a/src/app/stories/template/comments/task_priority_changed.html +++ b/src/app/stories/template/comments/task_priority_changed.html @@ -1,6 +1,6 @@

- +

{{event.author.full_name}} updated the priority of the task diff --git a/src/app/stories/template/comments/task_status_changed.html b/src/app/stories/template/comments/task_status_changed.html index b4d5ef92..23fa76aa 100644 --- a/src/app/stories/template/comments/task_status_changed.html +++ b/src/app/stories/template/comments/task_status_changed.html @@ -1,6 +1,6 @@

- +

diff --git a/src/app/stories/template/comments/user_comment.html b/src/app/stories/template/comments/user_comment.html index 982aa05e..c3084628 100644 --- a/src/app/stories/template/comments/user_comment.html +++ b/src/app/stories/template/comments/user_comment.html @@ -20,7 +20,7 @@   @@ -572,7 +572,7 @@

@@ -772,7 +772,7 @@

Events Timeline and Comments

- +
- - + diff --git a/src/app/stories/template/new.html b/src/app/stories/template/new.html index 52bc1b88..2f1fa926 100644 --- a/src/app/stories/template/new.html +++ b/src/app/stories/template/new.html @@ -217,7 +217,7 @@ />
diff --git a/src/app/stories/template/new_page.html b/src/app/stories/template/new_page.html index f5265fc4..198a76ff 100644 --- a/src/app/stories/template/new_page.html +++ b/src/app/stories/template/new_page.html @@ -228,7 +228,7 @@

{{tag}} -

@@ -387,7 +387,7 @@ @@ -429,7 +429,7 @@
diff --git a/src/app/storyboard/template/header_menu.html b/src/app/storyboard/template/header_menu.html index f3bcb184..6efc8784 100644 --- a/src/app/storyboard/template/header_menu.html +++ b/src/app/storyboard/template/header_menu.html @@ -89,7 +89,7 @@
  • - + Login
    • @@ -107,7 +107,7 @@
    • - + Logout
      • @@ -131,7 +131,7 @@ typeahead-template-url="app/search/template/typeahead_criteria_item.html" />
@@ -148,12 +148,12 @@ class="btn btn-sm btn-primary navbar-btn pull-right" ng-click="showMobileMenu = !showMobileMenu" ng-show="isLoggedIn"> - + - +
diff --git a/src/app/util/template/user_typeahead.html b/src/app/util/template/user_typeahead.html index fcbb309b..28a204b1 100644 --- a/src/app/util/template/user_typeahead.html +++ b/src/app/util/template/user_typeahead.html @@ -4,7 +4,7 @@

-   @@ -16,11 +16,11 @@ ng-click="toggleForm()" ng-if="!showForm && enabled"> - + {{emptyPrompt}} - + @@ -57,6 +57,6 @@

diff --git a/src/app/worklists/template/additem.html b/src/app/worklists/template/additem.html index 51356db1..8b468b7d 100644 --- a/src/app/worklists/template/additem.html +++ b/src/app/worklists/template/additem.html @@ -58,7 +58,7 @@
@@ -160,7 +160,7 @@ - + diff --git a/src/app/worklists/template/detail.html b/src/app/worklists/template/detail.html index b4369535..813d28f7 100644 --- a/src/app/worklists/template/detail.html +++ b/src/app/worklists/template/detail.html @@ -60,7 +60,7 @@ - + @@ -391,7 +391,7 @@
- +
- +
- +
- +


- +

diff --git a/src/theme/base/icons.less b/src/theme/base/icons.less index 325f1277..0aaadb3b 100644 --- a/src/theme/base/icons.less +++ b/src/theme/base/icons.less @@ -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; } diff --git a/src/theme/main.less b/src/theme/main.less index 4ef341ef..012beb7c 100644 --- a/src/theme/main.less +++ b/src/theme/main.less @@ -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'; diff --git a/yarn.lock b/yarn.lock index e909f0ae..493c680a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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"