Skip to content

Commit

Permalink
Merge pull request civicrm#28912 from totten/master-deprecate-glyphicon
Browse files Browse the repository at this point in the history
(dev/release#22) Greenwich - Phase-out/off-load Glyphicons
  • Loading branch information
colemanw authored Jun 18, 2024
2 parents d0d66be + f48bab0 commit 25c57d3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
"url": "https://github.com/twbs/bootstrap-sass/archive/v{$version}.zip",
"path": "ext/greenwich/extern/bootstrap3",
"version": "3.4.1",
"ignore": ["test", "tasks", "lib"]
"ignore": ["fonts", "test", "tasks", "lib"]
},
"font-awesome": {
"url": "https://github.com/FortAwesome/Font-Awesome/archive/v4.7.0.zip",
Expand Down
7 changes: 6 additions & 1 deletion ext/greenwich/scss/_greenwich.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 25c57d3

Please sign in to comment.