diff --git a/.github/workflows/tests-3.2.yml b/.github/workflows/tests-3.2.yml index 08b6319..91da22b 100644 --- a/.github/workflows/tests-3.2.yml +++ b/.github/workflows/tests-3.2.yml @@ -19,14 +19,14 @@ jobs: steps: - name: Checkout phpBB - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: phpbb/phpbb ref: ${{ env.PHPBB_BRANCH }} path: phpBB3 - name: Checkout extension - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: path: phpBB3/phpBB/ext/${{ env.EXTNAME }} diff --git a/.gitignore b/.gitignore index d1ed8b3..0bfe817 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -components/* vendor/* composer.lock diff --git a/composer.json b/composer.json index ffdf60b..daa35d9 100644 --- a/composer.json +++ b/composer.json @@ -19,15 +19,13 @@ ], "require" : { "php" : ">=5.4", - "eonasdan/bootstrap-datetimepicker" : ">=4.17", - "fortawesome/font-awesome" : "~4.4.0" + "eonasdan/bootstrap-datetimepicker" : "^4.17.49", + "moment/moment" : "^2.30" }, - "config" : { - "allow-plugins" : { - "composer/installers" : true, - "oomphinc/composer-installers-extender" : true, - "robloach/component-installer" : true - } + "replace" : { + "components/jquery" : "*", + "oomphinc/composer-installers-extender" : "*", + "robloach/component-installer" : "*" }, "extra" : { "display-name" : "Hookup", diff --git a/composer.phar b/composer.phar deleted file mode 100644 index 4e49a20..0000000 Binary files a/composer.phar and /dev/null differ diff --git a/ext.php b/ext.php index 3ca8cae..48a2ddb 100644 --- a/ext.php +++ b/ext.php @@ -114,13 +114,9 @@ function is_enableable() break; case 'eonasdan/bootstrap-datetimepicker': $dep_files_to_search[$key] = __DIR__ . '/vendor/eonasdan/bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js'; - $dep_files_to_search[$key] = __DIR__ . '/vendor/moment/moment/min/moment.min.js'; - break; - case 'components/bootstrap': - $dep_files_to_search[$key] = __DIR__ . '/vendor/components/bootstrap/css/bootstrap.min.css'; break; - case 'fortawesome/font-awesome': - $dep_files_to_search[$key] = __DIR__ . '/vendor/fortawesome/font-awesome/fonts/fontawesome-webfont.eot'; + case 'moment/moment': + $dep_files_to_search[$key] = __DIR__ . '/vendor/moment/moment/min/moment.min.js'; break; case 'composer/package-versions-deprecated': case 'ocramius/proxy-manager': diff --git a/styles/prosilver/theme/hookup.css b/styles/prosilver/theme/hookup.css index 966cf08..e48aa5b 100644 --- a/styles/prosilver/theme/hookup.css +++ b/styles/prosilver/theme/hookup.css @@ -198,14 +198,7 @@ span.timepicker-hour:hover, span.timepicker-minute:hover, .picker-switch:hover { background-color: transparent; } -@font-face { - font-family:'FontAwesome'; - src:url('../../../vendor/fortawesome/font-awesome/fonts/fontawesome-webfont.eot?v=4.4.0'); - src:url('../../../vendor/fortawesome/font-awesome/fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'),url('../../../vendor/fortawesome/font-awesome/fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'),url('../../../vendor/fortawesome/font-awesome/fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'),url('../../../vendor/fortawesome/font-awesome/fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'),url('../../../vendor/fortawesome/font-awesome/fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg'); - font-weight:normal; - font-style:normal -} - +/* The FontAwesome font itself is provided by phpBB (assets/css/font-awesome.min.css) */ .glyphicon { position: relative; top: 1px;