Skip to content
Permalink
Browse files

Remove override for Icon

  • Loading branch information...
Thoulah committed Jun 29, 2019
1 parent da4186d commit 341171bb881d02f1d09c232a9b16c78b9721494d
Showing with 1,065 additions and 1,076 deletions.
  1. +1 −0 composer.json
  2. +45 −33 composer.lock
  3. +3 −0 cs/Config.php
  4. +3 −5 mister42/Common.php
  5. +10 −9 mister42/assets/AppAsset.php
  6. +2 −2 mister42/assets/AppAssetCompress.php
  7. +4 −4 mister42/assets/ClipboardJsAsset.php
  8. +24 −0 mister42/assets/FileInputAsset.php
  9. +6 −6 mister42/assets/HighlightAsset.php
  10. +4 −4 mister42/assets/Html2MarkdownAsset.php
  11. +0 −26 mister42/assets/InputFileAsset.php
  12. +6 −6 mister42/assets/LightboxAsset.php
  13. +2 −2 mister42/assets/TimePickerAsset.php
  14. +9 −9 mister42/commands/LyricsController.php
  15. +74 −74 mister42/controllers/ArticlesController.php
  16. +16 −17 mister42/controllers/CalculatorController.php
  17. +17 −18 mister42/controllers/FeedController.php
  18. +51 −51 mister42/controllers/MusicController.php
  19. +17 −18 mister42/controllers/MyController.php
  20. +44 −45 mister42/controllers/SiteController.php
  21. +16 −17 mister42/controllers/ToolsController.php
  22. +28 −28 mister42/controllers/user/ProfileController.php
  23. +15 −11 mister42/models/ActiveForm.php
  24. +9 −10 mister42/models/Console.php
  25. +0 −15 mister42/models/Icon.php
  26. +6 −7 mister42/models/Mailer.php
  27. +9 −9 mister42/models/Menu.php
  28. +30 −31 mister42/models/Video.php
  29. +9 −9 mister42/models/Webrequest.php
  30. +49 −49 mister42/models/articles/Articles.php
  31. +55 −55 mister42/models/articles/ArticlesComments.php
  32. +11 −11 mister42/models/calculator/Date.php
  33. +9 −9 mister42/models/calculator/Duration.php
  34. +13 −13 mister42/models/calculator/Office365.php
  35. +11 −11 mister42/models/calculator/Timezone.php
  36. +9 −9 mister42/models/calculator/Wpapsk.php
  37. +7 −7 mister42/models/feed/Sitemap.php
  38. +26 −27 mister42/models/music/Collection.php
  39. +12 −13 mister42/models/music/Lyrics1Artists.php
  40. +29 −29 mister42/models/music/Lyrics2Albums.php
  41. +28 −28 mister42/models/music/Lyrics3Tracks.php
  42. +4 −5 mister42/models/music/Lyrics4Lyrics.php
  43. +6 −6 mister42/models/music/LyricsArtistInfo.php
  44. +16 −16 mister42/models/my/Contact.php
  45. +15 −15 mister42/models/tools/Barcode.php
  46. +10 −10 mister42/models/tools/Favicon.php
  47. +6 −6 mister42/models/tools/Oui.php
  48. +23 −23 mister42/models/tools/PhoneticAlphabet.php
  49. +45 −45 mister42/models/tools/Qr.php
  50. +10 −10 mister42/models/tools/qr/Bitcoin.php
  51. +10 −10 mister42/models/tools/qr/Bookmark.php
  52. +11 −11 mister42/models/tools/qr/EmailMessage.php
  53. +9 −9 mister42/models/tools/qr/FreeInput.php
  54. +12 −12 mister42/models/tools/qr/Geographic.php
  55. +11 −11 mister42/models/tools/qr/Ical.php
  56. +10 −10 mister42/models/tools/qr/MMS.php
  57. +9 −9 mister42/models/tools/qr/MailTo.php
  58. +18 −18 mister42/models/tools/qr/MeCard.php
  59. +9 −9 mister42/models/tools/qr/Phone.php
  60. +17 −17 mister42/models/tools/qr/Vcard.php
  61. +17 −17 mister42/models/tools/qr/WiFi.php
  62. +9 −9 mister42/models/tools/qr/YouTube.php
  63. +10 −10 mister42/models/user/Profile.php
  64. +5 −5 mister42/models/user/RecentTracks.php
  65. +4 −5 mister42/tests/ControllerTest.php
  66. +1 −1 mister42/tests/FormatterTest.php
  67. +1 −1 mister42/tests/VideoTest.php
  68. +1 −1 mister42/views/articles/_formArticle.php
  69. +1 −1 mister42/views/articles/_formComment.php
  70. +1 −1 mister42/views/calculator/wpapsk.php
  71. +3 −3 mister42/views/layouts/columns.php
  72. +1 −1 mister42/views/music/lyrics-album-pdf.php
  73. +1 −1 mister42/views/music/lyrics3tracks.php
  74. +4 −4 mister42/views/my/contact.php
  75. +2 −2 mister42/views/tools/favicon.php
  76. +1 −1 mister42/widgets/Feed.php
  77. +1 −1 mister42/widgets/Item.php
  78. +19 −19 mister42/widgets/TimePicker.php
  79. +7 −8 mr42/Web.php
  80. +6 −6 mr42/models/Articles.php
