Skip to content

Commit

Permalink
Convert FA icons to BS glyphicons (#789)
Browse files Browse the repository at this point in the history
Update BS glyphicons font
Remove FA font icons
  • Loading branch information
howdyjessie committed Nov 18, 2016
1 parent 61d8b4d commit 92ac4d5
Show file tree
Hide file tree
Showing 53 changed files with 1,375 additions and 6,899 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
@@ -0,0 +1,3 @@
*.woff binary
*.woff2 binary
*.ttf binary
5 changes: 1 addition & 4 deletions Makefile
Expand Up @@ -169,7 +169,6 @@ DETAILED_JS_SOURCE= $(JS)/respond.js \

DETAILED_SHARED_CSS_DEPS=$(CSS)/vendor/bootstrap.min.css \
$(CSS)/material-design/css/material-design-iconic-font.min.css \
$(CSS)/font-awesome/css/font-awesome.min.css \
$(COMMON)/styles/appheader.css

DETAILED_CSS_DEPS=$(DETAILED_ASSETS)/lib/slippry/slippry.css \
Expand Down Expand Up @@ -290,7 +289,6 @@ RE_JS_SOURCE=$(RE_ASSETS)/recordEdit.app.js \

RE_SHARED_CSS_DEPS=$(CSS)/vendor/bootstrap.min.css \
$(CSS)/material-design/css/material-design-iconic-font.min.css \
$(CSS)/font-awesome/css/font-awesome.min.css \
$(CSS)/vendor/select.css \
$(CSS)/vendor/select2.css \
$(CSS)/vendor/angular-datepicker.css \
Expand Down Expand Up @@ -324,8 +322,7 @@ RECSET_JS_SOURCE=$(COMMON)/authen.js \
$(RECSET_ASSETS)/recordset.js

RECSET_SHARED_CSS_DEPS=$(CSS)/vendor/bootstrap.min.css \
$(CSS)/material-design/css/material-design-iconic-font.min.css \
$(CSS)/font-awesome/css/font-awesome.min.css
$(CSS)/material-design/css/material-design-iconic-font.min.css

RECSET_CSS_SOURCE=$(RECSET_ASSETS)/app.css \
$(COMMON)/styles/app.css \
Expand Down
6 changes: 3 additions & 3 deletions common/templates/table.html
Expand Up @@ -5,9 +5,9 @@
<tr>
<th nowrap ng-repeat="col in vm.columns track by $index">
<span class="table-column-displayname" ng-class="{'coltooltiplabel': col.comment}" title="{{col.comment}}" ng-click="!col.isPseudo && sortby(col.name)">{{::col.displayname}}</span>
<span ng-show="!col.isPseudo && vm.sortby==col.name && vm.sortOrder=='asc'" ng-click="toggleSortOrder()" class="fa fa-sort-amount-asc" ng-style="{'cursor': 'pointer'}"></span>
<span ng-show="!col.isPseudo && vm.sortby==col.name && vm.sortOrder=='desc'" ng-click="toggleSortOrder()" class="fa fa-sort-amount-desc" ng-style="{'cursor': 'pointer'}"></span>
<span ng-show="!col.isPseudo && vm.sortby!==col.name" class="fa fa-fw fa-sort" ng-click="sortby(col.name)" ng-style="{'cursor': 'pointer'}"></span>
<span ng-show="!col.isPseudo && vm.sortby==col.name && vm.sortOrder=='asc'" ng-click="toggleSortOrder()" class="glyphicon glyphicon-sort-by-attributes" ng-style="{'cursor': 'pointer'}"></span>
<span ng-show="!col.isPseudo && vm.sortby==col.name && vm.sortOrder=='desc'" ng-click="toggleSortOrder()" class="glyphicon glyphicon-sort-by-attributes-alt" ng-style="{'cursor': 'pointer'}"></span>
<span ng-show="!col.isPseudo && vm.sortby!==col.name" class="glyphicon glyphicon-sort" ng-click="sortby(col.name)" ng-style="{'cursor': 'pointer'}"></span>
</th>
</tr>
</thead>
Expand Down
7 changes: 0 additions & 7 deletions styles/font-awesome/HELP-US-OUT.txt

This file was deleted.

0 comments on commit 92ac4d5

Please sign in to comment.