mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-12 23:35:58 +00:00
Merge pull request #4239 from Ocelot-Social-Community/3492-editor-list-styles
fix: 🐛 Adapted Editor List Styles
This commit is contained in:
Wolfgang Huß
GitHub
commit
49c5637a3c
@ -191,10 +191,10 @@ $font-weight-bold: 600;
|
||||
* @presenter LineHeight
|
||||
*/
|
||||
|
||||
$line-height-large: 1.5;
|
||||
$line-height-base: 1.3;
|
||||
$line-height-small: 1.1;
|
||||
$line-height-smaller: 1.0;
|
||||
$line-height-large: 1.5rem;
|
||||
$line-height-base: 1.3rem;
|
||||
$line-height-small: 1.1rem;
|
||||
$line-height-smaller: 1.0rem;
|
||||
|
||||
/**
|
||||
* @tokens Letter Spacing
|
||||
@ -352,3 +352,7 @@ $media-query-small: (min-width: 600px);
|
||||
$media-query-medium: (min-width: 768px);
|
||||
$media-query-large: (min-width: 1024px);
|
||||
$media-query-x-large: (min-width: 1200px);
|
||||
|
||||
/**
|
||||
* @tokens Background Images
|
||||
*/
|
||||
|
||||
78
webapp/components/Editor/ContentViewer.story.js
Normal file
78
webapp/components/Editor/ContentViewer.story.js
Normal file
@ -0,0 +1,78 @@
|
||||
import { storiesOf } from '@storybook/vue'
|
||||
import { withA11y } from '@storybook/addon-a11y'
|
||||
import ContentViewer from '~/components/Editor/ContentViewer.vue'
|
||||
import helpers from '~/storybook/helpers'
|
||||
|
||||
helpers.init()
|
||||
|
||||
storiesOf('ContentViewer', module)
|
||||
.addDecorator(withA11y)
|
||||
.addDecorator((storyFn) => {
|
||||
const ctx = storyFn()
|
||||
return {
|
||||
components: { ctx },
|
||||
template: `
|
||||
<base-card style="width: 50%; min-width: 500px; margin: 0 auto;">
|
||||
<ctx />
|
||||
</base-card>
|
||||
`,
|
||||
}
|
||||
})
|
||||
.addDecorator(helpers.layout)
|
||||
.add('Basic formatting', () => ({
|
||||
components: { ContentViewer },
|
||||
store: helpers.store,
|
||||
data: () => ({
|
||||
content: `
|
||||
<h3>Basic formatting</h3>
|
||||
<p>
|
||||
Here is some <em>italic</em>, <b>bold</b> and <u>underline</u> text.
|
||||
<br/>
|
||||
Also do we have some <a href="https://human-connection.org">inline links</a> here.
|
||||
</p>
|
||||
<h3>Heading 3</h3>
|
||||
<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
|
||||
<h4>Heading 4</h4>
|
||||
<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
|
||||
<h5>Heading 5</h5>
|
||||
<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
|
||||
|
||||
<h3>Unordered List</h3>
|
||||
<ul>
|
||||
<li><p>Also some list</p></li>
|
||||
<li><p>with</p></li>
|
||||
<li><p>several</p></li>
|
||||
<li>
|
||||
<p>points</p>
|
||||
<ul>
|
||||
<li>
|
||||
<p>and indentations</p>
|
||||
<p>as well as text parapgraphs</p>
|
||||
<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p><p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<h3>Ordered List</h3>
|
||||
<ol>
|
||||
<li>
|
||||
<p>ordered lists</p>
|
||||
<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsu</p>
|
||||
<ol>
|
||||
<li>
|
||||
<p>can have indentations</p>
|
||||
<ol>
|
||||
<li>
|
||||
<p>and text parapgraphs, too</p>
|
||||
<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p><p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
|
||||
</li>
|
||||
</ol>
|
||||
</li>
|
||||
</ol>
|
||||
</li>
|
||||
</ol>
|
||||
`,
|
||||
}),
|
||||
template: `<content-viewer :content="content" />`,
|
||||
}))
|
||||
@ -79,15 +79,35 @@ storiesOf('Editor', module)
|
||||
<li><p>Also some list</p></li>
|
||||
<li><p>with</p></li>
|
||||
<li><p>several</p></li>
|
||||
<li><p>points</p></li>
|
||||
<li>
|
||||
<p>points</p>
|
||||
<ul>
|
||||
<li>
|
||||
<p>and indentations</p>
|
||||
<p>as well as text parapgraphs</p>
|
||||
<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p><p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<h3>Ordered List</h3>
|
||||
<ol>
|
||||
<li><p>justo</p></li>
|
||||
<li><p>dolores</p></li>
|
||||
<li><p>et ea rebum</p></li>
|
||||
<li><p>kasd gubergren</p></li>
|
||||
<li>
|
||||
<p>ordered lists</p>
|
||||
<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsu</p>
|
||||
<ol>
|
||||
<li>
|
||||
<p>can have indentations</p>
|
||||
<ol>
|
||||
<li>
|
||||
<p>and text parapgraphs, too</p>
|
||||
<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p><p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
|
||||
</li>
|
||||
</ol>
|
||||
</li>
|
||||
</ol>
|
||||
</li>
|
||||
</ol>
|
||||
`,
|
||||
}),
|
||||
|
||||
@ -327,5 +327,46 @@ li > p {
|
||||
p {
|
||||
margin: 0 0 $space-x-small;
|
||||
}
|
||||
|
||||
ul {
|
||||
padding-left: $space-x-large;
|
||||
|
||||
li {
|
||||
display: block;
|
||||
text-indent: -$space-large;
|
||||
|
||||
p:first-child:before {
|
||||
content: '•';
|
||||
padding: $space-none $space-x-small;
|
||||
margin-right: $space-x-small;
|
||||
}
|
||||
|
||||
p:not(:first-child) {
|
||||
padding-left: $space-base;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ol {
|
||||
// https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Lists_and_Counters/Using_CSS_counters
|
||||
counter-reset: item;
|
||||
padding-left: $space-x-large + 4px;
|
||||
|
||||
li {
|
||||
display: block;
|
||||
text-indent: -$space-large - 4px;
|
||||
|
||||
p:first-child:before {
|
||||
content: counters(item, '.') '.';
|
||||
counter-increment: item;
|
||||
padding: $space-none $space-x-small;
|
||||
margin-right: $space-x-small;
|
||||
}
|
||||
|
||||
p:not(:first-child) {
|
||||
padding-left: $space-base;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -5107,7 +5107,7 @@ request-progress@3.0.0:
|
||||
dependencies:
|
||||
throttleit "^1.0.0"
|
||||
|
||||
"request@github:cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16":
|
||||
request@cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16:
|
||||
version "2.88.1"
|
||||
resolved "https://codeload.github.com/cypress-io/request/tar.gz/b5af0d1fa47eec97ba980cde90a13e69a2afcd16"
|
||||
dependencies:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user