Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
tabuna committed May 31, 2024
1 parent 52854bb commit 275c51e
Show file tree
Hide file tree
Showing 58 changed files with 139,292 additions and 737 deletions.
19,921 changes: 19,907 additions & 14 deletions public/css/orchid.css

Large diffs are not rendered by default.

19,898 changes: 19,884 additions & 14 deletions public/css/orchid.rtl.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/css/orchid.rtl.css.map

Large diffs are not rendered by default.

190 changes: 189 additions & 1 deletion public/js/manifest.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35,184 changes: 35,179 additions & 5 deletions public/js/orchid.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/js/orchid.js.map

Large diffs are not rendered by default.

63,345 changes: 63,343 additions & 2 deletions public/js/vendor.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions public/mix-manifest.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions resources/js/controllers/quill_controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,13 @@ export default class extends ApplicationController {

// save value
this.editor.on('text-change', () => {
// When usage this.editor.root.innerHtml "/n/r" has been lost
textarea.value = this.element.querySelector('.ql-editor').innerHTML || "";
textarea.dispatchEvent(new Event('change'));
let newValue = this.editor.getSemanticHTML();
let oldValue = textarea.value;

if (oldValue !== newValue) {
textarea.value = newValue;
textarea.dispatchEvent(new Event('change'));
}
});

this.editor.getModule('toolbar').addHandler('color', (value) => {
Expand Down
1 change: 1 addition & 0 deletions resources/sass/app.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Core variables and mixins
@import "theme/variables";


// Vendor
@import "~bootstrap/scss/bootstrap";
@import "~dropzone/dist/basic";
Expand Down
5 changes: 3 additions & 2 deletions resources/sass/core/form.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.form-control {
background: $white none;
border: 1px solid $form-control-border-color;
background: var(--bs-body-tertiary-bg);
//background: $white none;
//border: 1px solid $form-control-border-color;
-webkit-appearance: none;
-moz-appearance: none;
color: $black;
Expand Down
21 changes: 18 additions & 3 deletions resources/sass/theme/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ $orchid-color: #007bff; //#ac5ca0;
$white: #ffffff;
$black: #15141a;

$blue: #007bff !default;
$indigo: #6610f2 !default;
$purple: #6f42c1 !default;
$blue: #007aff !default;
$indigo: #5856d7 !default;
$purple: #af52de !default;
$pink: #e83e8c !default;
$red: #dc3545 !default;
$orange: #fd7e14 !default;
Expand All @@ -25,6 +25,11 @@ $grey: #495057;
$grey-light: mix($grey, #ffffff, 10%);

$body-bg: #edeef0; //lighten($light, 1%);

//$bg-body-tertiary: #fff;
//$body-tertiary-color: rgba($body-color, .5) !default;
$body-tertiary-bg: #fff;

$text-color: #394247;
$text-muted: lighten($text-color, 20%);

Expand Down Expand Up @@ -171,3 +176,13 @@ $utilities: (
),
),
);



// Dark THEME

// Для карточек #161b22!important
// Для фона #010409!important

$body-bg-dark: #010409;
$body-tertiary-bg-dark: #161b22;
2 changes: 1 addition & 1 deletion resources/views/actions/dropdown.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<span>{{ $name ?? '' }}</span>
</button>

<div class="dropdown-menu dropdown-menu-end dropdown-menu-arrow bg-white"
<div class="dropdown-menu dropdown-menu-end dropdown-menu-arrow bg-body-tertiary"
x-placement="bottom-end"
>
@foreach($list as $item)
Expand Down
2 changes: 1 addition & 1 deletion resources/views/app.blade.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="{{ app()->getLocale() }}" data-controller="html-load" dir="{{ \Orchid\Support\Locale::currentDir() }}">
<html lang="{{ app()->getLocale() }}" data-controller="html-load" dir="{{ \Orchid\Support\Locale::currentDir() }}" data-bs-theme="dark">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/auth.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="row justify-content-center">
<div class="col-md-10 col-lg-5 col-xxl-5 px-md-5">

<div class="bg-white p-4 p-sm-5 rounded shadow-sm">
<div class="bg-body-tertiary p-4 p-sm-5 rounded shadow-sm">
@yield('content')
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/dummy/block.blade.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="rounded bg-white mb-3 p-3">
<div class="rounded bg-body-tertiary mb-3 p-3">
<div class="border-dashed d-flex align-items-center w-100 rounded overflow-hidden" style="min-height: 250px;">
<h2 class="text-muted center fw-light">Dummy <small class="d-block text-center">{{ Str::random(8) }}</small></h2>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/fields/attach.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class="attach"
</object>
--}}

<button class="btn-close rounded-circle bg-white border shadow position-absolute end-0 top-0"
<button class="btn-close rounded-circle bg-body-tertiary border shadow position-absolute end-0 top-0"
type="button" data-action="click->attach#remove" data-index="{id}"></button>
</div>
</template>
Expand Down
43 changes: 21 additions & 22 deletions resources/views/fields/checkbox.blade.php
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
@component($typeForm, get_defined_vars())
<div data-controller="checkbox"
data-checkbox-indeterminate="{{$indeterminate}}">
@isset($sendTrueOrFalse)
<input hidden name="{{$attributes['name']}}" value="{{$attributes['novalue']}}">
<div class="form-check">
<input value="{{$attributes['yesvalue']}}"
{{ $attributes }}
@if(isset($attributes['value']) && $attributes['value']) checked @endif
>
<label class="form-check-label" for="{{$id}}">{{$placeholder ?? ''}}</label>
</div>
@else
<div class="form-check">
<input {{ $attributes }}
@if(isset($attributes['value']) && $attributes['value'] && (!isset($attributes['checked']) || $attributes['checked'] !== false)) checked @endif
>
<label class="form-check-label" for="{{$id}}">{{$placeholder ?? ''}}</label>
</div>
@endisset
</div>
@endcomponent
<div data-controller="checkbox"
data-checkbox-indeterminate="{{$indeterminate}}">
@isset($sendTrueOrFalse)
<input hidden name="{{$attributes['name']}}" value="{{$attributes['novalue']}}">
<div class="form-check">
<input value="{{$attributes['yesvalue']}}"
{{ $attributes }}
@if(isset($attributes['value']) && $attributes['value']) checked @endif
>
<label class="form-check-label" for="{{$id}}">{{$placeholder ?? ''}}</label>
</div>
@else
<div class="form-check">
<input {{ $attributes }}
@if(isset($attributes['value']) && $attributes['value'] && (!isset($attributes['checked']) || $attributes['checked'] !== false)) checked @endif
>
<label class="form-check-label" for="{{$id}}">{{$placeholder ?? ''}}</label>
</div>
@endisset
</div>

21 changes: 10 additions & 11 deletions resources/views/fields/code.blade.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
@component($typeForm, get_defined_vars())
<div
data-controller="code"
data-code-language="{{$language}}"
data-code-line-numbers="{{$lineNumbers}}"
data-code-default-Theme="{{$defaultTheme}}"
>
<div class="code border position-relative w-100" style="min-height: {{ $attributes['height'] }}"></div>
<input type="hidden" {{ $attributes }}>
</div>
@endcomponent
<div
data-controller="code"
data-code-language="{{$language}}"
data-code-line-numbers="{{$lineNumbers}}"
data-code-default-Theme="{{$defaultTheme}}"
>
<div class="code border position-relative w-100" style="min-height: {{ $attributes['height'] }}"></div>
<input type="hidden" {{ $attributes }}>
</div>

Loading

0 comments on commit 275c51e

Please sign in to comment.