diff options
Merge pull request #124 from picturepan2/hotfix/fixes
Hotfix/fixes
5 files changed, 96 insertions, 35 deletions
| -rw-r--r-- | src/base.less | 2 | ||||
| -rw-r--r-- | src/forms.less | 14 | ||||
| -rw-r--r-- | src/layout.less | 52 | ||||
| -rw-r--r-- | src/navigation.less | 1 | ||||
| -rw-r--r-- | src/utilities.less | 62 |
diff --git a/src/base.less b/src/base.less index ef7da3f..f6bd606 100644 --- a/src/base.less +++ b/src/base.less @@ -25,6 +25,7 @@ a { color: darken(@core-link-color, 25%); } } + // Disabled state &[disabled], .disabled { @@ -32,6 +33,7 @@ a { opacity: .75; pointer-events: none; } + // Icons .btn, .toast, diff --git a/src/forms.less b/src/forms.less index 8d1e5e1..bfa032d 100644 --- a/src/forms.less +++ b/src/forms.less @@ -55,7 +55,6 @@ } // Form status - .has-success &, &.is-success { border-color: @control-color-success; @@ -70,7 +69,6 @@ // Form element: Input note .form-input-hint { color: @core-meta-color; - display: inline-block; margin-top: .4rem; .has-success &, @@ -84,7 +82,6 @@ } } - // Form element: Label .form-label { display: block; @@ -127,6 +124,17 @@ line-height: 2rem; padding: 1rem 2.4rem 1rem .8rem; } + + // Select status + .has-success &, + &.is-success { + border-color: @control-color-success; + } + + .has-danger &, + &.is-danger { + border-color: @control-color-danger; + } } // Form element: Checkbox and radio .form-checkbox, diff --git a/src/layout.less b/src/layout.less index 263ed69..628ebe4 100644 --- a/src/layout.less +++ b/src/layout.less @@ -95,6 +95,58 @@ .col-1 { width: 8.33333333%; } +@media screen and (max-width: @size-xl ) { + .col-xl-12, + .col-xl-11, + .col-xl-10, + .col-xl-9, + .col-xl-8, + .col-xl-7, + .col-xl-6, + .col-xl-5, + .col-xl-4, + .col-xl-3, + .col-xl-2, + .col-xl-1 { + flex: none; + } + .col-xl-12 { + width: 100%; + } + .col-xl-11 { + width: 91.66666667%; + } + .col-xl-10 { + width: 83.33333333%; + } + .col-xl-9 { + width: 75%; + } + .col-xl-8 { + width: 66.66666667%; + } + .col-xl-7 { + width: 58.33333333%; + } + .col-xl-6 { + width: 50%; + } + .col-xl-5 { + width: 41.66666667%; + } + .col-xl-4 { + width: 33.33333333%; + } + .col-xl-3 { + width: 25%; + } + .col-xl-2 { + width: 16.66666667%; + } + .col-xl-1 { + width: 8.33333333%; + } +} @media screen and (max-width: @size-lg ) { .col-lg-12, .col-lg-11, diff --git a/src/navigation.less b/src/navigation.less index f6295bc..4918a7d 100644 --- a/src/navigation.less +++ b/src/navigation.less @@ -57,7 +57,6 @@ color: @core-link-color; } } - &.active a, a.active { border-bottom-color: darken(@core-color, 10%); diff --git a/src/utilities.less b/src/utilities.less index 9772945..49d71a4 100644 --- a/src/utilities.less +++ b/src/utilities.less @@ -1,3 +1,34 @@ +// Divider +.divider { + border-bottom: .1rem solid @core-border-color; + display: block; + margin: .5rem 0; +} + +// Loading +.loading { + color: transparent !important; + min-height: 1.6rem; + pointer-events: none; + position: relative; + &::after { + animation: loading 500ms infinite linear; + border: .2rem solid @core-color; + border-radius: .8rem; + border-right-color: transparent; + border-top-color: transparent; + content: ""; + display: block; + height: 1.6rem; + left: 50%; + margin-left: -.8rem; + margin-top: -.8rem; + position: absolute; + top: 50%; + width: 1.6rem; + } +} + // Position .clearfix { .clearfix(); @@ -175,34 +206,3 @@ .circle { border-radius: 50%; } - -// Divider -.divider { - border-bottom: .1rem solid @core-border-color; - display: block; - margin: .5rem; -} - -// Loading -.loading { - color: transparent !important; - min-height: 1.6rem; - pointer-events: none; - position: relative; - &::after { - animation: loading 500ms infinite linear; - border: .2rem solid @core-color; - border-radius: .8rem; - border-right-color: transparent; - border-top-color: transparent; - content: ""; - display: block; - height: 1.6rem; - left: 50%; - margin-left: -.8rem; - margin-top: -.8rem; - position: absolute; - top: 50%; - width: 1.6rem; - } -} |