From 84bae83d68e200f4cdb4dbefeb854e8c1415c8b7 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 31 Aug 2023 02:42:34 +0900 Subject: [PATCH] Convert remaining LESS files to SCSS --- .../admin/controllers/maintenance/Cleanup.php | 2 ++ .../editor/components/emoticon/tpl/popup.html | 8 +++-- .../emoticon/tpl/{popup.less => popup.scss} | 26 +++++++-------- modules/module/tpl/css/module_admin.less | 29 ----------------- modules/module/tpl/css/module_admin.scss | 32 +++++++++++++++++++ modules/module/tpl/header.html | 5 ++- 6 files changed, 56 insertions(+), 46 deletions(-) rename modules/editor/components/emoticon/tpl/{popup.less => popup.scss} (84%) delete mode 100644 modules/module/tpl/css/module_admin.less create mode 100644 modules/module/tpl/css/module_admin.scss diff --git a/modules/admin/controllers/maintenance/Cleanup.php b/modules/admin/controllers/maintenance/Cleanup.php index dce27ee0f..ee23c1077 100644 --- a/modules/admin/controllers/maintenance/Cleanup.php +++ b/modules/admin/controllers/maintenance/Cleanup.php @@ -345,9 +345,11 @@ class Cleanup extends Base 'modules/counter/queries/updateSiteCounterPageview.xml' => 'deleted:xe', 'modules/counter/queries/updateSiteCounterUnique.xml' => 'deleted:xe', 'modules/counter/queries/updateSiteTotalCounterUnique.xml' => 'deleted:xe', + 'modules/editor/components/emoticon/tpl/popup.less' => 'deleted', 'modules/editor/skins/xpresseditor/' => 'deleted:xe', 'modules/editor/styles/' => 'deleted:xe', 'modules/module/schemas/site_admin.xml' => 'deleted', + 'modules/module/tpl/css/module_admin.less' => 'deleted', 'modules/page/page.wap.php' => 'deleted:xe', 'modules/page/tpl/css/mpage.css' => 'deleted', 'modules/spamfilter/spamfilter.lib.php' => 'deleted', diff --git a/modules/editor/components/emoticon/tpl/popup.html b/modules/editor/components/emoticon/tpl/popup.html index fc18e58e4..95c57b8b1 100644 --- a/modules/editor/components/emoticon/tpl/popup.html +++ b/modules/editor/components/emoticon/tpl/popup.html @@ -1,12 +1,16 @@ + - -{@Context::addMetaTag('viewport', 'width=device-width', FALSE);} + +{@ Context::addMetaTag('viewport', 'width=device-width', FALSE);} + +

{$component_info->title}

+
    diff --git a/modules/editor/components/emoticon/tpl/popup.less b/modules/editor/components/emoticon/tpl/popup.scss similarity index 84% rename from modules/editor/components/emoticon/tpl/popup.less rename to modules/editor/components/emoticon/tpl/popup.scss index 0c5fbd8e8..311aa3f5c 100644 --- a/modules/editor/components/emoticon/tpl/popup.less +++ b/modules/editor/components/emoticon/tpl/popup.scss @@ -1,14 +1,12 @@ -@charset "UTF-8"; -#emoticons{ - padding:0 10px 20px 10px; - input.emoticon{ +#emoticons { + padding: 0 10px 20px 10px; + input.emoticon { display: inline-block; - margin:5px; - cursor:pointer; + margin: 5px; + cursor: pointer; } } - div.rx_tab { width: 100%; white-space: nowrap; @@ -19,13 +17,13 @@ div.rx_tab { list-style: outside none none; margin: 0; text-decoration: none; - - &>li { + + & > li { display: inline-block; height: 40px; line-height: 18px; position: relative; - + a { display: inline-block; color: #000; @@ -33,20 +31,20 @@ div.rx_tab { letter-spacing: -1px; line-height: 40px; text-decoration: none; - + span { border-left: 1px solid #e0e0e0; padding: 0 15px; } } - + a:hover, a:focus, &.rx_active a { color: #2196f3; } - + &:first-child a span { border-left: 0 none; } @@ -58,4 +56,4 @@ div.rx_tab { /* for mobile view */ div.xe_mobile { display:none!important; -} \ No newline at end of file +} diff --git a/modules/module/tpl/css/module_admin.less b/modules/module/tpl/css/module_admin.less deleted file mode 100644 index d1e9fb9d5..000000000 --- a/modules/module/tpl/css/module_admin.less +++ /dev/null @@ -1,29 +0,0 @@ -.fvOff,.fvOn{ - display:inline-block; - position:relative; - top:8px; - width:18px; - height:18px; - background-color:transparent; - background-size:18px 18px; - overflow:hidden; - text-indent:-1000px; - border:0; - .nodescription>& { - top: -1px; - } -} -.__simpleView .fvOff,.__simpleView .fvOn{ - top:0; -} -.fvOff{ - background-image: data-uri('images/star-empty.svg'); -} -.fvOn{ - background-image: data-uri('images/star-fill.svg'); -} -.x_table.x_table-striped.x_table-hover.dsTg tr { - th:first-child, td:first-child { - text-align: center; - } -} \ No newline at end of file diff --git a/modules/module/tpl/css/module_admin.scss b/modules/module/tpl/css/module_admin.scss new file mode 100644 index 000000000..8ffcf8d8c --- /dev/null +++ b/modules/module/tpl/css/module_admin.scss @@ -0,0 +1,32 @@ +.fvOff, .fvOn { + display: inline-block; + position: relative; + top: 8px; + width: 18px; + height: 18px; + background-color: transparent; + background-size: 18px 18px; + overflow: hidden; + text-indent: -1000px; + border: 0; + .nodescription > & { + top: -1px; + } + .__simpleView & { + top: -1px; + } +} + +.fvOff{ + background-image: url('images/star-empty.svg'); +} + +.fvOn{ + background-image: url('images/star-fill.svg'); +} + +.x_table.x_table-striped.x_table-hover.dsTg tr { + th:first-child, td:first-child { + text-align: center; + } +} diff --git a/modules/module/tpl/header.html b/modules/module/tpl/header.html index 9f39f344c..7b4fcd391 100644 --- a/modules/module/tpl/header.html +++ b/modules/module/tpl/header.html @@ -1,12 +1,15 @@ + - +

    {$lang->installed_modules}

    + +