Skip to content
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

Jump to bottom

display: grid for editor toolbar, editor and preview #7787

Merged
merged 7 commits into from Oct 17, 2023
Merged

display: grid for editor toolbar, editor and preview #7787

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
003a43c
make toolbar, editor and preview display: grid
BurningTreeC Oct 15, 2023
409e0ac
correct display of bitmap editor
BurningTreeC Oct 15, 2023
88a6117
grid-area: toolbar not only when preview is shown
BurningTreeC Oct 15, 2023
99cf06c
use dedicated classes and tc-grid and no brittle CSS selectors
BurningTreeC Oct 15, 2023
910b916
no need for width: 100%
BurningTreeC Oct 15, 2023
c65b839
cleanup style definitions
BurningTreeC Oct 15, 2023
9f0cbc8
use semantic classnames
BurningTreeC Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/ui/EditTemplate/body/default.tid
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
importState=<<qualify $:/state/ImportImage>> >
<$dropzone importTitle=<<importTitle>> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<<importFileActions>> >
<div>
<div class={{{ [function[edit-preview-state]match[yes]then[tc-tiddler-preview]] +[join[ ]] }}}>
<div class={{{ [function[edit-preview-state]match[yes]then[tc-tiddler-preview]else[tc-no-tiddler-preview]] [[tc-grid]] +[join[ ]] }}}>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We try to use semantic class names, and avoid functional names such as "tc-grid". I think it would be clearer to replace tc-no-tiddler-preview with tc-tiddler-preview-hidden, and to use tc-tiddler-preview-frame instead of tc-grid.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think tc-tiddler-preview-frame is way to specific. tc-grid only contains 1 setting to use grid. It can be reused that way.

tc-tiddler-preview-frame is completely misleading since it is not set to the preview-frame, but it's parent

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I want to define tc-grid to any other gird with a completely different context in the sidebar or control-panel tc-tiddler-preview-frame would be misleading. IMO it should be as generic as possible

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pmario if we use tc-grid and reuse it elsewhere then we'll be constrained that we can't change the styling of just the preview pane. As I said before, functional class names are an anti-pattern.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could use tc-tiddler-editor instead of tc-grid.


<$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>

Expand Down
36 changes: 29 additions & 7 deletions themes/tiddlywiki/vanilla/base.tid
View file
Open in desktop
Expand Up @@ -1365,6 +1365,10 @@ html body.tc-body.tc-single-tiddler-window {
margin-top: 8px;
}

.tc-tiddler-frame .tc-grid.tc-tiddler-preview .tc-editor-toolbar, .tc-tiddler-frame .tc-grid.tc-no-tiddler-preview .tc-editor-toolbar {
BurningTreeC marked this conversation as resolved.
Show resolved Hide resolved
grid-area: toolbar;
}

.tc-editor-toolbar button {
vertical-align: middle;
background-color: <<colour tiddler-controls-foreground>>;
Expand Down Expand Up @@ -1576,9 +1580,26 @@ html body.tc-body.tc-single-tiddler-window {
overflow: auto;
}

.tc-tiddler-preview-preview {
float: right;
width: 49%;
.tc-grid {
display: grid;
}

.tc-tiddler-frame .tc-grid.tc-tiddler-preview {
grid-template-areas: "toolbar toolbar" "editor preview";
BurningTreeC marked this conversation as resolved.
Show resolved Hide resolved
grid-template-columns: 1fr 1fr;
grid-template-rows: auto 1fr;
}

.tc-tiddler-frame .tc-grid.tc-no-tiddler-preview {
grid-template-areas: "toolbar" "editor";
BurningTreeC marked this conversation as resolved.
Show resolved Hide resolved
grid-template-columns: 1fr;
grid-template-rows: auto 1fr;
}

.tc-tiddler-frame .tc-grid.tc-tiddler-preview .tc-tiddler-preview-preview {
grid-area: preview;
overflow-wrap: anywhere;
word-break: normal;
border: 1px solid <<colour tiddler-editor-border>>;
margin: 4px 0 3px 3px;
padding: 3px 3px 3px 3px;
Expand All @@ -1593,12 +1614,13 @@ html body.tc-body.tc-single-tiddler-window {

""">>

.tc-tiddler-frame .tc-tiddler-preview .tc-edit-texteditor {
width: 49%;
.tc-tiddler-frame .tc-grid.tc-tiddler-preview .tc-edit-texteditor, .tc-tiddler-frame .tc-grid.tc-no-tiddler-preview .tc-edit-texteditor {
grid-area: editor;
}

.tc-tiddler-frame .tc-tiddler-preview canvas.tc-edit-bitmapeditor {
max-width: 49%;
.tc-tiddler-frame .tc-grid.tc-tiddler-preview canvas.tc-edit-bitmapeditor, .tc-tiddler-frame .tc-grid.tc-no-tiddler-preview canvas.tc-edit-bitmapeditor {
BurningTreeC marked this conversation as resolved.
Show resolved Hide resolved
grid-area: editor;
max-width: 100%;
}

.tc-edit-fields {
Expand Down