From 74298e293a79ca32834e71b0b2b2eee803bbc8c3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 4 Dec 2017 12:04:47 +0100 Subject: [PATCH] css: support

,

and
inside .m-block, .m-note, .m-frame. --- css/m-components.css | 28 ++- css/m-dark.compiled.css | 28 ++- css/m-light.compiled.css | 28 ++- doc/css/components-test.rst | 345 ++++++++++++++++++++++++++++++++++-- doc/css/components.rst | 13 +- 5 files changed, 401 insertions(+), 41 deletions(-) diff --git a/css/m-components.css b/css/m-components.css index 5bded04d..07677e69 100644 --- a/css/m-components.css +++ b/css/m-components.css @@ -782,17 +782,29 @@ table.m-table tr.m-dim th, table.m-table th.m-dim { /* Colored block */ .m-block.m-default { border-left-color: var(--line-color); } -.m-block.m-default h3 { color: var(--default-color); } +.m-block.m-default h3, .m-block.m-default h4, .m-block.m-default h5, .m-block.m-default h6 { + color: var(--default-color); +} .m-block.m-primary { border-left-color: var(--primary-color); } -.m-block.m-primary h3 { color: var(--primary-color); } +.m-block.m-primary h3, .m-block.m-primary h4, .m-block.m-primary h5, .m-block.m-primary h6 { + color: var(--primary-color); +} .m-block.m-success { border-left-color: var(--success-color); } -.m-block.m-success h3 { color: var(--success-color); } +.m-block.m-success h3, .m-block.m-success h4, .m-block.m-success h5, .m-block.m-success h6 { + color: var(--success-color); +} .m-block.m-warning { border-left-color: var(--warning-color); } -.m-block.m-warning h3 { color: var(--warning-color); } +.m-block.m-warning h3, .m-block.m-warning h4, .m-block.m-warning h5, .m-block.m-warning h6 { + color: var(--warning-color); +} .m-block.m-danger { border-left-color: var(--danger-color); } -.m-block.m-danger h3 { color: var(--danger-color); } +.m-block.m-danger h3, .m-block.m-danger h4, .m-block.m-danger h5, .m-block.m-danger h6 { + color: var(--danger-color); +} .m-block.m-info { border-left-color: var(--info-color); } -.m-block.m-info h3 { color: var(--info-color); } +.m-block.m-info h3, .m-block.m-info h4, .m-block.m-info h5, .m-block.m-info h6 { + color: var(--info-color); +} .m-block.m-dim { border-left-color: var(--dim-color); color: var(--dim-color); @@ -802,7 +814,9 @@ table.m-table tr.m-dim th, table.m-table th.m-dim { color: var(--dim-link-active-color); } .m-block.m-flat { border-color: transparent; } -.m-block.m-flat h3 { color: var(--default-color); } +.m-block.m-flat h3, .m-block.m-flat h4, .m-block.m-flat h5. .m-block.m-flat h6 { + color: var(--default-color); +} /* Colored note, table coloring */ .m-note.m-default { background-color: var(--default-filled-background-color); } diff --git a/css/m-dark.compiled.css b/css/m-dark.compiled.css index b4f1e3ed..551acb21 100644 --- a/css/m-dark.compiled.css +++ b/css/m-dark.compiled.css @@ -1094,17 +1094,29 @@ table.m-table tr.m-dim th, table.m-table th.m-dim { border-color: #2f363f; } .m-block.m-default { border-left-color: #405363; } -.m-block.m-default h3 { color: #dcdcdc; } +.m-block.m-default h3, .m-block.m-default h4, .m-block.m-default h5, .m-block.m-default h6 { + color: #dcdcdc; +} .m-block.m-primary { border-left-color: #a5c9ea; } -.m-block.m-primary h3 { color: #a5c9ea; } +.m-block.m-primary h3, .m-block.m-primary h4, .m-block.m-primary h5, .m-block.m-primary h6 { + color: #a5c9ea; +} .m-block.m-success { border-left-color: #3bd267; } -.m-block.m-success h3 { color: #3bd267; } +.m-block.m-success h3, .m-block.m-success h4, .m-block.m-success h5, .m-block.m-success h6 { + color: #3bd267; +} .m-block.m-warning { border-left-color: #c7cf2f; } -.m-block.m-warning h3 { color: #c7cf2f; } +.m-block.m-warning h3, .m-block.m-warning h4, .m-block.m-warning h5, .m-block.m-warning h6 { + color: #c7cf2f; +} .m-block.m-danger { border-left-color: #cd3431; } -.m-block.m-danger h3 { color: #cd3431; } +.m-block.m-danger h3, .m-block.m-danger h4, .m-block.m-danger h5, .m-block.m-danger h6 { + color: #cd3431; +} .m-block.m-info { border-left-color: #2f83cc; } -.m-block.m-info h3 { color: #2f83cc; } +.m-block.m-info h3, .m-block.m-info h4, .m-block.m-info h5, .m-block.m-info h6 { + color: #2f83cc; +} .m-block.m-dim { border-left-color: #747474; color: #747474; @@ -1114,7 +1126,9 @@ table.m-table tr.m-dim th, table.m-table th.m-dim { color: #747474; } .m-block.m-flat { border-color: transparent; } -.m-block.m-flat h3 { color: #dcdcdc; } +.m-block.m-flat h3, .m-block.m-flat h4, .m-block.m-flat h5. .m-block.m-flat h6 { + color: #dcdcdc; +} .m-note.m-default { background-color: #34424d; } .m-note.m-default, table.m-table tr.m-default td, table.m-table td.m-default, table.m-table tr.m-default th, table.m-table th.m-default { diff --git a/css/m-light.compiled.css b/css/m-light.compiled.css index ea8e726c..4a900489 100644 --- a/css/m-light.compiled.css +++ b/css/m-light.compiled.css @@ -1094,17 +1094,29 @@ table.m-table tr.m-dim th, table.m-table th.m-dim { border-color: #ffffff; } .m-block.m-default { border-left-color: #f7e3db; } -.m-block.m-default h3 { color: #000000; } +.m-block.m-default h3, .m-block.m-default h4, .m-block.m-default h5, .m-block.m-default h6 { + color: #000000; +} .m-block.m-primary { border-left-color: #cb4b16; } -.m-block.m-primary h3 { color: #cb4b16; } +.m-block.m-primary h3, .m-block.m-primary h4, .m-block.m-primary h5, .m-block.m-primary h6 { + color: #cb4b16; +} .m-block.m-success { border-left-color: #31c25d; } -.m-block.m-success h3 { color: #31c25d; } +.m-block.m-success h3, .m-block.m-success h4, .m-block.m-success h5, .m-block.m-success h6 { + color: #31c25d; +} .m-block.m-warning { border-left-color: #c7cf2f; } -.m-block.m-warning h3 { color: #c7cf2f; } +.m-block.m-warning h3, .m-block.m-warning h4, .m-block.m-warning h5, .m-block.m-warning h6 { + color: #c7cf2f; +} .m-block.m-danger { border-left-color: #f60000; } -.m-block.m-danger h3 { color: #f60000; } +.m-block.m-danger h3, .m-block.m-danger h4, .m-block.m-danger h5, .m-block.m-danger h6 { + color: #f60000; +} .m-block.m-info { border-left-color: #2e7dc5; } -.m-block.m-info h3 { color: #2e7dc5; } +.m-block.m-info h3, .m-block.m-info h4, .m-block.m-info h5, .m-block.m-info h6 { + color: #2e7dc5; +} .m-block.m-dim { border-left-color: #bdbdbd; color: #bdbdbd; @@ -1114,7 +1126,9 @@ table.m-table tr.m-dim th, table.m-table th.m-dim { color: #949494; } .m-block.m-flat { border-color: transparent; } -.m-block.m-flat h3 { color: #000000; } +.m-block.m-flat h3, .m-block.m-flat h4, .m-block.m-flat h5. .m-block.m-flat h6 { + color: #000000; +} .m-note.m-default { background-color: #fbf0ec; } .m-note.m-default, table.m-table tr.m-default td, table.m-table td.m-default, table.m-table tr.m-default th, table.m-table th.m-default { diff --git a/doc/css/components-test.rst b/doc/css/components-test.rst index 1c19be0d..64dd0536 100644 --- a/doc/css/components-test.rst +++ b/doc/css/components-test.rst @@ -35,48 +35,195 @@ Test Blocks ====== +Different :html:`` tags, the styling should be preserved across all sizes. + .. raw:: html
-

Default block

+

Default block h3

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+

Default block h4

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+
+
Default block h5
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+
Default block h6
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+
+
+

Primary block h3

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+

Primary block h4

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+
+
Primary block h5
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link.
-

Primary block

+
Primary block h6
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+
+
+

Success block h3

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+

Success block h4

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+
+
Success block h5
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link.
-

Success block

+
Success block h6
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+
+
+

Warning block h3

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+

Warning block h4

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link.
+
-

Warning block

+
Warning block h5
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+
Warning block h6
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+
+
+

Danger block h3

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+

Danger block h4

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+
+
Danger block h5
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link.
-

Danger block

+
Danger block h6
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+
+
+

Info block h3

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+

Info block h4

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link.
+
-

Info block

+
Info block h5
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+
Info block h6
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+
+
+

Dim block h3

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link.
-

Dim block

+

Dim block h4

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+
+
Dim block h5
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link. +
+
+
+
+
Dim block h6
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus ultrices a erat eu suscipit. Link.
@@ -109,54 +256,222 @@ Badge with lots of text and less text: Notes, frame ============ +Different :html:`` tags. + .. raw:: html
-

Default note

+

Default note h3

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+

Default note h4

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
+
Default note h5
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
Default note h6
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
+
+

Primary note h3

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+

Primary note h4

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
+
Primary note h5
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link.
-

Primary note

+
Primary note h6
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
+
+

Success note h3

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link.
-

Success note

+

Success note h4

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
+
Success note h5
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
Success note h6
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
+
+

Warning note h3

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link.
-

Warning note

+

Warning note h4

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
+
Warning note h5
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
Warning note h6
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
+
+

Danger note h3

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+

Danger note h4

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
+
Danger note h5
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link.
-

Danger note

+
Danger note h6
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
+
+

Info note h3

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+

Info note h4

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link.
+
-

Info note

+
Info note h5
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link.
+
+
+
Info note h6
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
-

Dim note

+

Dim note h3

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+

Dim note h4

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
+
Dim note h5
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
Dim note h6
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
+
+

Frame h3

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+

Frame h4

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link. +
+
+
+
+
+
Frame h5
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link.
-

Frame

+
Frame h6
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Link.
diff --git a/doc/css/components.rst b/doc/css/components.rst index 97e030e9..9811f34e 100644 --- a/doc/css/components.rst +++ b/doc/css/components.rst @@ -65,10 +65,11 @@ page. The colors are: Blocks, defined by :css:`.m-block`, wrap the content in a light frame and add a bolder colored bar on the left. Use in combination with one of the color styles -above. Block caption should go into :html:`

` and is colored in respect to -the color style as well. Text and links always have the default color, except -for :css:`.m-block.m-dim`. It's also possible to have a block without the -border, just add :css:`.m-flat` class to it. +above. Block caption should go into :html:`

` (or :html:`

`, +:html:`

`, :html:`
`) and is colored in respect to the color style as +well. Text and links always have the default color, except for +:css:`.m-block.m-dim`. It's also possible to have a block without the border, +just add :css:`.m-flat` class to it. It's recommended to use the :html:`