@@ -22,6 +22,7 @@
"yiisoft/yii2-swiftmailer": "~2.1.0",
"bower-asset/jqueryui-timepicker-addon": "^1.6",
"bower-asset/to-markdown": "^3.0",
"npm-asset/bs-custom-file-input": "^1.3",
"npm-asset/highlightjs": "^9.0",
"npm-asset/lightbox2": "^2.0",
"2amigos/yii2-usuario": "~1.0",

Some generated files are not rendered by default. Learn more.

@@ -18,6 +18,9 @@ public function __construct($name = 'mr42-cs-config')
$this->setRules([
'@PSR2' => true,
'ordered_class_elements' => [
'sortAlgorithm' => 'alpha',
],
]);
}
}
@@ -87,11 +87,9 @@ private function getComponents(): array
'class' => 'app\models\Formatter',
],
'icon' => [
'class' => 'app\models\Icon',
'config' => [
'prefix' => 'icon',
'registerAssets' => false,
],
'class' => 'thoulah\fontawesome\IconComponent',
'prefix' => 'icon',
'registerAssets' => false,
],
'i18n' => [
'translations' => [
@@ -8,24 +8,25 @@
class AppAsset extends AssetBundle
{
public $sourcePath = '@runtime/assets/css';
public $css = [
'site.css',
];
public $js = [
];
public $depends = [
'yii\web\YiiAsset',
'yii\bootstrap4\BootstrapAsset',
];
public function init(): void
public $js = [
];
public $sourcePath = '@runtime/assets/css';
public function registerAssetFiles($view): void
{
Yii::$app->view->registerJs(Yii::$app->formatter->jspack('scrolltop.js'), View::POS_READY);
Yii::$app->view->registerJs(Yii::$app->formatter->jspack('targetBlank.js'), View::POS_READY);
Yii::$app->view->registerJs('$(function(){$(\'[data-toggle="tooltip"]\').tooltip()});', View::POS_READY);
parent::registerAssetFiles($view);
$view->registerJs(Yii::$app->formatter->jspack('scrolltop.js'), View::POS_READY);
$view->registerJs(Yii::$app->formatter->jspack('targetBlank.js'), View::POS_READY);
$view->registerJs('$(function(){$(\'[data-toggle="tooltip"]\').tooltip()});', View::POS_READY);
}
}
@@ -6,12 +6,12 @@
class AppAssetCompress extends AssetBundle
{
public $sourcePath = '@app/assets/css';
public $css = [
'site.scss',
];
public $js = [
];
public $sourcePath = '@app/assets/css';
}
@@ -8,15 +8,15 @@
class ClipboardJsAsset extends AssetBundle
{
public $sourcePath = '@bower/../zenorocha/clipboardjs/dist';
public $depends = [
'app\assets\AppAsset',
];
public $js = [
'clipboard.min.js',
];
public $depends = [
'app\assets\AppAsset',
];
public $sourcePath = '@vendor/zenorocha/clipboardjs/dist';
public function registerAssetFiles($view): void
{
@@ -0,0 +1,24 @@
<?php
namespace app\assets;
use Yii;
use yii\bootstrap4\Html;
use yii\helpers\Json;
use yii\web\AssetBundle;
use yii\web\View;
class FileInputAsset extends AssetBundle
{
public $js = [
'bs-custom-file-input.min.js',
];
public $sourcePath = '@npm/bs-custom-file-input/dist';
public function registerAssetFiles($view): void
{
parent::registerAssetFiles($view);
$view->registerJs("bsCustomFileInput.init();", View::POS_READY);
}
}
@@ -7,12 +7,6 @@
class HighlightAsset extends AssetBundle
{
public $sourcePath = '@npm/highlightjs/';
public $js = [
'highlight.pack' . (YII_DEBUG ? '' : '.min') . '.js',
];
public $css = [
'styles/default.css',
];
@@ -21,6 +15,12 @@ class HighlightAsset extends AssetBundle
'yii\web\JqueryAsset',
];
public $js = [
'highlight.pack' . (YII_DEBUG ? '' : '.min') . '.js',
];
public $sourcePath = '@npm/highlightjs/';
public static function register($view)
{
$view->registerJs('hljs.initHighlightingOnLoad();', View::POS_END);
@@ -8,15 +8,15 @@
class Html2MarkdownAsset extends AssetBundle
{
public $sourcePath = '@bower/to-markdown/dist';
public $depends = [
'app\assets\AppAsset',
];
public $js = [
'to-markdown.js',
];
public $depends = [
'app\assets\AppAsset',
];
public $sourcePath = '@bower/to-markdown/dist';
public function registerAssetFiles($view): void
{

0 comments on commit 341171b

Please sign in to comment.
You can’t perform that action at this time.