diff options
5 files changed, 42 insertions, 32 deletions
| -rw-r--r-- | src/cards.less | 2 | ||||
| -rw-r--r-- | src/labels.less | 16 | ||||
| -rw-r--r-- | src/modals.less | 6 | ||||
| -rw-r--r-- | src/toasts.less | 4 | ||||
| -rw-r--r-- | src/typography.less | 46 |
diff --git a/src/cards.less b/src/cards.less index 3a9abc5..3338fd6 100644 --- a/src/cards.less +++ b/src/cards.less @@ -11,7 +11,7 @@ .card-header, .card-image, - .card-content, + .card-body, .card-footer { padding: 1.5rem 1.5rem 0 1.5rem; diff --git a/src/labels.less b/src/labels.less index 1c16f40..aba7cf4 100644 --- a/src/labels.less +++ b/src/labels.less @@ -1,15 +1,15 @@ // Labels .label { display: inline-block; - padding: .3rem .4rem; - font-size: 90%; + padding: .2rem .4rem; + font-size: .9em; line-height: 1em; - color: lighten(@body-font-color, 25%); + color: lighten(@body-font-color, 20%); background-color: @core-border-color; text-align: center; white-space: nowrap; - vertical-align: middle; - margin: -.3rem .1em 0 .1em; + vertical-align: baseline; + margin: -.2rem .1em 0 .1em; border-radius: .2rem; &.label-primary { @@ -32,10 +32,4 @@ color: #fff; background-color: @control-color-danger; } - - &.label-lg { - font-size: 100%; - line-height: 1.2; - padding: .3rem .5rem; - } }
\ No newline at end of file diff --git a/src/modals.less b/src/modals.less index b51f5ca..4ef3652 100644 --- a/src/modals.less +++ b/src/modals.less @@ -1,7 +1,6 @@ // Modals .modal { display: block; - width: 50vw; text-align: left; margin: 0; padding: 0; @@ -29,4 +28,9 @@ padding: 1.5rem; text-align: right; } +} +@media screen and (min-width: 640px) { + .modal { + width: 64rem; + } }
\ No newline at end of file diff --git a/src/toasts.less b/src/toasts.less index 9792e50..44becf1 100644 --- a/src/toasts.less +++ b/src/toasts.less @@ -34,4 +34,6 @@ background-color: @control-color-danger; border-color: darken(@control-color-danger, 2%); } -}
\ No newline at end of file +} + +// TODO: attached toasts
\ No newline at end of file diff --git a/src/typography.less b/src/typography.less index 0051ba0..817e973 100644 --- a/src/typography.less +++ b/src/typography.less @@ -50,24 +50,6 @@ blockquote { color: lighten(@body-font-color, 50%); } } -code, -pre { - display: block; - margin-top: 1em; - margin-bottom: 1em; - border-left: .2rem solid @core-color; - line-height: 1.8rem; - background-color: lighten(@core-border-color, 4%); -} -code { - padding: 1rem 2rem; -} -pre code { - background-color: transparent; - border-left: 0; - margin-top: 0; - margin-bottom: 0; -} ul, ol { margin: 0 0 1rem; @@ -147,4 +129,32 @@ ol { word-break: break-word; word-wrap: break-word; hyphens: auto; +} + +// Code +pre { + margin-top: 1em; + margin-bottom: 1em; + padding: 1.5rem; + border-left: .2rem solid @core-color; + line-height: 1.8rem; + background-color: lighten(@core-border-color, 4%); +} +code { + padding: .2rem .4rem; + margin: -.2rem .1em 0 .1em; + border-radius: .2rem; + background-color: @core-border-color; + font-size: .9em; + line-height: 1em; + vertical-align: baseline; + white-space: nowrap; + + pre & { + margin-top: 0; + margin-bottom: 0; + border-left: 0; + background-color: transparent; + line-height: 1.8rem; + } }
\ No newline at end of file |