From: Jeremy Thomas Date: Fri, 23 Dec 2016 12:45:52 +0000 (+0000) Subject: Remove highlight, Fix messages X-Git-Tag: 0.3.0^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=919504dfeae98809fd5eba3799ed0ba9865d2740;p=thirdparty%2Fbulma.git Remove highlight, Fix messages --- diff --git a/docs/bulma-docs.sass b/docs/bulma-docs.sass index 1be122953..3fedb378c 100644 --- a/docs/bulma-docs.sass +++ b/docs/bulma-docs.sass @@ -1,6 +1,7 @@ @charset "utf-8" @import "../bulma" +@import "./sass/highlight" // Override .button diff --git a/docs/css/bulma-docs.css b/docs/css/bulma-docs.css index f6e9161b0..0af8607f1 100644 --- a/docs/css/bulma-docs.css +++ b/docs/css/bulma-docs.css @@ -2979,6 +2979,7 @@ a.box:active { .card-footer-item { align-items: center; display: flex; + flex-basis: 0; flex-grow: 1; flex-shrink: 0; justify-content: center; @@ -3001,235 +3002,6 @@ a.box:active { margin-bottom: 0.75rem; } -.card.is-rounded { - border-radius: 5px; -} - -.highlight { - background-color: #fdf6e3; - color: #586e75; -} - -.highlight .c { - color: #93a1a1; -} - -.highlight .err, -.highlight .g { - color: #586e75; -} - -.highlight .k { - color: #859900; -} - -.highlight .l, -.highlight .n { - color: #586e75; -} - -.highlight .o { - color: #859900; -} - -.highlight .x { - color: #cb4b16; -} - -.highlight .p { - color: #586e75; -} - -.highlight .cm { - color: #93a1a1; -} - -.highlight .cp { - color: #859900; -} - -.highlight .c1 { - color: #93a1a1; -} - -.highlight .cs { - color: #859900; -} - -.highlight .gd { - color: #2aa198; -} - -.highlight .ge { - color: #586e75; - font-style: italic; -} - -.highlight .gr { - color: #dc322f; -} - -.highlight .gh { - color: #cb4b16; -} - -.highlight .gi { - color: #859900; -} - -.highlight .go, -.highlight .gp { - color: #586e75; -} - -.highlight .gs { - color: #586e75; - font-weight: bold; -} - -.highlight .gu { - color: #cb4b16; -} - -.highlight .gt { - color: #586e75; -} - -.highlight .kc { - color: #cb4b16; -} - -.highlight .kd { - color: #268bd2; -} - -.highlight .kn, -.highlight .kp { - color: #859900; -} - -.highlight .kr { - color: #268bd2; -} - -.highlight .kt { - color: #dc322f; -} - -.highlight .ld { - color: #586e75; -} - -.highlight .m, -.highlight .s { - color: #2aa198; -} - -.highlight .na { - color: #B58900; -} - -.highlight .nb { - color: #586e75; -} - -.highlight .nc { - color: #268bd2; -} - -.highlight .no { - color: #cb4b16; -} - -.highlight .nd { - color: #268bd2; -} - -.highlight .ni, -.highlight .ne { - color: #cb4b16; -} - -.highlight .nf { - color: #268bd2; -} - -.highlight .nl, -.highlight .nn, -.highlight .nx, -.highlight .py { - color: #586e75; -} - -.highlight .nt, -.highlight .nv { - color: #268bd2; -} - -.highlight .ow { - color: #859900; -} - -.highlight .w { - color: #586e75; -} - -.highlight .mf, -.highlight .mh, -.highlight .mi, -.highlight .mo { - color: #2aa198; -} - -.highlight .sb { - color: #93a1a1; -} - -.highlight .sc { - color: #2aa198; -} - -.highlight .sd { - color: #586e75; -} - -.highlight .s2 { - color: #2aa198; -} - -.highlight .se { - color: #cb4b16; -} - -.highlight .sh { - color: #586e75; -} - -.highlight .si, -.highlight .sx { - color: #2aa198; -} - -.highlight .sr { - color: #dc322f; -} - -.highlight .s1, -.highlight .ss { - color: #2aa198; -} - -.highlight .bp, -.highlight .vc, -.highlight .vg, -.highlight .vi { - color: #268bd2; -} - -.highlight .il { - color: #2aa198; -} - .level-item { align-items: center; display: flex; @@ -3590,10 +3362,15 @@ a.box:active { position: relative; } +.message-header a, .message-header strong { color: inherit; } +.message-header a { + text-decoration: underline; +} + .message-header .delete { flex-grow: 0; flex-shrink: 0; @@ -3601,7 +3378,8 @@ a.box:active { } .message-header + .message-body { - border-radius: 0 0 3px 3px; + border-top-left-radius: 0; + border-top-right-radius: 0; border-top: none; } @@ -3612,10 +3390,15 @@ a.box:active { padding: 1em 1.25em; } +.message-body a, .message-body strong { color: inherit; } +.message-body a { + text-decoration: underline; +} + .message-body code, .message-body pre { background: white; @@ -6289,6 +6072,231 @@ label.panel-block:hover { padding: 3rem 1.5rem 6rem; } +.highlight { + background-color: #fdf6e3; + color: #586e75; +} + +.highlight .c { + color: #93a1a1; +} + +.highlight .err, +.highlight .g { + color: #586e75; +} + +.highlight .k { + color: #859900; +} + +.highlight .l, +.highlight .n { + color: #586e75; +} + +.highlight .o { + color: #859900; +} + +.highlight .x { + color: #cb4b16; +} + +.highlight .p { + color: #586e75; +} + +.highlight .cm { + color: #93a1a1; +} + +.highlight .cp { + color: #859900; +} + +.highlight .c1 { + color: #93a1a1; +} + +.highlight .cs { + color: #859900; +} + +.highlight .gd { + color: #2aa198; +} + +.highlight .ge { + color: #586e75; + font-style: italic; +} + +.highlight .gr { + color: #dc322f; +} + +.highlight .gh { + color: #cb4b16; +} + +.highlight .gi { + color: #859900; +} + +.highlight .go, +.highlight .gp { + color: #586e75; +} + +.highlight .gs { + color: #586e75; + font-weight: bold; +} + +.highlight .gu { + color: #cb4b16; +} + +.highlight .gt { + color: #586e75; +} + +.highlight .kc { + color: #cb4b16; +} + +.highlight .kd { + color: #268bd2; +} + +.highlight .kn, +.highlight .kp { + color: #859900; +} + +.highlight .kr { + color: #268bd2; +} + +.highlight .kt { + color: #dc322f; +} + +.highlight .ld { + color: #586e75; +} + +.highlight .m, +.highlight .s { + color: #2aa198; +} + +.highlight .na { + color: #B58900; +} + +.highlight .nb { + color: #586e75; +} + +.highlight .nc { + color: #268bd2; +} + +.highlight .no { + color: #cb4b16; +} + +.highlight .nd { + color: #268bd2; +} + +.highlight .ni, +.highlight .ne { + color: #cb4b16; +} + +.highlight .nf { + color: #268bd2; +} + +.highlight .nl, +.highlight .nn, +.highlight .nx, +.highlight .py { + color: #586e75; +} + +.highlight .nt, +.highlight .nv { + color: #268bd2; +} + +.highlight .ow { + color: #859900; +} + +.highlight .w { + color: #586e75; +} + +.highlight .mf, +.highlight .mh, +.highlight .mi, +.highlight .mo { + color: #2aa198; +} + +.highlight .sb { + color: #93a1a1; +} + +.highlight .sc { + color: #2aa198; +} + +.highlight .sd { + color: #586e75; +} + +.highlight .s2 { + color: #2aa198; +} + +.highlight .se { + color: #cb4b16; +} + +.highlight .sh { + color: #586e75; +} + +.highlight .si, +.highlight .sx { + color: #2aa198; +} + +.highlight .sr { + color: #dc322f; +} + +.highlight .s1, +.highlight .ss { + color: #2aa198; +} + +.highlight .bp, +.highlight .vc, +.highlight .vg, +.highlight .vi { + color: #268bd2; +} + +.highlight .il { + color: #2aa198; +} + @media screen and (min-width: 769px) { .button small { color: #4a4a4a; diff --git a/docs/documentation/components/message.html b/docs/documentation/components/message.html index 146a54544..5398828f1 100644 --- a/docs/documentation/components/message.html +++ b/docs/documentation/components/message.html @@ -22,7 +22,7 @@ doc-subtab: message
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem.
@@ -31,7 +31,7 @@ doc-subtab: message
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem.
@@ -40,7 +40,7 @@ doc-subtab: message
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem.
@@ -49,7 +49,7 @@ doc-subtab: message
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem.
@@ -58,7 +58,7 @@ doc-subtab: message
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem.
@@ -67,16 +67,16 @@ doc-subtab: message
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem.
-

