EDIT: scss в css (более верно)

This commit is contained in:
Evg 2022-08-01 12:01:28 +03:00
parent 8ad17b0ac9
commit 91914ce867
25 changed files with 45 additions and 49 deletions

View file

@ -14,10 +14,10 @@ return [
'path_css' => [
// Base path to css files
// Базовый путь к css файлам
'style' => HLEB_GLOBAL_DIRECTORY . '/resources/views/default/scss/',
'style' => HLEB_GLOBAL_DIRECTORY . '/resources/views/default/css/',
// Test template to test custom layout creation
// Тестовый шаблон для проверки создания произвольного макета
'test' => HLEB_GLOBAL_DIRECTORY . '/resources/views/test/scss/',
'test' => HLEB_GLOBAL_DIRECTORY . '/resources/views/test/css/',
],
];

View file

@ -9,14 +9,14 @@ class Sass
public static function collect()
{
foreach (config('css.path_css') as $key => $putch) {
self::build($compiler, $putch, $key);
self::build($putch, $key);
}
}
public static function build($compiler, $putch, $key)
public static function build($putch, $key)
{
$minifier = new Minify\CSS($putch . 'build.scss');
$minifier->minify(HLEB_GLOBAL_DIRECTORY . '/public/assets/css/' . $key . '.css', $file);
$minifier = new Minify\CSS($putch . 'build.css');
$minifier->minify(HLEB_GLOBAL_DIRECTORY . '/public/assets/css/' . $key . '.css');
return true;
}

View file

@ -36,11 +36,11 @@
</div>
<div class="box-flex flex-wrap mb20">
<div class="label-grey mr5">.label-grey</div>
<div class="label-green mr5">.label-green</div>
<div class="label-red mr5">.label-red</div>
<div class="label-orange mr5">.label-orange</div>
<div class="label-teal">.label-teal</div>
<div class="label label-grey mr5">.label .label-grey</div>
<div class="label label-green mr5">.label .label-green</div>
<div class="label label-red mr5">.label .label-red</div>
<div class="label label-orange mr5">.label .label-orange</div>
<div class="label label-teal">.label .label-teal</div>
</div>
<div class="box-flex flex-wrap">

View file

@ -126,8 +126,8 @@
<?php else : ?>
<?php if (UserData::checkActiveUser()) : ?>
<?php if ($post['post_feature'] == 1 && $post['post_draft'] == 0 && $post['post_closed'] == 0) : ?>
<form class="mb15" action="<?= url('content.create', ['type' => 'answer']); ?>" accept-charset="UTF-8" method="post">
<hr>
<form class="mb15 mt15" action="<?= url('content.create', ['type' => 'answer']); ?>" accept-charset="UTF-8" method="post">
<?= csrf_field() ?>
<?= insert('/_block/form/editor', [
'height' => '250px',

View file

@ -18,7 +18,7 @@
</div>
<div class="list-items__description">
<?php if ($item['item_published'] == 0) : ?>
<span class="label-orange mr15">
<span class="label label-orange mr15">
<?= __('web.moderation'); ?>
</span>
<?php endif; ?>

View file

@ -1,9 +1,9 @@
<?php if ($post['post_is_deleted'] == 1) : ?><span class="label-orange"><?= __('app.remote'); ?></span><?php endif; ?>
<?php if ($post['post_is_deleted'] == 1) : ?><span class="label label-orange"><?= __('app.remote'); ?></span><?php endif; ?>
<?php if ($post['post_closed'] == 1) : ?>&#128274;<?php endif; ?>
<?php if ($post['post_top'] == 1) : ?> <span class="label-red">&#8593;</span> <?php endif; ?>
<?php if ($post['post_top'] == 1) : ?> <span class="label label-red">&#8593;</span> <?php endif; ?>
<?php if ($post['post_lo']) : ?><span class="red">✓</span><?php endif; ?>
<?php if ($post['post_feature'] == 1) : ?> <span class="label-green"><?= __('app.question'); ?></span> <?php endif; ?>
<?php if ($post['post_translation'] == 1) : ?><span class="label-grey"><?= __('app.translation'); ?></span><?php endif; ?>
<?php if ($post['post_feature'] == 1) : ?> <span class="label label-green"><?= __('app.question'); ?></span> <?php endif; ?>
<?php if ($post['post_translation'] == 1) : ?><span class="label label-grey"><?= __('app.translation'); ?></span><?php endif; ?>
<?php if ($post['post_tl']) : ?> <span class="brown italic text-sm ml5">tl<?= $post['post_tl']; ?></span> <?php endif; ?>
<?php if ($post['post_merged_id']) : ?>
<span class="red">

View file

@ -0,0 +1,25 @@
/*
* List of resources to build
*
* Перечень ресурсов для сборки
*/
/* Resources used for LibArea design */
@import './components/components.css';
@import './components/menu.css';
@import './components/basic.css';
@import './components/images.css';
@import './components/inputs.css';
@import './components/table.css';
@import './components/button.css';
@import './components/tags.css';
@import './components/modal.css';
@import './components/footer.css';
@import './components/notifications.css';
@import './components/media.css';
@import './components/code.css';
@import './components/catalog.css';
@import 'custom.css';

View file

@ -52,34 +52,30 @@
text-transform: lowercase;
font-size: 0.875rem;
padding: 3px 10px;
font-weight: 400;
}
.label-grey {
@extend .label;
background-color: var(--violet);
color: var(--gray-600);
}
.label-orange {
@extend .label;
background-color: #f9ddde;
color: var(--gray);
}
.label-green {
@extend .label;
background-color: #f0f6f3;
color: var(--green);
}
.label-red {
@extend .label;
background-color: #fff4e8;
color: var(--red);
}
.label-teal {
@extend .label;
background-color: var(--teal);
color: var(--white);
}

View file

@ -1,25 +0,0 @@
/*
* List of resources to build
*
* Перечень ресурсов для сборки
*/
/* Resources used for LibArea design */
@import './components/components.scss';
@import './components/menu.scss';
@import './components/basic.scss';
@import './components/images.scss';
@import './components/inputs.scss';
@import './components/table.scss';
@import './components/button.scss';
@import './components/tags.scss';
@import './components/modal.scss';
@import './components/footer.scss';
@import './components/notifications.scss';
@import './components/media.scss';
@import './components/code.scss';
@import './components/catalog.scss';
@import 'custom.scss';

View file

@ -5,4 +5,4 @@
*/
/* Test Template */
@import 'custom.scss';
@import 'custom.css';