diff options
author | Yan Zhu <picturepan2@hotmail.com> | 2017-03-17 10:53:27 +0300 |
---|---|---|
committer | Yan Zhu <picturepan2@hotmail.com> | 2017-03-17 10:53:27 +0300 |
commit | dbe7a0a86229cbc666fc6b624192f8fdee8c8f57 (patch) | |
tree | 1ef688dfa4f9562ba1d8fab6dbd50a3d28a023bf /src | |
parent | c6014ebc198f00840b38b55dfd18b956fbd2fa8b (diff) |
Rename @layout-padding variables and improve Calendars
Diffstat (limited to 'src')
-rw-r--r-- | src/calendars.less | 4 | ||||
-rw-r--r-- | src/cards.less | 6 | ||||
-rw-r--r-- | src/empty.less | 2 | ||||
-rw-r--r-- | src/forms.less | 30 | ||||
-rw-r--r-- | src/layout.less | 14 | ||||
-rw-r--r-- | src/media.less | 4 | ||||
-rw-r--r-- | src/modals.less | 8 | ||||
-rw-r--r-- | src/navs.less | 1 | ||||
-rw-r--r-- | src/panels.less | 4 | ||||
-rw-r--r-- | src/tables.less | 4 | ||||
-rw-r--r-- | src/toasts.less | 2 | ||||
-rw-r--r-- | src/variables.less | 4 |
12 files changed, 40 insertions, 43 deletions
diff --git a/src/calendars.less b/src/calendars.less index 3171792..9895f5d 100644 --- a/src/calendars.less +++ b/src/calendars.less @@ -25,6 +25,7 @@ .calendar-date { flex: 0 0 14.28%; // 7 calendar-items each row + width: 14.28%; } } @@ -140,7 +141,6 @@ display: flex; flex-direction: column; height: 11rem; - overflow: hidden; padding: 0; &:nth-child(7n) { @@ -154,7 +154,7 @@ .date-item { align-self: flex-end; - flex: 0 0 2.8rem; + height: 2.8rem; margin-right: .5rem; margin-top: .5rem; } diff --git a/src/cards.less b/src/cards.less index e73ccf2..36d304b 100644 --- a/src/cards.less +++ b/src/cards.less @@ -8,16 +8,16 @@ .card-header, .card-body, .card-footer { - padding: @layout-padding; + padding: @layout-padding-lg; padding-bottom: 0; &:last-child { - padding-bottom: @layout-padding; + padding-bottom: @layout-padding-lg; } } .card-image { - padding-top: @layout-padding; + padding-top: @layout-padding-lg; &:first-child { padding-top: 0; diff --git a/src/empty.less b/src/empty.less index 7d4d167..87ad3df 100644 --- a/src/empty.less +++ b/src/empty.less @@ -4,7 +4,7 @@ border-radius: @border-radius; color: @gray-color-dark; text-align: center; - padding: 4 * @layout-gutter; + padding: 4 * @layout-padding; .empty-title, .empty-meta { diff --git a/src/forms.less b/src/forms.less index 623b7a7..57eceb7 100644 --- a/src/forms.less +++ b/src/forms.less @@ -1,7 +1,7 @@ // Forms .form-group { &:not(:last-child) { - margin-bottom: @layout-gutter; + margin-bottom: @layout-padding; } } @@ -246,18 +246,20 @@ border-radius: .7rem; } - input:checked + .form-icon { - &::before { - background: @bg-color-light; - border-radius: @border-radius; - content: ""; - height: .4rem; - left: 50%; - margin-left: -.2rem; - margin-top: -.2rem; - position: absolute; - top: 50%; - width: .4rem; + input { + &:checked + .form-icon { + &::before { + background: @bg-color-light; + border-radius: @border-radius; + content: ""; + height: .4rem; + left: 50%; + margin-left: -.2rem; + margin-top: -.2rem; + position: absolute; + top: 50%; + width: .4rem; + } } } } @@ -389,7 +391,7 @@ input { // Form Horizontal .form-horizontal { - padding: @layout-gutter; + padding: @layout-padding; .form-group { display: flex; diff --git a/src/layout.less b/src/layout.less index ac82e8c..a868ca7 100644 --- a/src/layout.less +++ b/src/layout.less @@ -2,17 +2,17 @@ .container { margin-left: auto; margin-right: auto; - padding-left: @layout-gutter; - padding-right: @layout-gutter; + padding-left: @layout-padding; + padding-right: @layout-padding; width: 100%; &:extend(.clearfix all); &.grid-960 { - max-width: 96rem + 2 * @layout-gutter; + max-width: 96rem + 2 * @layout-padding; } &.grid-480 { - max-width: 48rem + 2 * @layout-gutter; + max-width: 48rem + 2 * @layout-padding; } } @@ -20,8 +20,8 @@ .columns { display: flex; flex-wrap: wrap; - margin-left: -@layout-gutter; - margin-right: -@layout-gutter; + margin-left: -@layout-padding; + margin-right: -@layout-padding; &.col-gapless { margin-left: 0; @@ -39,7 +39,7 @@ } .column { flex: 1; - padding: @layout-gutter; + padding: @layout-padding; &.col-12, &.col-11, diff --git a/src/media.less b/src/media.less index 43fdff3..02c7be5 100644 --- a/src/media.less +++ b/src/media.less @@ -49,10 +49,10 @@ } .figure { - margin: 0 0 @layout-gutter 0; + margin: 0 0 @layout-padding 0; .figure-caption { color: @gray-color-dark; - margin-top: @layout-gutter; + margin-top: @layout-padding; } } diff --git a/src/modals.less b/src/modals.less index fcbdc29..7f01480 100644 --- a/src/modals.less +++ b/src/modals.less @@ -7,7 +7,7 @@ left: 0; opacity: 0; overflow: hidden; - padding: @layout-gutter; + padding: @layout-padding; position: fixed; right: 0; top: 0; @@ -53,7 +53,7 @@ text-align: left; .modal-header { - padding: @layout-padding; + padding: @layout-padding-lg; .modal-title { font-size: @font-size-lg; @@ -64,12 +64,12 @@ .modal-body { max-height: 50vh; overflow-y: auto; - padding: @layout-padding; + padding: @layout-padding-lg; position: relative; } .modal-footer { - padding: @layout-padding; + padding: @layout-padding-lg; text-align: right; } } diff --git a/src/navs.less b/src/navs.less index 7dc3b87..0a37670 100644 --- a/src/navs.less +++ b/src/navs.less @@ -15,7 +15,6 @@ } &.active { & > a { - color: @gray-color-dark; font-weight: bold; &:focus, &:hover { diff --git a/src/panels.less b/src/panels.less index 43b5d09..09618d8 100644 --- a/src/panels.less +++ b/src/panels.less @@ -8,7 +8,7 @@ .panel-header, .panel-footer { flex: 0 0 auto; - padding: @layout-padding; + padding: @layout-padding-lg; } .panel-nav { @@ -18,7 +18,7 @@ .panel-body { flex: 1 1 auto; overflow-y: auto; - padding: 0 @layout-padding; + padding: 0 @layout-padding-lg; } .panel-title { diff --git a/src/tables.less b/src/tables.less index 059a4da..8a8818c 100644 --- a/src/tables.less +++ b/src/tables.less @@ -34,10 +34,6 @@ } } - caption { - - } - td { border-bottom: @border-width solid @border-color; padding: 1.5rem 1rem; diff --git a/src/toasts.less b/src/toasts.less index 47d86c9..4c15a95 100644 --- a/src/toasts.less +++ b/src/toasts.less @@ -4,7 +4,7 @@ border-radius: @border-radius; color: @gray-color-lighter; display: block; - padding: 1.4rem; + padding: @layout-padding; .toast-variant(@gray-color-darker); width: 100%; z-index: @z-index-z3; diff --git a/src/variables.less b/src/variables.less index 6362b01..c728f53 100644 --- a/src/variables.less +++ b/src/variables.less @@ -17,8 +17,8 @@ @body-font-family: @base-font-family, @fallback-font-family; // Sizes -@layout-gutter: 1rem; -@layout-padding: 1.5rem; +@layout-padding: 1rem; +@layout-padding-lg: 1.5rem; @control-min-width: 18rem; @border-radius: .2rem; @border-width: .1rem; |