Danger

+

Danger! Learn more

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem.
{% endcapture %} @@ -100,37 +100,37 @@ doc-subtab: message {% capture message_body_example %}
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem.
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem.
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem.
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem.
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem.
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem.
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque risus mi, tempus quis placerat ut, porta nec nulla. Vestibulum rhoncus ac ex sit amet fringilla. Nullam gravida purus diam, et dictum felis venenatis efficitur. Aenean ac eleifend lacus, in mollis lectus. Donec sodales, arcu et sollicitudin porttitor, tortor urna tempor ligula, id porttitor mi magna a neque. Donec dui urna, vehicula et sem eget, facilisis sodales sem.
{% endcapture %} diff --git a/sass/components/highlight.sass b/docs/sass/highlight.sass similarity index 100% rename from sass/components/highlight.sass rename to docs/sass/highlight.sass diff --git a/sass/components/_all.sass b/sass/components/_all.sass index 0eaf7edea..f21fc5e47 100644 --- a/sass/components/_all.sass +++ b/sass/components/_all.sass @@ -1,7 +1,6 @@ @charset "utf-8" @import "card.sass" -@import "highlight.sass" @import "level.sass" @import "media.sass" @import "menu.sass" diff --git a/sass/components/card.sass b/sass/components/card.sass index bdc4d0468..3a0310985 100644 --- a/sass/components/card.sass +++ b/sass/components/card.sass @@ -35,6 +35,7 @@ .card-footer-item align-items: center display: flex + flex-basis: 0 flex-grow: 1 flex-shrink: 0 justify-content: center @@ -50,6 +51,3 @@ position: relative .media:not(:last-child) margin-bottom: 0.75rem - // Modifiers - &.is-rounded - border-radius: $radius-large diff --git a/sass/components/message.sass b/sass/components/message.sass index d5329eabe..2ef750b96 100644 --- a/sass/components/message.sass +++ b/sass/components/message.sass @@ -30,14 +30,18 @@ line-height: 1.25 padding: 0.5em 0.75em position: relative + a, strong color: inherit + a + text-decoration: underline .delete flex-grow: 0 flex-shrink: 0 margin-left: 0.75em & + .message-body - border-radius: 0 0 $radius $radius + border-top-left-radius: 0 + border-top-right-radius: 0 border-top: none .message-body @@ -45,8 +49,11 @@ border-radius: $radius color: $text padding: 1em 1.25em + a, strong color: inherit + a + text-decoration: underline code, pre background: $white