diff options
Diffstat (limited to 'resources')
64 files changed, 41 insertions, 367 deletions
diff --git a/resources/css/clouds.css b/resources/css/clouds.css index d349156901..af8026457e 100755 --- a/resources/css/clouds.css +++ b/resources/css/clouds.css @@ -1132,30 +1132,10 @@ div.faq_body { background-size: cover; } -.icon-cfamily { - content: url(clouds/images/cfamily.png); -} - -.icon-childless { - content: url(images/childless.png); -} - .icon-children { content: url(images/children.png); } -.icon-edit_indi { - content: url(clouds/images/edit_indi.png); -} - -.icon-fam-list { - content: url(clouds/images/sfamily.png); -} - -.icon-indi-list { - content: url(clouds/images/indis.png); -} - .icon-loading-small { content: url(images/indicator.gif); } @@ -1398,18 +1378,10 @@ a > .wt-icon-arrow-up:hover { content: url(clouds/images/indis.png); } -.icon-patriarch { - content: url(clouds/images/patriarch.png); -} - .icon-pedigree { content: url(clouds/images/pedigree.png); } -.icon-sfamily { - content: url(clouds/images/sfamily.png); -} - .icon-user_add { content: url(clouds/images/user_add.png); } diff --git a/resources/css/clouds/images/cfamily.png b/resources/css/clouds/images/cfamily.png Binary files differdeleted file mode 100644 index 5006724cf6..0000000000 --- a/resources/css/clouds/images/cfamily.png +++ /dev/null diff --git a/resources/css/clouds/images/edit_indi.png b/resources/css/clouds/images/edit_indi.png Binary files differdeleted file mode 100644 index dfeb5f8277..0000000000 --- a/resources/css/clouds/images/edit_indi.png +++ /dev/null diff --git a/resources/css/clouds/images/patriarch.png b/resources/css/clouds/images/patriarch.png Binary files differdeleted file mode 100644 index 7f373ce7cc..0000000000 --- a/resources/css/clouds/images/patriarch.png +++ /dev/null diff --git a/resources/css/clouds/images/sfamily.png b/resources/css/clouds/images/sfamily.png Binary files differdeleted file mode 100644 index e5f8f755c3..0000000000 --- a/resources/css/clouds/images/sfamily.png +++ /dev/null diff --git a/resources/css/colors.css b/resources/css/colors.css index e7b4328451..66a3d07d89 100644 --- a/resources/css/colors.css +++ b/resources/css/colors.css @@ -482,22 +482,6 @@ div.faq_title { /*-- Fan chart ---- */ -.icon-cfamily { - content: url(colors/images/cfamily.png); -} - -.icon-edit_indi { - content: url(colors/images/edit_indi.png); -} - -.icon-fam-list { - content: url(colors/images/sfamily.png); -} - -.icon-indi-list { - content: url(colors/images/indis.png); -} - .icon-mypage { content: url(colors/images/mypage.png); } @@ -573,18 +557,10 @@ a > .wt-icon-arrow-up:hover { content: url(colors/images/mypage.png); } -.icon-patriarch { - content: url(colors/images/patriarch.png); -} - .icon-pedigree { content: url(colors/images/pedigree.png); } -.icon-sfamily { - content: url(colors/images/sfamily.png); -} - .icon-user_add { content: url(colors/images/user_add.png); } diff --git a/resources/css/colors/images/cfamily.png b/resources/css/colors/images/cfamily.png Binary files differdeleted file mode 100644 index 9a0a7adb07..0000000000 --- a/resources/css/colors/images/cfamily.png +++ /dev/null diff --git a/resources/css/colors/images/edit_indi.png b/resources/css/colors/images/edit_indi.png Binary files differdeleted file mode 100644 index cbc4fe8ea7..0000000000 --- a/resources/css/colors/images/edit_indi.png +++ /dev/null diff --git a/resources/css/colors/images/patriarch.png b/resources/css/colors/images/patriarch.png Binary files differdeleted file mode 100644 index 9672bb6bf9..0000000000 --- a/resources/css/colors/images/patriarch.png +++ /dev/null diff --git a/resources/css/colors/images/sfamily.png b/resources/css/colors/images/sfamily.png Binary files differdeleted file mode 100644 index b351530852..0000000000 --- a/resources/css/colors/images/sfamily.png +++ /dev/null diff --git a/resources/css/fab.css b/resources/css/fab.css index 9816028b02..c67b169bfa 100755 --- a/resources/css/fab.css +++ b/resources/css/fab.css @@ -1011,30 +1011,10 @@ a > .wt-icon-arrow-up:hover { } /* Miscellaneous images */ -.icon-cfamily { - content: url(fab/images/cfamily.png); -} - -.icon-childless { - content: url(images/childless.png); -} - .icon-children { content: url(images/children.png); } -.icon-edit_indi { - content: url(fab/images/edit_indi.png); -} - -.icon-fam-list { - content: url(fab/images/sfamily.png); -} - -.icon-indi-list { - content: url(fab/images/indis.png); -} - .icon-loading-small { content: url(images/indicator.gif); } @@ -1043,18 +1023,6 @@ a > .wt-icon-arrow-up:hover { content: url(icons/minus.png); } -.icon-mypage { - content: url(fab/images/mypage.png); -} - -.icon-pin-in { - content: url(fab/images/pin-in.png); -} - -.icon-pin-out { - content: url(fab/images/pin-out.png); -} - .icon-plus { content: url(icons/plus.png); } @@ -1079,10 +1047,6 @@ a > .wt-icon-arrow-up:hover { content: url(images/rings.png); } -.icon-selected { - content: url(fab/images/selected.png); -} - /* Silhouettes on charts */ .icon-silhouette-f { content: url(fab/images/silhouette_female_small.png); @@ -1105,26 +1069,6 @@ a > .wt-icon-arrow-up:hover { text-align: left; /* The theme menu is always LTR, even on RTL pages */ } -.icon-indis { - content: url(fab/images/indis.png); -} - -.icon-patriarch { - content: url(fab/images/patriarch.png); -} - -.icon-pedigree { - content: url(fab/images/pedigree.png); -} - -.icon-sfamily { - content: url(fab/images/sfamily.png); -} - -.icon-user_add { - content: url(fab/images/user_add.png); -} - /* Census assistant */ .wt-census-assistant-form-control:focus { min-width: 12rem; diff --git a/resources/css/fab/images/cfamily.png b/resources/css/fab/images/cfamily.png Binary files differdeleted file mode 100644 index 605ef01d03..0000000000 --- a/resources/css/fab/images/cfamily.png +++ /dev/null diff --git a/resources/css/fab/images/edit_indi.png b/resources/css/fab/images/edit_indi.png Binary files differdeleted file mode 100644 index 4303823993..0000000000 --- a/resources/css/fab/images/edit_indi.png +++ /dev/null diff --git a/resources/css/fab/images/indis.png b/resources/css/fab/images/indis.png Binary files differdeleted file mode 100644 index 79c3d7b625..0000000000 --- a/resources/css/fab/images/indis.png +++ /dev/null diff --git a/resources/css/fab/images/mypage.png b/resources/css/fab/images/mypage.png Binary files differdeleted file mode 100644 index 3a46dbb34e..0000000000 --- a/resources/css/fab/images/mypage.png +++ /dev/null diff --git a/resources/css/fab/images/patriarch.png b/resources/css/fab/images/patriarch.png Binary files differdeleted file mode 100644 index 6e4646c1f1..0000000000 --- a/resources/css/fab/images/patriarch.png +++ /dev/null diff --git a/resources/css/fab/images/pedigree.png b/resources/css/fab/images/pedigree.png Binary files differdeleted file mode 100644 index 5a1dfe9b15..0000000000 --- a/resources/css/fab/images/pedigree.png +++ /dev/null diff --git a/resources/css/fab/images/pin-in.png b/resources/css/fab/images/pin-in.png Binary files differdeleted file mode 100644 index bba02bc592..0000000000 --- a/resources/css/fab/images/pin-in.png +++ /dev/null diff --git a/resources/css/fab/images/pin-out.png b/resources/css/fab/images/pin-out.png Binary files differdeleted file mode 100644 index 2578e04689..0000000000 --- a/resources/css/fab/images/pin-out.png +++ /dev/null diff --git a/resources/css/fab/images/selected.png b/resources/css/fab/images/selected.png Binary files differdeleted file mode 100644 index c3c1c25802..0000000000 --- a/resources/css/fab/images/selected.png +++ /dev/null diff --git a/resources/css/fab/images/sfamily.png b/resources/css/fab/images/sfamily.png Binary files differdeleted file mode 100644 index 8b2270cae2..0000000000 --- a/resources/css/fab/images/sfamily.png +++ /dev/null diff --git a/resources/css/fab/images/user_add.png b/resources/css/fab/images/user_add.png Binary files differdeleted file mode 100644 index 7a511a376c..0000000000 --- a/resources/css/fab/images/user_add.png +++ /dev/null diff --git a/resources/css/images/childless.png b/resources/css/images/childless.png Binary files differdeleted file mode 100644 index 10f82fe6fe..0000000000 --- a/resources/css/images/childless.png +++ /dev/null diff --git a/resources/css/minimal.css b/resources/css/minimal.css index b859eb03e7..3973053989 100755 --- a/resources/css/minimal.css +++ b/resources/css/minimal.css @@ -681,90 +681,6 @@ div.faq_body { /* * Default icons are provided by FontAwesome. */ -.wt-icon-anniversary { -} - -.wt-icon-arrow-down { -} - -a > .wt-icon-arrow-down:hover { -} - -.wt-icon-arrow-left { -} - -a > .wt-icon-arrow-left:hover { -} - -.wt-icon-arrow-right { -} - -a > .wt-icon-arrow-right:hover { -} - -.wt-icon-arrow-up { -} - -a > .wt-icon-arrow-up:hover { -} - -.wt-icon-bing-maps { -} - -.wt-icon-calendar { -} - -.wt-icon-collapse { -} - -.wt-icon-coordinates { -} - -.wt-icon-copy { -} - -.wt-icon-delete { -} - -.wt-icon-edit { -} - -.wt-icon-expand { -} - -.wt-icon-family { -} - -.wt-icon-google-maps { -} - -.wt-icon-help { -} - -.wt-icon-individual { -} - -.wt-icon-keyboard { -} - -.wt-icon-media { -} - -.wt-icon-note { -} - -.wt-icon-openstreetmap { -} - -.wt-icon-preferences { -} - -.wt-icon-reorder { -} - -.wt-icon-repository { -} - .wt-icon-sex-f { color: var(--sex-f-fg); } @@ -781,45 +697,11 @@ a > .wt-icon-arrow-up:hover { color: var(--sex-x-fg); } -.wt-icon-source { -} - -.wt-icon-submitter { -} - -.wt-icon-warning { -} - -.wt-icon-zoom-in { -} - -.wt-icon-zoom-out { -} - /* Miscellaneous images */ -.icon-cfamily { -} - -.icon-childless { - content: url(images/childless.png); -} - .icon-children { content: url(images/children.png); } -.icon-edit_indi { - content: url(minimal/images/edit_indi.png); -} - -.icon-fam-list { - content: url(minimal/images/sfamily.png); -} - -.icon-indi-list { - content: url(minimal/images/indis.png); -} - .icon-loading-small { content: url(images/indicator.gif); } @@ -832,42 +714,14 @@ a > .wt-icon-arrow-up:hover { content: url(icons/minus.png); } -.icon-mypage { - content: url(minimal/images/mypage.png); -} - .icon-plus { content: url(icons/plus.png); } -.icon-resn-confidential { - content: none; -} - -.icon-resn-locked { - content: none; -} - -.icon-resn-none { - content: none; -} - -.icon-resn-privacy { - content: none; -} - .icon-rings { content: url(images/rings.png); } -.icon-selected { - content: url(minimal/images/selected.png); -} - -.icon-sfamily { - content: url(minimal/images/sfamily.png); -} - /* Silhouettes on charts */ .icon-silhouette-f { content: url(minimal/images/silhouette_female_small.png); @@ -882,14 +736,6 @@ a > .wt-icon-arrow-up:hover { content: url(minimal/images/silhouette_unknown_small.png); } -.icon-indis { - content: url(minimal/images/indis.png); -} - -.icon-pedigree { - content: url(minimal/images/pedigree.png); -} - /* Census assistant */ .wt-census-assistant-form-control:focus { min-width: 12rem; diff --git a/resources/css/minimal/images/edit_indi.png b/resources/css/minimal/images/edit_indi.png Binary files differdeleted file mode 100644 index fe99f49c78..0000000000 --- a/resources/css/minimal/images/edit_indi.png +++ /dev/null diff --git a/resources/css/minimal/images/indis.png b/resources/css/minimal/images/indis.png Binary files differdeleted file mode 100644 index ec22a41e55..0000000000 --- a/resources/css/minimal/images/indis.png +++ /dev/null diff --git a/resources/css/minimal/images/mypage.png b/resources/css/minimal/images/mypage.png Binary files differdeleted file mode 100644 index eac878a4a3..0000000000 --- a/resources/css/minimal/images/mypage.png +++ /dev/null diff --git a/resources/css/minimal/images/pedigree.png b/resources/css/minimal/images/pedigree.png Binary files differdeleted file mode 100644 index d8dae6dfb1..0000000000 --- a/resources/css/minimal/images/pedigree.png +++ /dev/null diff --git a/resources/css/minimal/images/selected.png b/resources/css/minimal/images/selected.png Binary files differdeleted file mode 100644 index 8cd36aabd1..0000000000 --- a/resources/css/minimal/images/selected.png +++ /dev/null diff --git a/resources/css/minimal/images/sfamily.png b/resources/css/minimal/images/sfamily.png Binary files differdeleted file mode 100644 index 728294da1f..0000000000 --- a/resources/css/minimal/images/sfamily.png +++ /dev/null diff --git a/resources/css/webtrees.css b/resources/css/webtrees.css index b9e70adadb..a3603e0152 100755 --- a/resources/css/webtrees.css +++ b/resources/css/webtrees.css @@ -1231,30 +1231,10 @@ a > .wt-icon-arrow-up:hover { } /* Miscellaneous images */ -.icon-cfamily { - content: url(webtrees/images/family.png); -} - -.icon-childless { - content: url(images/childless.png); -} - .icon-children { content: url(images/children.png); } -.icon-edit_indi { - content: url(webtrees/images/edit_indi.png); -} - -.icon-fam-list { - content: url(webtrees/images/family.png); -} - -.icon-indi-list { - content: url(webtrees/images/indis.png); -} - .icon-loading-small { content: url(images/indicator.gif); } @@ -1313,18 +1293,10 @@ a > .wt-icon-arrow-up:hover { content: url(webtrees/images/indis.png); } -.icon-patriarch { - content: url(webtrees/images/patriarch.png); -} - .icon-pedigree { content: url(webtrees/images/pedigree.png); } -.icon-sfamily { - content: url(webtrees/images/family.png); -} - .icon-user_add { content: url(webtrees/images/user_add.png); } diff --git a/resources/css/webtrees/images/edit_indi.png b/resources/css/webtrees/images/edit_indi.png Binary files differdeleted file mode 100644 index f0407aa2c9..0000000000 --- a/resources/css/webtrees/images/edit_indi.png +++ /dev/null diff --git a/resources/css/webtrees/images/family.png b/resources/css/webtrees/images/family.png Binary files differdeleted file mode 100644 index c4ecc6c12d..0000000000 --- a/resources/css/webtrees/images/family.png +++ /dev/null diff --git a/resources/css/webtrees/images/patriarch.png b/resources/css/webtrees/images/patriarch.png Binary files differdeleted file mode 100644 index 9b7f5c205f..0000000000 --- a/resources/css/webtrees/images/patriarch.png +++ /dev/null diff --git a/resources/css/xenea.css b/resources/css/xenea.css index 6a7eae4827..7354b44583 100755 --- a/resources/css/xenea.css +++ b/resources/css/xenea.css @@ -1366,30 +1366,10 @@ a > .wt-icon-arrow-up:hover { } /* Miscellaneous images */ -.icon-cfamily { - content: url(xenea/images/cfamily.png); -} - -.icon-childless { - content: url(images/childless.png); -} - .icon-children { content: url(images/children.png); } -.icon-edit_indi { - content: url(xenea/images/edit_indi.png); -} - -.icon-fam-list { - content: url(xenea/images/cfamily.png); -} - -.icon-indi-list { - content: url(xenea/images/indis.png); -} - .icon-loading-small { content: url(images/indicator.gif); } @@ -1448,18 +1428,10 @@ a > .wt-icon-arrow-up:hover { content: url(xenea/images/indis.png); } -.icon-patriarch { - content: url(xenea/images/patriarch.png); -} - .icon-pedigree { content: url(xenea/images/pedigree.png); } -.icon-sfamily { - content: url(xenea/images/sfamily.png); -} - .icon-user_add { content: url(xenea/images/user_add.png); } diff --git a/resources/css/xenea/images/cfamily.png b/resources/css/xenea/images/cfamily.png Binary files differdeleted file mode 100644 index 528057d568..0000000000 --- a/resources/css/xenea/images/cfamily.png +++ /dev/null diff --git a/resources/css/xenea/images/edit_indi.png b/resources/css/xenea/images/edit_indi.png Binary files differdeleted file mode 100644 index 3ca2c719da..0000000000 --- a/resources/css/xenea/images/edit_indi.png +++ /dev/null diff --git a/resources/css/xenea/images/patriarch.png b/resources/css/xenea/images/patriarch.png Binary files differdeleted file mode 100644 index 2e6731daf8..0000000000 --- a/resources/css/xenea/images/patriarch.png +++ /dev/null diff --git a/resources/css/xenea/images/readme.txt b/resources/css/xenea/images/readme.txt deleted file mode 100644 index f0e0f12bcb..0000000000 --- a/resources/css/xenea/images/readme.txt +++ /dev/null @@ -1,13 +0,0 @@ -This set of images for the phpGedView project is of free use. -Author: Cruzul. -Some elements of the imagens belong to the Crystal series by Everaldo Coello. -Cruzul: Ricardo Lago Couce -Homepage: http://www.xenealoxia.org - - -Conectiva Crystal is a contemporary icon design sponsored by (and used by default in) the Conectiva Linux [www.conectiva.com.br] distribution. -Author: Everaldo Coelho. -License: GPL. -Website: http://www.everaldo.com/crystal/index.html - - diff --git a/resources/css/xenea/images/sfamily.png b/resources/css/xenea/images/sfamily.png Binary files differdeleted file mode 100644 index 34047fa973..0000000000 --- a/resources/css/xenea/images/sfamily.png +++ /dev/null diff --git a/resources/js/vendor.js b/resources/js/vendor.js index de09f19f85..7e64caa3a2 100644 --- a/resources/js/vendor.js +++ b/resources/js/vendor.js @@ -36,7 +36,7 @@ window.bootstrap = { import { dom, library } from '@fortawesome/fontawesome-svg-core'; import { // For resources/views/icons/* - faBell, faCopy, faEnvelope, faFile, faFileAlt, faFileImage, faFolder, faKeyboard, + faAddressCard, faBell, faCopy, faEnvelope, faFile, faFileAlt, faFileImage, faFolder, faKeyboard, faMinusSquare, faPlusSquare, faStar, faStickyNote, faTrashAlt, faUser } from '@fortawesome/free-regular-svg-icons'; import { @@ -87,7 +87,7 @@ window.$ = window.jQuery = $; library.add( // For resources/views/icons/* - faBell, faCopy, faEnvelope, faFile, faFileAlt, faFileImage, faFolder, faKeyboard, + faAddressCard, faBell, faCopy, faEnvelope, faFile, faFileAlt, faFileImage, faFolder, faKeyboard, faMap, faMinusSquare, faPlusSquare, faStar, faStickyNote, faTags, faTrashAlt, faUser ); library.add( diff --git a/resources/views/chart-box.phtml b/resources/views/chart-box.phtml index 2de0ffb399..851cde41ab 100644 --- a/resources/views/chart-box.phtml +++ b/resources/views/chart-box.phtml @@ -101,10 +101,9 @@ $id = Registry::idFactory()->id(); <?php if ($individual->canShow()) : ?> <div class="wt-chart-box-extra d-print-none float-end ms-1"> <div class="dropdown position-static wt-chart-box-zoom"> - <a class="wt-chart-box-icon" href="#" role="button" id="chart-box-zoom-<?= $id ?>" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <div ><?= view('icons/zoom-in') ?></div> + <a class="wt-chart-box-icon" href="#" role="button" id="chart-box-zoom-<?= $id ?>" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="<?= I18N::translate('Zoom in') ?>"> + <div><?= view('icons/zoom-in') ?></div> <div class="d-none"><?= view('icons/zoom-out') ?></div> - <span class="visually-hidden"><?= I18N::translate('Links') ?></span> </a> <div class="dropdown-menu dropdown-menu-end wt-chart-box-dropdown wt-chart-box-zoom-dropdown" style="position: inherit" aria-labelledby="#chart-box-zoom-<?= $id ?>"> @@ -115,9 +114,10 @@ $id = Registry::idFactory()->id(); </div> <div class="dropdown position-static wt-chart-box-links"> - <a class="wt-chart-box-icon" href="#" role="button" id="chart-box-menu-<?= $id ?>" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <i class="icon-pedigree" title="<?= I18N::translate('Links') ?>"></i> - <span class="visually-hidden"><?= I18N::translate('Links') ?></span> + <a class="wt-chart-box-icon" href="#" role="button" id="chart-box-menu-<?= $id ?>" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="<?= I18N::translate('Links') ?>"> + <span class="icon-pedigree"> + <?= view('icons/menu') ?> + </span> </a> <div class="dropdown-menu dropdown-menu-end wt-chart-box-dropdown wt-chart-box-links-dropdown" style="position: inherit" aria-labelledby="#chart-box-menu-<?= $id ?>"> diff --git a/resources/views/icons/account.phtml b/resources/views/icons/account.phtml new file mode 100644 index 0000000000..10fe021757 --- /dev/null +++ b/resources/views/icons/account.phtml @@ -0,0 +1 @@ +<span class="wt-icon-account"><i class="fa-regular fa-address-card fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/anniversary.phtml b/resources/views/icons/anniversary.phtml index 97e230588a..3216d8c0df 100644 --- a/resources/views/icons/anniversary.phtml +++ b/resources/views/icons/anniversary.phtml @@ -1 +1 @@ -<span class="wt-icon-anniversary"><i class="far fa-bell fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-anniversary"><i class="fa-regular fa-bell fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/block-user.phtml b/resources/views/icons/block-user.phtml index c2dfb275b1..38c9225cb7 100644 --- a/resources/views/icons/block-user.phtml +++ b/resources/views/icons/block-user.phtml @@ -1 +1 @@ -<span class="wt-icon-block-user"><i class="far fa-user fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-block-user"><i class="fa-regular fa-user fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/copy.phtml b/resources/views/icons/copy.phtml index aa1932129a..6bc12abb32 100644 --- a/resources/views/icons/copy.phtml +++ b/resources/views/icons/copy.phtml @@ -1 +1 @@ -<span class="wt-icon-copy"><i class="far fa-copy fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-copy"><i class="fa-regular fa-copy fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/delete.phtml b/resources/views/icons/delete.phtml index 9d4dfca520..5b2a2676b0 100644 --- a/resources/views/icons/delete.phtml +++ b/resources/views/icons/delete.phtml @@ -1 +1 @@ -<span class="wt-icon-delete"><i class="far fa-trash-alt fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-delete"><i class="fa-regular fa-trash-alt fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/email.phtml b/resources/views/icons/email.phtml index 55478f5476..f6b516d2a8 100644 --- a/resources/views/icons/email.phtml +++ b/resources/views/icons/email.phtml @@ -1 +1 @@ -<span class="wt-icon-email"><i class="far fa-envelope fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-email"><i class="fa-regular fa-envelope fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/favorite.phtml b/resources/views/icons/favorite.phtml index d9b20b7837..3209f772db 100644 --- a/resources/views/icons/favorite.phtml +++ b/resources/views/icons/favorite.phtml @@ -1 +1 @@ -<span class="wt-icon-favorite"><i class="far fa-star fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-favorite"><i class="fa-regular fa-star fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/file.phtml b/resources/views/icons/file.phtml index 4a56cad95e..b4cfd09896 100644 --- a/resources/views/icons/file.phtml +++ b/resources/views/icons/file.phtml @@ -1 +1 @@ -<span class="wt-icon-file"><i class="far fa-file fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-file"><i class="fa-regular fa-file fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/folder.phtml b/resources/views/icons/folder.phtml index 7f0d3c7a00..b3be7256d5 100644 --- a/resources/views/icons/folder.phtml +++ b/resources/views/icons/folder.phtml @@ -1 +1 @@ -<span class="wt-icon-folder"><i class="far fa-folder fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-folder"><i class="fa-regular fa-folder fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/individual.phtml b/resources/views/icons/individual.phtml index 75e0ba2717..b5f0451938 100644 --- a/resources/views/icons/individual.phtml +++ b/resources/views/icons/individual.phtml @@ -1 +1 @@ -<span class="wt-icon-individual"><i class="far fa-user fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-individual"><i class="fa-regular fa-user fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/keyboard.phtml b/resources/views/icons/keyboard.phtml index d722c2ef4c..2e4206eaa2 100644 --- a/resources/views/icons/keyboard.phtml +++ b/resources/views/icons/keyboard.phtml @@ -1 +1 @@ -<span class="wt-icon-keyboard"><i class="far fa-keyboard" aria-hidden="true"></i></span><?php +<span class="wt-icon-keyboard"><i class="fa-regular fa-keyboard" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/media.phtml b/resources/views/icons/media.phtml index 6ec2c2e33a..c47c2e48e5 100644 --- a/resources/views/icons/media.phtml +++ b/resources/views/icons/media.phtml @@ -1 +1 @@ -<span class="wt-icon-media"><i class="far fa-file-image fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-media"><i class="fa-regular fa-file-image fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/note.phtml b/resources/views/icons/note.phtml index 7913366b31..75bebee88a 100644 --- a/resources/views/icons/note.phtml +++ b/resources/views/icons/note.phtml @@ -1 +1 @@ -<span class="wt-icon-note"><i class="far fa-sticky-note fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-note"><i class="fa-regular fa-sticky-note fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/report.phtml b/resources/views/icons/report.phtml index 01b3956976..e04dc2698d 100644 --- a/resources/views/icons/report.phtml +++ b/resources/views/icons/report.phtml @@ -1 +1 @@ -<span class="wt-icon-report"><i class="far fa-file fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-report"><i class="fa-regular fa-file fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/source.phtml b/resources/views/icons/source.phtml index e4a86008a8..f0bcca568f 100644 --- a/resources/views/icons/source.phtml +++ b/resources/views/icons/source.phtml @@ -1 +1 @@ -<span class="wt-icon-source"><i class="far fa-file-alt fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-source"><i class="fa-regular fa-file-alt fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/submitter.phtml b/resources/views/icons/submitter.phtml index a1c041b7c7..4c38b33e68 100644 --- a/resources/views/icons/submitter.phtml +++ b/resources/views/icons/submitter.phtml @@ -1 +1 @@ -<span class="wt-icon-submitter"><i class="far fa-user fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-submitter"><i class="fa-regular fa-user fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/tab.phtml b/resources/views/icons/tab.phtml index 4bd7d02f58..38371639e1 100644 --- a/resources/views/icons/tab.phtml +++ b/resources/views/icons/tab.phtml @@ -1 +1 @@ -<span class="wt-icon-theme"><i class="far fa-folder fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-theme"><i class="fa-regular fa-folder fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/icons/user.phtml b/resources/views/icons/user.phtml index d4358829d0..8a572c4bf4 100644 --- a/resources/views/icons/user.phtml +++ b/resources/views/icons/user.phtml @@ -1 +1 @@ -<span class="wt-icon-user"><i class="far fa-user fa-fw" aria-hidden="true"></i></span><?php +<span class="wt-icon-user"><i class="fa-regular fa-user fa-fw" aria-hidden="true"></i></span><?php diff --git a/resources/views/modules/family_nav/sidebar-family.phtml b/resources/views/modules/family_nav/sidebar-family.phtml index b6955af05e..e638eae682 100644 --- a/resources/views/modules/family_nav/sidebar-family.phtml +++ b/resources/views/modules/family_nav/sidebar-family.phtml @@ -32,7 +32,7 @@ use Fisharebest\Webtrees\Services\RelationshipService; <th class="align-middle wt-family-navigator-label" scope="row"> <?php if ($spouse === $individual) : ?> <?= $relationship_service->getCloseRelationshipName($individual, $spouse) ?> - <i class="icon-selected"></i> + <span class="icon-selected"><?= view('icons/user') ?></span> <?php elseif ($spouse->childFamilies()->isNotEmpty()) : ?> <div class="dropdown"> <a class="dropdown-toggle" href="#" role="button" id="dropdown-<?= e($spouse->xref()) ?>" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> @@ -80,7 +80,7 @@ use Fisharebest\Webtrees\Services\RelationshipService; <th class="align-middle wt-family-navigator-label" scope="row"> <?php if ($child === $individual) : ?> <?= $relationship_service->getCloseRelationshipName($individual, $child) ?> - <i class="icon-selected"></i> + <span class="icon-selected"><?= view('icons/user') ?></span> <?php elseif ($child->spouseFamilies()->isNotEmpty()) : ?> <div class="dropdown"> <a class="dropdown-toggle" href="#" role="button" id="dropdown-<?= e($child->xref()) ?>" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> diff --git a/resources/views/modules/gedcom_block/welcome.phtml b/resources/views/modules/gedcom_block/welcome.phtml index c575532709..1f5c89a642 100644 --- a/resources/views/modules/gedcom_block/welcome.phtml +++ b/resources/views/modules/gedcom_block/welcome.phtml @@ -11,7 +11,7 @@ declare(strict_types=1); <?php foreach ($links as $link) : ?> <div class="text-center m-1"> <a href="<?= e($link['url']) ?>"> - <i class="<?= $link['icon'] ?>"></i> + <span class="<?= $link['class'] ?>"><?= $link['icon'] ?></span> <br> <?= $link['title'] ?> </a> diff --git a/resources/views/modules/relatives/family.phtml b/resources/views/modules/relatives/family.phtml index fc9763736e..e5a6919184 100644 --- a/resources/views/modules/relatives/family.phtml +++ b/resources/views/modules/relatives/family.phtml @@ -45,8 +45,10 @@ use Fisharebest\Webtrees\Services\RelationshipService; ?> <tr class="<?= $row_class ?>"> <th scope="row"> - <?= $individual === $person ? '<i class="icon-selected"></i>' : '' ?> <?= $relationship_service->getCloseRelationshipName($individual, $person) ?> + <?php if ($individual === $person) : ?> + <span class="icon-selected"><?= view('icons/user') ?></span> + <?php endif ?> </th> <td class="border-0 p-0"> <?= view('chart-box', ['individual' => $person]) ?> @@ -83,8 +85,10 @@ use Fisharebest\Webtrees\Services\RelationshipService; <tr class="<?= $row_class ?>"> <th scope="row"> - <?= $individual === $person ? '<i class="icon-selected"></i>' : '' ?> <?= $relationship_service->getCloseRelationshipName($individual, $person) ?> + <?php if ($individual === $person) : ?> + <span class="icon-selected"><?= view('icons/user') ?></span> + <?php endif ?> </th> <td class="border-0 p-0"> <?= view('chart-box', ['individual' => $person]) ?> @@ -179,10 +183,6 @@ use Fisharebest\Webtrees\Services\RelationshipService; <tr class="<?= $row_class ?>"> <th scope="row"> - <?php if ($individual === $person) : ?> - <i class="icon-selected"></i> - <?php endif ?> - <?php if ($prev->isOK() && $next->isOK()) : ?> <div class="wt-date-difference collapse small"> <?php $days = $next->maximumJulianDay() - $prev->minimumJulianDay(); ?> @@ -200,6 +200,10 @@ use Fisharebest\Webtrees\Services\RelationshipService; <?php endif ?> <?= $relationship_service->getCloseRelationshipName($individual, $person) ?> + + <?php if ($individual === $person) : ?> + <span class="icon-selected"><?= view('icons/user') ?></span> + <?php endif ?> </th> <td class="border-0 p-0"> <?= view('chart-box', ['individual' => $person]) ?> diff --git a/resources/views/modules/user_welcome/welcome.phtml b/resources/views/modules/user_welcome/welcome.phtml index ff0dbe6f94..1f5c89a642 100644 --- a/resources/views/modules/user_welcome/welcome.phtml +++ b/resources/views/modules/user_welcome/welcome.phtml @@ -3,7 +3,7 @@ declare(strict_types=1); /** - * @var array<array<string,string>> $links + * @var array<string,array<string,string>> $links */ ?> @@ -11,7 +11,7 @@ declare(strict_types=1); <?php foreach ($links as $link) : ?> <div class="text-center m-1"> <a href="<?= e($link['url']) ?>"> - <i class="<?= $link['icon'] ?>"></i> + <span class="<?= $link['class'] ?>"><?= $link['icon'] ?></span> <br> <?= $link['title'] ?> </a> |
