Merge master drawing tools with tracing layers
This commit is contained in:
Olive Vaughn
commit
f4dd047642
27 changed files with 2025 additions and 306 deletions
|
|
@ -778,7 +778,7 @@ button.share-button:hover, button.share-button.on { filter: brightness(1.1); }
|
|||
.tab:hover .close, .tab.on .close { visibility: visible; }
|
||||
.tab .close:hover { background: var(--hair); color: var(--fg); }
|
||||
|
||||
.palette-bar {
|
||||
.options-bar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 9px;
|
||||
|
|
@ -876,8 +876,6 @@ button.share-button:hover, button.share-button.on { filter: brightness(1.1); }
|
|||
.paint-overlay { position: absolute; inset: 0; touch-action: none; }
|
||||
/* The footage traced over: a reference above the picture, never part of it. */
|
||||
.tracing { position: absolute; inset: 0; pointer-events: none; }
|
||||
.paint-overlay.drawing { cursor: crosshair; }
|
||||
.paint-overlay circle { cursor: grab; }
|
||||
|
||||
/* Where a drag out of the pool would land. Dashed and unfilled, so it reads as
|
||||
"not there yet" over whatever is already drawn. */
|
||||
|
|
@ -1422,6 +1420,7 @@ button.share-button:hover, button.share-button.on { filter: brightness(1.1); }
|
|||
rotates with the node and the tag does not. Sizes are in user units because
|
||||
this SVG's viewBox is the stage's 320x200 scaled by `zoom`. */
|
||||
.paint-overlay .creation-target { pointer-events: none; }
|
||||
.paint-overlay .selected-paint-outline { fill: none; stroke: #fbbf24; stroke-width: 0.8; vector-effect: non-scaling-stroke; pointer-events: none; }
|
||||
.paint-overlay .creation-target .creation-target-box { fill: none; stroke: var(--target-stage); stroke-width: 0.7; }
|
||||
.paint-overlay .creation-target .creation-target-tag-bg { fill: var(--target-stage); }
|
||||
.paint-overlay .creation-target .creation-target-tag {
|
||||
|
|
@ -1532,8 +1531,8 @@ button.share-button:hover, button.share-button.on { filter: brightness(1.1); }
|
|||
.stage-area { padding: 5px; }
|
||||
|
||||
/* Touch targets, in the strips that are all buttons. */
|
||||
.pane-head, .palette-bar { gap: 7px; }
|
||||
.palette-bar button, .pane-head button, .top button { min-height: 24px; }
|
||||
.pane-head, .options-bar { gap: 7px; }
|
||||
.options-bar button, .pane-head button, .top button { min-height: 24px; }
|
||||
|
||||
/* A STRIP OF CONTROLS SCROLLS AS A STRIP. Flexbox's instinct when a row does
|
||||
not fit is to shrink every item and then push the last ones off the end —
|
||||
|
|
@ -1542,17 +1541,175 @@ button.share-button:hover, button.share-button.on { filter: brightness(1.1); }
|
|||
So nothing shrinks, nothing wraps, and each strip scrolls. The `.spacer`
|
||||
and `.status` rules above still win on specificity, which is what keeps the
|
||||
right-hand groups right-hand while there IS room. */
|
||||
.top > *, .pane-head > *, .palette-bar > * { flex-shrink: 0; }
|
||||
.top > *, .pane-head > *, .options-bar > * { flex-shrink: 0; }
|
||||
.top button, .pane-head button { white-space: nowrap; }
|
||||
.pane-head, .palette-bar { overflow-x: auto; }
|
||||
|
||||
/* The one compressible thing in the palette bar is the swatches, so they
|
||||
scroll inside their own share instead of taking it from the commands. The
|
||||
tone's NAME goes: the ringed swatch already says which one is active, and
|
||||
it is the widest thing in the bar that nothing is lost by dropping. */
|
||||
.palette-bar .swatches { flex: 1 1 130px; min-width: 56px; overflow-x: auto; }
|
||||
/* A swatch is a 15px circle or it is not a swatch: the strip scrolls, the
|
||||
dots do not get thinner. */
|
||||
.palette-bar .swatches > * { flex-shrink: 0; }
|
||||
.palette-bar > .dim { display: none; }
|
||||
.pane-head, .options-bar { overflow-x: auto; }
|
||||
/* The hints go first: the tool's name and its controls are what is needed. */
|
||||
.options-bar .hint { display: none; }
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------------
|
||||
the tools: a strip down the left of the stage, an options bar above it.
|
||||
|
||||
Photoshop's arrangement, which Illustrator and Flash share. The palette is a
|
||||
grid in the strip under the tools, as Deluxe Paint's and Animator Pro's were:
|
||||
a fixed table of slots, shown as one. */
|
||||
|
||||
.options-bar {
|
||||
gap: 8px;
|
||||
min-height: 29px;
|
||||
padding: 3px 8px;
|
||||
}
|
||||
.options-bar .tool-name { font-weight: 600; min-width: 46px; }
|
||||
.options-bar .hint { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; min-width: 0; flex: 0 1 auto; }
|
||||
.options-bar .spacer { flex: 1; }
|
||||
.option { display: flex; align-items: center; gap: 6px; color: var(--dim); white-space: nowrap; }
|
||||
.option input[type="range"] { width: 110px; }
|
||||
.option .value { color: var(--fg); min-width: 30px; font-variant-numeric: tabular-nums; }
|
||||
.palette-assets { display: flex; align-items: center; gap: 3px; }
|
||||
|
||||
.workspace { flex: 1; min-height: 0; display: flex; }
|
||||
.workspace > .stage-area { flex: 1; min-width: 0; position: relative; }
|
||||
|
||||
.toolbox {
|
||||
flex: 0 0 52px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
padding: 7px 0;
|
||||
background: var(--chrome);
|
||||
border-right: 1px solid var(--line);
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.tools { display: grid; gap: 2px; }
|
||||
.tool {
|
||||
width: 34px; height: 30px;
|
||||
display: grid; place-items: center;
|
||||
padding: 0;
|
||||
border: 1px solid transparent;
|
||||
border-radius: 4px;
|
||||
background: none;
|
||||
color: var(--fg);
|
||||
}
|
||||
.tool:hover { background: var(--sunk); border-color: var(--hair); }
|
||||
.tool.on { background: var(--sel-bg); border-color: var(--sel); color: var(--sel); }
|
||||
.tool svg { fill: currentColor; stroke: none; }
|
||||
.tool svg .cut { fill: none; stroke: var(--chrome); stroke-width: 1.2; }
|
||||
.tool.on svg .cut { stroke: var(--sel-bg); }
|
||||
|
||||
.palette { display: grid; gap: 7px; justify-items: center; padding-top: 9px; border-top: 1px solid var(--hair); }
|
||||
|
||||
/* The colour a new shape gets: Photoshop's foreground chip. */
|
||||
.palette .chip {
|
||||
width: 36px; height: 36px;
|
||||
display: grid; place-items: end start;
|
||||
border: 1px solid var(--fg);
|
||||
border-radius: 3px;
|
||||
box-shadow: inset 0 0 0 2px var(--pane);
|
||||
}
|
||||
.palette .chip span {
|
||||
margin: 0 0 2px 3px; padding: 0 3px;
|
||||
border-radius: 2px;
|
||||
background: rgba(255, 255, 255, .85);
|
||||
color: var(--fg); font-size: 9px; line-height: 12px;
|
||||
}
|
||||
|
||||
.palette .cells { display: grid; grid-template-columns: repeat(2, 17px); gap: 2px; }
|
||||
.palette .slot { display: contents; }
|
||||
.palette .cell {
|
||||
width: 17px; height: 17px;
|
||||
padding: 0;
|
||||
border: 1px solid rgba(0, 0, 0, .35);
|
||||
border-radius: 2px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.palette .cell:hover { border-color: var(--fg); transform: scale(1.12); }
|
||||
.palette .cell.on { border-color: var(--fg); box-shadow: 0 0 0 1px var(--pane), 0 0 0 2px var(--sel); position: relative; z-index: 1; }
|
||||
|
||||
/* Clear is no colour: a knockout. Checkered, as transparency is everywhere. */
|
||||
.palette .clear,
|
||||
.palette .chip.clear {
|
||||
background-color: #fff;
|
||||
background-image:
|
||||
linear-gradient(45deg, #c9c9c5 25%, transparent 25%, transparent 75%, #c9c9c5 75%),
|
||||
linear-gradient(45deg, #c9c9c5 25%, transparent 25%, transparent 75%, #c9c9c5 75%);
|
||||
background-size: 8px 8px;
|
||||
background-position: 0 0, 4px 4px;
|
||||
}
|
||||
.palette .cell.clear { grid-column: span 2; width: 36px; }
|
||||
|
||||
/* --------------------------------------------------------------------------
|
||||
on the stage: the tools' marks, in stage pixels (the SVG's viewBox), and their
|
||||
cursors. Hairlines, so the pixels under them can be judged. */
|
||||
|
||||
.paint-overlay.tool-pen {
|
||||
cursor: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='22' height='22'%3E%3Cpath d='M2 2 L9 5 L14 11 L11 14 L5 9 Z' fill='%23111' stroke='%23fff' stroke-width='1.2' stroke-linejoin='round'/%3E%3Cpath d='M2 2 L7 7' stroke='%23fff' stroke-width='1'/%3E%3C/svg%3E") 2 2, crosshair;
|
||||
}
|
||||
.paint-overlay.tool-pen.closing {
|
||||
cursor: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='22' height='22'%3E%3Cpath d='M2 2 L9 5 L14 11 L11 14 L5 9 Z' fill='%23111' stroke='%23fff' stroke-width='1.2' stroke-linejoin='round'/%3E%3Ccircle cx='17' cy='17' r='3' fill='none' stroke='%23111' stroke-width='1.6'/%3E%3Ccircle cx='17' cy='17' r='3' fill='none' stroke='%23fff' stroke-width='.6'/%3E%3C/svg%3E") 2 2, crosshair;
|
||||
}
|
||||
.paint-overlay.tool-brush, .paint-overlay.tool-eraser { cursor: none; }
|
||||
|
||||
.paint-overlay .footprint { fill: none; stroke: #fff1be; stroke-width: 0.5; vector-effect: non-scaling-stroke; pointer-events: none; }
|
||||
.paint-overlay .footprint.eraser { stroke-dasharray: 3 2; }
|
||||
|
||||
.paint-overlay .draft polyline { fill: none; stroke: #fff1be; stroke-width: 1; vector-effect: non-scaling-stroke; pointer-events: none; }
|
||||
.paint-overlay .draft .first { fill: #161820; stroke: #fff1be; stroke-width: 0.5; pointer-events: none; }
|
||||
.paint-overlay .draft .first.closing { fill: #fff1be; r: 2.6; }
|
||||
|
||||
.paint-overlay .points .outline { fill: none; stroke: #fff1be; stroke-width: 1; stroke-opacity: .55; vector-effect: non-scaling-stroke; pointer-events: none; }
|
||||
.paint-overlay .points .vertex { fill: #fff1be; stroke: #161820; stroke-width: 0.5; cursor: move; }
|
||||
.paint-overlay .points .vertex:hover { fill: #fff; r: 2.4; }
|
||||
.paint-overlay .points .insert { fill: #161820; stroke: #fff1be; stroke-width: 0.5; pointer-events: none; }
|
||||
|
||||
/* Blender's Adjust Last Operation: the last stroke's settings, in the corner of
|
||||
the view it was made in, until something else is done. */
|
||||
.adjust-last {
|
||||
position: absolute;
|
||||
left: 10px; bottom: 10px;
|
||||
display: flex; align-items: center; gap: 10px;
|
||||
padding: 5px 9px;
|
||||
background: var(--pane);
|
||||
border: 1px solid var(--line);
|
||||
border-radius: 4px;
|
||||
box-shadow: 0 2px 8px rgba(0, 0, 0, .25);
|
||||
}
|
||||
|
||||
/* Remap: the map swatch, and the inspector's grid for a remap shape. A slot is
|
||||
shown as what is under the shape will be drawn in; the original is the chip
|
||||
in its corner. */
|
||||
.palette .cell.map,
|
||||
.palette .chip.map {
|
||||
background: linear-gradient(135deg, #3a3f52 0 50%, #e8d9a8 50% 100%);
|
||||
color: #fff; font-size: 11px; line-height: 1; text-shadow: 0 1px 1px rgba(0, 0, 0, .6);
|
||||
}
|
||||
.palette .cell.map { grid-column: span 2; width: 36px; }
|
||||
.palette .cell { position: relative; }
|
||||
.palette .cell .badge {
|
||||
position: absolute; right: -2px; bottom: -2px;
|
||||
width: 7px; height: 7px;
|
||||
border: 1px solid var(--pane); border-radius: 50%;
|
||||
}
|
||||
|
||||
.remap-head { display: flex; align-items: center; gap: 6px; margin-bottom: 6px; }
|
||||
.remap, .remap-pick { display: grid; grid-template-columns: repeat(8, 22px); gap: 3px; }
|
||||
.remap-pick { margin-top: 7px; padding-top: 7px; border-top: 1px solid var(--hair); }
|
||||
.remap-pick > .dim { grid-column: 1 / -1; }
|
||||
.remap .cell, .remap-pick .cell {
|
||||
position: relative;
|
||||
width: 22px; height: 22px;
|
||||
padding: 0;
|
||||
border: 1px solid rgba(0, 0, 0, .35);
|
||||
border-radius: 3px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.remap .cell:hover, .remap-pick .cell:hover { border-color: var(--fg); }
|
||||
.remap .cell.on, .remap-pick .cell.on { box-shadow: 0 0 0 1px var(--pane), 0 0 0 2px var(--sel); }
|
||||
.remap .cell.mapped i {
|
||||
position: absolute; left: 2px; top: 2px;
|
||||
width: 8px; height: 8px;
|
||||
border: 1px solid rgba(255, 255, 255, .8);
|
||||
border-radius: 2px;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue