Commit 2dddc8b
authored
feat: add CSS float and alignment support for images and figures (#1174)
Resolves: #1172
## Summary
- Add missing `float: left`/`float: right` CSS properties to
`img.float-left`/`img.float-right` rules (Bootstrap 5 removed these)
- Add figure float rules (`figure.float-left`, `figure.float-right`)
with `max-width: 50%` and responsive breakpoint (<576px disables float)
- Add `img.align-center` / `figure.align-center` CSS for centered
alignment
- Replace deprecated HTML `align` attribute in `image.html.twig` with
CSS class mapping (`:align: left` → `float-left`, `:align: right` →
`float-right`, `:align: center` → `align-center`)
- Add `:align:` CSS class support in `figure.html.twig`
- Preserve `:align:` option on FigureNode (was being stripped) so `..
figure:: :align: left` works
- Strip `float-left`/`float-right` from inner `<img>` inside `<figure>`
to prevent caption wrapping issues
- Add `.clear-both` CSS utility alias (alongside existing `.cc`)
- Split `ImagesAndFigures` rendertest into separate pages: Index
(styling), Zoom, FloatAndAlignment
## Files changed
| File | Change |
|------|--------|
| `assets/sass/components/_rst.scss` | Add `float` property +
`align-center` to img rules |
| `assets/sass/components/_images.scss` | Add figure float/align rules +
responsive |
| `assets/sass/_utilities.scss` | Add `.clear-both` alias |
| `resources/template/body/image.html.twig` | Replace HTML `align` attr
with CSS classes |
| `resources/template/body/figure.html.twig` | Add `:align:` CSS class
support |
| `src/Directives/FigureDirective.php` | Keep `:align:` on FigureNode,
strip float from inner img |
| `resources/public/css/theme.css` | Regenerated |
| `Documentation-rendertest/ImagesAndFigures/` | Split into Index + Zoom
+ FloatAndAlignment |
## Test plan
- [x] All 195 PHPUnit tests pass
- [x] PHPStan reports 0 errors
- [x] Rendered docs verified: image/figure float left/right with text
wrapping
- [x] `:align: left`/`:align: right` on figures works correctly
- [x] `.clear-both` clears floats as expected
- [x] Responsive: floats disable on small screens (<576px)
- [x] Visual review of rendered ImagesAndFigures pages
### Related
- Follow-up PR: #1179 (modernize to `float-start`/`float-end`)
- Upstream issue:
[phpDocumentor/guides#1303](phpDocumentor/guides#1303)
— proposes removing `final` from upstream directives to avoid forking1 parent c753119 commit 2dddc8b
14 files changed
Lines changed: 759 additions & 257 deletions
File tree
- Documentation-rendertest/ImagesAndFigures
- packages/typo3-docs-theme
- assets/sass
- components
- resources
- public/css
- template/body
- src/Directives
- tests/Integration/tests/images/Float
- expected
- input
Lines changed: 147 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
0 commit comments