Skip to content

Commit

Permalink
Merge pull request EC-CUBE#5969 from Atsu0601/atsu-fontawesome
Browse files Browse the repository at this point in the history
fontawesomeにintegrity追加
  • Loading branch information
shinya authored May 25, 2023
2 parents 417a699 + a586231 commit 56310f7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/Eccube/Resource/template/admin/default_frame.twig
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ file that was distributed with this source code.
<meta name="eccube-csrf-token" content="{{ csrf_token(constant('Eccube\\Common\\Constant::TOKEN_NAME')) }}">
<title>{{ block('sub_title') }} {{ block('title') }} - {{ BaseInfo.shop_name }}</title>
<link rel="icon" href="{{ asset('assets/img/favicon.ico', 'admin') }}">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/v4-shims.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/v4-shims.css" integrity="sha384-lmquXrF9qn7mMo6iRQ662vN44vTTVUBpcdtDFWPxD9uFPqC/aMn6pcQrTTupiv1A" crossorigin="anonymous">
<link rel="stylesheet" href="{{ asset('assets/css/bootstrap.css', 'admin') }}">
<link rel="stylesheet" href="{{ asset('assets/css/app.css', 'admin') }}">
<script src="{{ asset('admin.bundle.js', 'bundle') }}"></script>
Expand Down
4 changes: 2 additions & 2 deletions src/Eccube/Resource/template/admin/error.twig
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ file that was distributed with this source code.
<title>{{ error_title }}</title>
<meta name="robots" content="noindex,nofollow"/>
<link rel="icon" href="{{ asset('assets/img/favicon.ico', 'admin') }}">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/v4-shims.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/v4-shims.css" integrity="sha384-lmquXrF9qn7mMo6iRQ662vN44vTTVUBpcdtDFWPxD9uFPqC/aMn6pcQrTTupiv1A" crossorigin="anonymous">
<link rel="stylesheet" href="{{ asset('assets/css/bootstrap.css', 'admin') }}">
</head>
<body id="error-page" class="bg-light">
Expand Down

0 comments on commit 56310f7

Please sign in to comment.