diff --git a/go.mod b/go.mod index dab76db..6b486a4 100644 --- a/go.mod +++ b/go.mod @@ -14,6 +14,7 @@ require ( ) require ( + github.com/chekoopa/go-localize v0.4.0 // indirect github.com/kr/pretty v0.2.1 // indirect github.com/stretchr/testify v1.7.0 // indirect golang.org/x/sys v0.0.0-20211109184856-51b60fd695b3 // indirect diff --git a/go.sum b/go.sum index 04e7340..5ab72d2 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,11 @@ +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/bouncepaw/mycomarkup/v3 v3.5.0 h1:KaVAFliD8jTXSpeVRq9VLpHBURR06EsQm9EhDX7d7fE= github.com/bouncepaw/mycomarkup/v3 v3.5.0/go.mod h1:BpiGUVsYCgRZCDxF0iIdc08LJokm/Ab36S/Hif0J6D0= +github.com/chekoopa/go-localize v0.4.0 h1:XUgliKdAE0fff2MOEfjHP/Sj1Iy6Yxn4zXOj3jXfDE8= +github.com/chekoopa/go-localize v0.4.0/go.mod h1:bMeziCOnL4H5lGOy2o0eWBRNht2x2RRNWGKZ4oDuxNU= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-ini/ini v1.63.2 h1:kwN3umicd2HF3Tgvap4um1ZG52/WyKT9GGdPx0CJk6Y= @@ -49,5 +53,7 @@ golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= +gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/help/en/mycomarkup.myco b/help/en/mycomarkup.myco index 0685df3..0129a25 100644 --- a/help/en/mycomarkup.myco +++ b/help/en/mycomarkup.myco @@ -197,6 +197,45 @@ img { https://mycorrhiza.wiki/static/favicon.ico } ```} * {img { https://mycorrhiza.wiki/static/favicon.ico }} +=== Gallery layout + +A **gallery layout** consists of two things: position and arrangement. + +* **Position** is about how the gallery is placed in the document. There are three possible positions, listed below. Note that they matter only on big screens. There is no difference on a phone. +** `end` places the gallery at the end of line. By default, it is the right of the line. The text is wrapped around it. +** `start` does the same thing, but places the gallery at the start, i/e left side. +** `stretch` is the default position: the gallery is stretched to fit the document horizontally. +* **Arrangement** is about how the images are placed in the gallery. There are two possible arrangements: +** `grid` places the images in a grid. +** `column` is the default arrangement: the images are in a vertical column. + +Specify the layout after `img` and before `{`. Just write the position and arrangement you need. If you do not write any of them, the default value will be used. + +``` +img grid { + https://upload.wikimedia.org/wikipedia/commons/4/48/Timbre_ciuperci_otravitoare.jpg + https://upload.wikimedia.org/wikipedia/commons/4/48/Timbre_ciuperci_otravitoare.jpg +} + +img start column { + https://upload.wikimedia.org/wikipedia/commons/4/48/Timbre_ciuperci_otravitoare.jpg | 200 + https://upload.wikimedia.org/wikipedia/commons/4/48/Timbre_ciuperci_otravitoare.jpg | 200 +} + +This text is wrapped. +``` +img grid { + https://upload.wikimedia.org/wikipedia/commons/4/48/Timbre_ciuperci_otravitoare.jpg + https://upload.wikimedia.org/wikipedia/commons/4/48/Timbre_ciuperci_otravitoare.jpg +} + +img start column { + https://upload.wikimedia.org/wikipedia/commons/4/48/Timbre_ciuperci_otravitoare.jpg | 200 + https://upload.wikimedia.org/wikipedia/commons/4/48/Timbre_ciuperci_otravitoare.jpg | 200 +} + +This text is wrapped. + == List **Lists** are used for sequential or tree data. They are quite popular. diff --git a/static/default.css b/static/default.css index 2e1276a..29b4464 100644 --- a/static/default.css +++ b/static/default.css @@ -116,7 +116,7 @@ blockquote { margin: 0; padding-left: .75rem; } article { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; line-height: 150%; } main h1 { margin: .5rem 0 0 0; } -main h2, main h3, main h4, main h5, main h6 { margin: 1.5rem 0 0 0; } +main h2, main h3, main h4, main h5, main h6 { margin: 1.5rem 0 0 0; clear: both; } .heading__link { text-decoration: none; display: inline-block; } .heading__link::after { width: 1rem; content: "ยง"; color: transparent; } .heading__link:hover::after, .heading__link:active::after { color: #999; }