Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
- CSS Nesting Module を使った実装 EC-CUBE#783
- CSS ファイルをまとめる EC-CUBE#784

```
cat \
html/user_data/packages/default/css/reset.css \
html/user_data/packages/default/css/common.css \
html/user_data/packages/default/css/contents.css \
html/user_data/packages/default/css/table.css \
html/user_data/packages/default/css/bloc.css \
html/user_data/packages/default/css/bloc_alpha.css \
html/user_data/packages/default/css/popup.css \
html/user_data/packages/default/css/print.css \
| sass-convert --indent=4 --from=css --to=scss \
> html/user_data/packages/default/style.css
```
  • Loading branch information
seasoftjapan committed Dec 20, 2023
1 parent c438132 commit e332637
Show file tree
Hide file tree
Showing 12 changed files with 2,150 additions and 1,964 deletions.
2 changes: 1 addition & 1 deletion data/Smarty/templates/default/popup_header.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=<!--{$smarty.const.CHAR_CODE}-->" />
<meta http-equiv="Content-Script-Type" content="text/javascript" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/import.css" type="text/css" media="all" />
<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->style.css" type="text/css" media="all" />
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
<title><!--{$arrSiteInfo.shop_name}-->/<!--{$subtitle|h}--></title>
<link rel="shortcut icon" href="<!--{$TPL_URLPATH}-->img/common/favicon.ico" />
Expand Down
2 changes: 1 addition & 1 deletion data/Smarty/templates/default/site_frame.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<!--{/if}-->
<link rel="shortcut icon" href="<!--{$TPL_URLPATH}-->img/common/favicon.ico" />
<link rel="icon" type="image/vnd.microsoft.icon" href="<!--{$TPL_URLPATH}-->img/common/favicon.ico" />
<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/import.css" type="text/css" media="all" />
<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->style.css" type="text/css" media="all" />
<!--{if $tpl_page_class_name === "LC_Page_Products_Detail"}-->
<link rel="stylesheet" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.ui/theme/jquery.ui.core.css" type="text/css" media="all" />
<link rel="stylesheet" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.ui/theme/jquery.ui.tooltip.css" type="text/css" media="all" />
Expand Down
Loading

0 comments on commit e332637

Please sign in to comment.