Skip to content

Editor design update #4604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ssddanbrown merged 5 commits into from
Oct 14, 2023
Merged

Editor design update #4604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a12b60e
Editor: Started attempts to improve design elements
ssddanbrown Oct 8, 2023
45c7409
Editor: Started toying with more singificant design update
ssddanbrown Oct 13, 2023
8c10959
Editors: Tightened up new design, adjusted for MD editor
ssddanbrown Oct 14, 2023
8ffa436
Editors: Adjusted new design for mobile and dark mode
ssddanbrown Oct 14, 2023
8166e27
Editors: Properly aligned edit area border radius
ssddanbrown Oct 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lang/en/entities.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@
'pages_is_template' => 'Page Template',

// Editor Sidebar
'toggle_sidebar' => 'Toggle Sidebar',
'page_tags' => 'Page Tags',
'chapter_tags' => 'Chapter Tags',
'book_tags' => 'Book Tags',
Expand Down
6 changes: 4 additions & 2 deletions resources/js/components/editor-toolbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export class EditorToolbox extends Component {
this.buttons = this.$manyRefs.tabButton;
this.contentElements = this.$manyRefs.tabContent;
this.toggleButton = this.$refs.toggle;
this.editorWrapEl = this.container.closest('.page-editor');

this.setupListeners();

Expand All @@ -30,8 +31,9 @@ export class EditorToolbox extends Component {

toggle() {
this.container.classList.toggle('open');
const expanded = this.container.classList.contains('open') ? 'true' : 'false';
this.toggleButton.setAttribute('aria-expanded', expanded);
const isOpen = this.container.classList.contains('open');
this.toggleButton.setAttribute('aria-expanded', isOpen ? 'true' : 'false');
this.editorWrapEl.classList.toggle('toolbox-open', isOpen);
}

setActiveTab(tabName, openToolbox = false) {
Expand Down
1 change: 1 addition & 0 deletions resources/sass/_blocks.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
margin-bottom: $-l;
overflow: initial;
min-height: 60vh;
border-radius: 8px;
&.auto-height {
min-height: 0;
}
Expand Down
33 changes: 3 additions & 30 deletions resources/sass/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,9 @@ html.markdown-editor-display.dark-mode {
width: 100%;
font-size: 11px;
line-height: 1.6;
border-bottom: 1px solid #DDD;
background-color: #EEE;
@include lightDark(background-color, #eee, #111);
@include lightDark(border-color, #ddd, #000);
border-bottom: 1px solid #CCC;
//background-color: var(--color-primary-light);
@include lightDark(border-color, #CCC, #000);
flex: none;
@include whenDark {
button {
Expand Down Expand Up @@ -398,27 +397,6 @@ input[type=color] {
height: auto;
}

.title-input.page-title {
font-size: 0.8em;
@include lightDark(background-color, #fff, #333);
.input {
border: 0;
margin-bottom: -1px;
}
input[type="text"] {
max-width: 840px;
margin: 0 auto;
border: none;
height: auto;
}
}

.page-title input {
display: block;
width: 100%;
font-size: 1.4em;
}

.description-input textarea {
display: block;
width: 100%;
Expand All @@ -428,11 +406,6 @@ input[type=color] {
height: auto;
}

div[editor-type="markdown"] .title-input.page-title input[type="text"] {
max-width: 100%;
border-radius: 0;
}

.search-box {
max-width: 100%;
position: relative;
Expand Down
39 changes: 0 additions & 39 deletions resources/sass/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,43 +364,4 @@ header .search-box.search-active:focus-within {
.faded span.faded-text {
display: inline-block;
padding: $-s;
}

.action-buttons .text-button {
display: inline-block;
padding: $-xs $-s;
&:last-child {
padding-inline-end: 0;
}
&:first-child {
padding-inline-start: 0;
}
}


.action-buttons .dropdown-container:last-child a {
padding-inline-end: 0;
padding-inline-start: $-s;
}
.action-buttons {
text-align: end;
&.text-left {
text-align: start;
.text-button {
padding-inline-end: $-m;
padding-inline-start: 0;
}
}
&.text-center {
text-align: center;
}
}

@include smaller-than($m) {
.action-buttons .text-button {
padding: $-xs $-xs;
}
.action-buttons .dropdown-container:last-child a {
padding-inline-start: $-xs;
}
}
160 changes: 131 additions & 29 deletions resources/sass/_pages.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
flex: 1;
flex-direction: column;
z-index: 10;
overflow: hidden;
border-radius: 0 0 8px 8px;
}

.mce-tinymce {
Expand All @@ -19,6 +21,69 @@
}
}

.page-editor-page-area {
width: 100%;
border-radius: 8px;
box-shadow: $bs-card;
@include lightDark(background-color, #FFF, #333)
}

.page-edit-toolbar {
width: 100%;
margin: 0 auto;
display: grid;
grid-template-columns: minmax(max-content, 2fr) 1.5fr minmax(max-content, 2fr);
align-items: center;
}

@include larger-than($xxl) {
.page-editor-wysiwyg .page-edit-toolbar,
.page-editor-wysiwyg .page-editor-page-area {
max-width: 1140px;
}

.page-editor-wysiwyg .floating-toolbox {
position: absolute;
}
}

@include smaller-than($m) {
.page-edit-toolbar {
display: flex;
flex-direction: row;
justify-content: space-between;
}
}

.title-input.page-title {
font-size: 0.8em;
.input {
border: 0;
margin-bottom: -1px;
}
input[type="text"] {
max-width: 840px;
margin: 0 auto;
border: none;
height: auto;
display: block;
width: 100%;
font-size: 20px;
border-radius: 8px;
}
input[type="text"]:focus {
position: relative;
outline-offset: -1px;
outline: 1px dashed var(--color-primary);
box-shadow: $bs-card;
z-index: 50;
}
}

.page-editor-markdown .title-input.page-title input[type="text"] {
max-width: 100%;
}

body.tox-fullscreen .page-editor .edit-area,
body.markdown-fullscreen .page-editor .edit-area {
z-index: 12;
Expand All @@ -35,8 +100,7 @@ body.tox-fullscreen, body.markdown-fullscreen {
overflow-x: scroll;
overflow-y: visible;
}
.page-edit-toolbar .grid.third {
display: block;
.page-edit-toolbar {
white-space: nowrap;
> div {
display: inline-block;
Expand All @@ -48,10 +112,10 @@ body.tox-fullscreen, body.markdown-fullscreen {
position: fixed;
z-index: 30;
border-radius: 50%;
width: 56px;
height: 56px;
font-size: 24px;
right: $-m;
width: 52px;
height: 52px;
font-size: 26px;
right: $-xs;
bottom: $-s;
box-shadow: $bs-hover;
background-color: currentColor;
Expand Down Expand Up @@ -149,22 +213,27 @@ body.tox-fullscreen, body.markdown-fullscreen {
}
}

// Attribute form
// Page editor sidebar toolbox
.floating-toolbox {
border: 1px solid #DDD;
@include lightDark(background-color, #fff, #222);
@include lightDark(border-color, #DDD, #000);
right: $-xl*2;
width: 48px;
@include lightDark(background-color, #FFF, #222);
overflow: hidden;
align-items: stretch;
flex-direction: row;
display: flex;
transition: width ease-in-out 180ms;
margin-top: -1px;
min-height: 0;
max-height: 100%;
border-radius: 8px;
box-shadow: $bs-card;
margin-bottom: auto;
margin-left: $-l;
position: relative;
&.open {
width: 480px;
position: relative;
right: 0;
max-width: 480px;
margin-bottom: 0;
}
&:not(.open) .toolbox-tab-content {
display: none !important;
}
.toolbox-toggle svg {
transition: transform ease-in-out 180ms;
Expand All @@ -173,7 +242,7 @@ body.tox-fullscreen, body.markdown-fullscreen {
transition: background-color ease-in-out 180ms;
}
&.open .toolbox-toggle {
background-color: rgba(255, 0, 0, 0.29);
background-color: rgba(255, 0, 0, 0.20);
}
&.open .toolbox-toggle svg {
transform: rotate(180deg);
Expand All @@ -183,28 +252,34 @@ body.tox-fullscreen, body.markdown-fullscreen {
position: relative;
}
.tabs {
display: block;
border-inline-end: 1px solid #DDD;
@include lightDark(border-color, #ddd, #000);
width: 48px;
border-right: 1px solid #DDD;
@include lightDark(border-right-color, #DDD, #000);
width: 40px;
flex: 0 1 auto;
margin-right: -1px;
}
.tabs-inner {
@include lightDark(background-color, #FFFFFF, #222);
}
.tabs svg {
padding: 0;
margin: 0;
}
.tabs > button {
@include lightDark(color, rgba(0, 0, 0, 0.5), rgba(255, 255, 255, 0.5));
.tabs-inner > button {
@include lightDark(color, rgba(0, 0, 0, 0.7), rgba(255, 255, 255, 0.5));
display: block;
cursor: pointer;
padding: $-s $-m;
font-size: 16px;
padding: 10px $-xs;
font-size: 18px;
line-height: 1.6;
border-bottom: 1px solid rgba(255, 255, 255, 0.3);
}
&.open .tabs > button.active {
@include lightDark(color, #444, #EEE);
background-color: rgba(0, 0, 0, 0.1);
.tabs-inner > button:hover, &.open .tabs-inner > button.active {
background-color: var(--color-primary-light);
color: var(--color-primary);
}
&.open .tabs-inner > button.active {
border-inline-end: 1px solid var(--color-primary);
margin-inline-end: -1px;
}
h4 {
font-size: 24px;
Expand Down Expand Up @@ -237,6 +312,33 @@ body.tox-fullscreen, body.markdown-fullscreen {
}
}

@include smaller-than($xxl) {
.floating-toolbox {
margin-left: $-s;
}
}

@include smaller-than($s) {
.page-editor-page-area-wrap {
margin: 4px !important;
}
.floating-toolbox {
margin-left: 4px;
}
.floating-toolbox .tabs {
width: 32px;
}
.floating-toolbox .tabs-inner > button {
font-size: 12px;
}
.page-edit-toolbar {
padding-block: 0 !important;
}
.page-editor.toolbox-open .page-editor-page-area {
display: none;
}
}

.toolbox-tab-content {
display: none;
overflow-y: auto;
Expand Down
6 changes: 6 additions & 0 deletions resources/sass/_tinymce.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
z-index: 100;
}

// Editor wrapper edits
.tox.tox-tinymce {
border-inline: 0;
border-bottom: 0;
}

// In editor body overrides
.page-content.mce-content-body {
padding-block-start: 1rem;
Expand Down
1 change: 0 additions & 1 deletion resources/views/pages/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

@if(!$isDraft) {{ method_field('PUT') }} @endif
@include('pages.parts.form', ['model' => $page])
@include('pages.parts.editor-toolbox')
</form>
</div>

Expand Down
Loading