diff options
6 files changed, 53 insertions, 16 deletions
| -rw-r--r-- | src/buttons.less | 6 | ||||
| -rw-r--r-- | src/forms.less | 9 | ||||
| -rwxr-xr-x | src/navbar.less | 17 | ||||
| -rw-r--r-- | src/panels.less | 31 | ||||
| -rw-r--r-- | src/tabs.less | 2 | ||||
| -rw-r--r-- | src/tiles.less | 4 |
diff --git a/src/buttons.less b/src/buttons.less index 5e6fcb8..56f52d1 100644 --- a/src/buttons.less +++ b/src/buttons.less @@ -151,15 +151,15 @@ .btn { flex: 1 0 auto; - &:first-of-type:not(:last-of-type) { + &:first-child:not(:last-child) { border-bottom-right-radius: 0; border-top-right-radius: 0; } - &:not(:first-of-type):not(:last-of-type) { + &:not(:first-child):not(:last-child) { border-radius: 0; margin-left: -.1rem; } - &:last-of-type:not(:first-of-type) { + &:last-child:not(:first-child) { border-bottom-left-radius: 0; border-top-left-radius: 0; margin-left: -.1rem; diff --git a/src/forms.less b/src/forms.less index 226570a..fca22d8 100644 --- a/src/forms.less +++ b/src/forms.less @@ -161,7 +161,6 @@ } .form-checkbox, .form-radio { - cursor: pointer; display: inline-block; line-height: 1.8rem; padding: .3rem 2rem; @@ -170,6 +169,7 @@ .form-icon { border: .1rem solid @light-gray-color; .control-transition(); + cursor: pointer; display: inline-block; font-size: 1.4rem; height: 1.4rem; @@ -256,7 +256,6 @@ // Form element: Switch .form-switch { - cursor: pointer; display: inline-block; line-height: 2rem; padding: .2rem 2rem .2rem 3.6rem; @@ -267,6 +266,7 @@ background-clip: padding-box; border: .1rem solid @light-gray-color; border-radius: .9rem; + cursor: pointer; display: inline-block; height: 1.8rem; left: 0; @@ -365,7 +365,7 @@ &:disabled, &.disabled { background-color: @dark-bg-color; - cursor: default; + cursor: not-allowed; opacity: .5; } } @@ -376,9 +376,8 @@ input { & + .form-icon { background: @dark-bg-color; border-color: @light-gray-color; - cursor: default; + cursor: not-allowed; opacity: .5; - pointer-events: none; } } } diff --git a/src/navbar.less b/src/navbar.less index d86c553..bc12a80 100755 --- a/src/navbar.less +++ b/src/navbar.less @@ -1,21 +1,28 @@ // Navbar .navbar { - align-items: center; + align-items: stretch; display: flex; flex-wrap: wrap; - justify-content: space-between; .navbar-section { align-items: center; display: flex; - padding: 1rem 0; + flex: 1 0 0; + + &:last-of-type { + justify-content: flex-end; + } + } + + .navbar-primary { + align-items: center; + display: flex; + flex: 0 0 auto; } .navbar-brand { font-size: 1.6rem; font-weight: 500; - margin-right: 2rem; text-decoration: none; - vertical-align: middle; } } diff --git a/src/panels.less b/src/panels.less new file mode 100644 index 0000000..e368d76 --- /dev/null +++ b/src/panels.less @@ -0,0 +1,31 @@ +// Panels +.panel { + border: .1rem solid @border-color; + border-radius: @border-radius; + display: flex; + flex-direction: column; + + .panel-header, + .panel-footer { + flex: 0 0 auto; + padding: 1.5rem; + } + + .panel-nav { + flex: 0 0 auto; + } + + .panel-body { + flex: 1 1 auto; + overflow-y: auto; + } + + .panel-body { + padding: 0 1.5rem; + } + + .panel-title { + font-size: 2rem; + line-height: 1.4; + } +} diff --git a/src/tabs.less b/src/tabs.less index 6bcc58c..6fc376b 100644 --- a/src/tabs.less +++ b/src/tabs.less @@ -15,7 +15,7 @@ a { border-bottom: .2rem solid transparent; - color: @body-font-color; + color: inherit; display: block; margin-bottom: -.1rem; margin-top: 0; diff --git a/src/tiles.less b/src/tiles.less index e43fd6b..c5db749 100644 --- a/src/tiles.less +++ b/src/tiles.less @@ -3,7 +3,7 @@ align-content: space-between; align-items: flex-start; display: flex; - margin: 0; + margin: .5rem 0; padding: .5rem 0; .tile-icon, @@ -20,11 +20,11 @@ } } .tile-title { - font-size: 1.6rem; font-weight: 500; } .tile-meta { color: @gray-color; + line-height: 2rem; } &.tile-centered { |