forked from civicrm/civicrm-core
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request civicrm#28912 from totten/master-deprecate-glyphicon
(dev/release#22) Greenwich - Phase-out/off-load Glyphicons
- Loading branch information
Showing
2 changed files
with
7 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -78,8 +78,13 @@ $headings-color: rgb(0, 0, 0); | |
// | ||
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. | ||
|
||
// (dev/release#22) The licensing around Bootstrap3 and glyphicons-halflings is confusing/FUDdy. It's _probably_ OK to redistribute these font files under | ||
// MIT-compatible licensing, but that's not clear. Regardless, `glyphicons` are deprecated within CiviCRM, so we generally don't need them. Using the CDN | ||
// means we don't have to distribute them -- but there's still a fallback for old/oddball addons which still reference glyphicons. | ||
|
||
//** Load fonts from this directory. | ||
$icon-font-path: "../extern/bootstrap3/assets/fonts/bootstrap/"; | ||
$icon-font-path: 'https://cdn.jsdelivr.net/npm/[email protected]/dist/fonts/'; | ||
// $icon-font-path: "../extern/bootstrap3/assets/fonts/bootstrap/"; | ||
//** File name for all font files. | ||
$icon-font-name: "glyphicons-halflings-regular"; | ||
//** Element ID within SVG icon file. | ||
|