diff --git a/breadcrumb.scss b/breadcrumb.scss index f1deace..ceec9d9 100644 --- a/breadcrumb.scss +++ b/breadcrumb.scss @@ -1,4 +1,4 @@ -.crumbs-1 { +.crumbs-1, .crumbs-2 { list-style: none; overflow: hidden; font-size: 1rem; @@ -12,6 +12,46 @@ float: left; cursor: pointer; + &:after, &:before { + content:" "; + display: block; + width: 0; + height: 0; + border-top: 20px solid transparent; + border-bottom: 20px solid transparent; + border-left: 14px solid #fff; + position: absolute; + top: 50%; + margin-top: -20px; + left: 100%; + } + + &:after { + z-index: 2; + } + + &:before { + border-left-color: var(--box-border); + margin-left: 1px; + z-index: 1; + } + + &.active:after, &:hover:after { + border-left: 14px solid var(--button-colored-background-hover); + } + } + + .active { + cursor: default; + } + + .active, li:hover { + background: var(--button-colored-background-hover); + } +} + +.crumbs-1 { + li { &:not(:last-child):after, &:before { content:" "; display: block; @@ -26,16 +66,6 @@ left: 100%; } - &:not(:last-child):after { - z-index: 2; - } - - &:before { - border-left-color: var(--box-border); - margin-left: 1px; - z-index: 1; - } - &.active:not(:last-child):after, &:hover:not(:last-child):after { border-left: 14px solid var(--button-colored-background-hover); } @@ -46,12 +76,4 @@ border: none; } } - - .active { - cursor: default; - } - - .active, li:hover { - background: var(--button-colored-background-hover); - } -} +} \ No newline at end of file diff --git a/button.scss b/button.scss index 800f790..d530b9f 100644 --- a/button.scss +++ b/button.scss @@ -6,19 +6,18 @@ button, input[type="submit"], input[type="button"], a.button { cursor: pointer; + display: inline-flex; min-width: 70px; - background: var(--button-colored-background); color: var(--text-on-background-color-2); margin: 0; padding: 0 1rem 0 1rem; - flex: 0; + flex-grow: 0; height: 32px; - line-height: 32px; border: none; box-shadow: none; - display: inline-block; - text-align: center; + justify-content: center; + align-items: center; &:hover { background: var(--button-colored-background-hover); diff --git a/input.scss b/input.scss index 7114c35..64b1de1 100644 --- a/input.scss +++ b/input.scss @@ -224,11 +224,6 @@ input[type="range"] { } } - i { - position: relative; - vertical-align: middle; - } - input { box-sizing: border-box; font-size: 1rem; diff --git a/nav.scss b/nav.scss index ebcaef1..45326c4 100644 --- a/nav.scss +++ b/nav.scss @@ -4,7 +4,7 @@ body > nav { width: 250px; overflow-y: auto; font-size: 0.8em; - background: linear-gradient(135deg, var(--nav-category-background-highlight), var(--nav-category-background)); + background: var(--nav-category-background); color: rgba(255, 255, 255, 0.8); } @@ -13,6 +13,7 @@ body > nav { display: flex; flex-flow: column; box-sizing: border-box; + border-top: 1px solid #4b5055; span { flex-grow: 1; @@ -60,21 +61,38 @@ body > nav { a { display: block; padding: .5rem 1rem .5rem 1rem; + border-left: 3px solid transparent; &:hover { background: var(--nav-sub-background-hover); + border-left: 3px solid var(--nav-sub-background-highlight); } } li { &:not(:first-child) { - background: linear-gradient(to right, var(--nav-sub-background-highlight), var(--nav-sub-background)); + background: var(--nav-sub-background); } &:hover, &.active { background: var(--nav-category-background-hover); } } + + + li:first-child { + border-bottom: 1px solid #212628; + } + + li:first-child { + border-top: 1px solid #4b5055; + } + } + + > li:first-child { + li:first-child { + border-top: none; + } } i { diff --git a/portlet.scss b/portlet.scss index d35d1ee..19e14d9 100644 --- a/portlet.scss +++ b/portlet.scss @@ -4,6 +4,7 @@ box-sizing: border-box; margin-top: 1rem; overflow-x: auto; + border-top: 3px solid var(--box-highlight); .portlet-head { background: #fff; diff --git a/styles.css b/styles.css index 9fca967..2d3e883 100644 --- a/styles.css +++ b/styles.css @@ -3741,9 +3741,6 @@ input[type="range"] { flex-shrink: 0; } .input button:hover { background: var(--button-colored-background-hover); } - .input i { - position: relative; - vertical-align: middle; } .input input { box-sizing: border-box; font-size: 1rem; @@ -3836,11 +3833,11 @@ blockquote { padding: 1rem; box-sizing: border-box; } -.crumbs-1 { +.crumbs-1, .crumbs-2 { list-style: none; overflow: hidden; font-size: 1rem; } - .crumbs-1 li { + .crumbs-1 li, .crumbs-2 li { background: #fff; border: 1px solid var(--box-border); padding: 10px 10px 10px 20px; @@ -3848,7 +3845,7 @@ blockquote { display: block; float: left; cursor: pointer; } - .crumbs-1 li:not(:last-child):after, .crumbs-1 li:before { + .crumbs-1 li:after, .crumbs-1 li:before, .crumbs-2 li:after, .crumbs-2 li:before { content: " "; display: block; width: 0; @@ -3860,38 +3857,53 @@ blockquote { top: 50%; margin-top: -20px; left: 100%; } - .crumbs-1 li:not(:last-child):after { + .crumbs-1 li:after, .crumbs-2 li:after { z-index: 2; } - .crumbs-1 li:before { + .crumbs-1 li:before, .crumbs-2 li:before { border-left-color: var(--box-border); margin-left: 1px; z-index: 1; } - .crumbs-1 li.active:not(:last-child):after, .crumbs-1 li:hover:not(:last-child):after { + .crumbs-1 li.active:after, .crumbs-1 li:hover:after, .crumbs-2 li.active:after, .crumbs-2 li:hover:after { border-left: 14px solid var(--button-colored-background-hover); } - .crumbs-1 :last-child:before { - border: none; } - .crumbs-1 .active { + .crumbs-1 .active, .crumbs-2 .active { cursor: default; } - .crumbs-1 .active, .crumbs-1 li:hover { + .crumbs-1 .active, .crumbs-1 li:hover, .crumbs-2 .active, .crumbs-2 li:hover { background: var(--button-colored-background-hover); } +.crumbs-1 li:not(:last-child):after, .crumbs-1 li:before { + content: " "; + display: block; + width: 0; + height: 0; + border-top: 20px solid transparent; + border-bottom: 20px solid transparent; + border-left: 14px solid #fff; + position: absolute; + top: 50%; + margin-top: -20px; + left: 100%; } +.crumbs-1 li.active:not(:last-child):after, .crumbs-1 li:hover:not(:last-child):after { + border-left: 14px solid var(--button-colored-background-hover); } +.crumbs-1 :last-child:before { + border: none; } + .btn { cursor: pointer; } button, input[type="submit"], input[type="button"], a.button { cursor: pointer; + display: inline-flex; min-width: 70px; background: var(--button-colored-background); color: var(--text-on-background-color-2); margin: 0; padding: 0 1rem 0 1rem; - flex: 0; + flex-grow: 0; height: 32px; - line-height: 32px; border: none; box-shadow: none; - display: inline-block; - text-align: center; } + justify-content: center; + align-items: center; } button:hover, input[type="submit"]:hover, input[type="button"]:hover, a.button:hover { background: var(--button-colored-background-hover); } @@ -3920,14 +3932,15 @@ body > nav { width: 250px; overflow-y: auto; font-size: 0.8em; - background: linear-gradient(135deg, var(--nav-category-background-highlight), var(--nav-category-background)); + background: var(--nav-category-background); color: rgba(255, 255, 255, 0.8); } #nav-side { flex: 0; display: flex; flex-flow: column; - box-sizing: border-box; } + box-sizing: border-box; + border-top: 1px solid #4b5055; } #nav-side span { flex-grow: 1; } #nav-side input { @@ -3954,13 +3967,21 @@ body > nav { display: block; } #nav-side > li a { display: block; - padding: .5rem 1rem .5rem 1rem; } + padding: .5rem 1rem .5rem 1rem; + border-left: 3px solid transparent; } #nav-side > li a:hover { - background: var(--nav-sub-background-hover); } + background: var(--nav-sub-background-hover); + border-left: 3px solid var(--nav-sub-background-highlight); } #nav-side > li li:not(:first-child) { - background: linear-gradient(to right, var(--nav-sub-background-highlight), var(--nav-sub-background)); } + background: var(--nav-sub-background); } #nav-side > li li:hover, #nav-side > li li.active { background: var(--nav-category-background-hover); } + #nav-side > li li:first-child { + border-bottom: 1px solid #212628; } + #nav-side > li li:first-child { + border-top: 1px solid #4b5055; } + #nav-side > li:first-child li:first-child { + border-top: none; } #nav-side i { margin-right: 5px; flex-grow: 0; } @@ -4283,13 +4304,11 @@ section > h2 { border-top: 1px solid var(--box-border); } .tab-2 .tab-links label { - padding: 5px 10px 5px 10px; - border: 1px solid transparent; } + padding: 5px 10px 5px 10px; } .tab-2 .tab-links li { margin: 0 5px 15px 0; } .tab-2 .tab-links .active a, .tab-2 .tab-links .active label { color: var(--text-on-background-color-2); - border: 1px solid var(--box-border); background: var(--button-colored-background); } table.fixed { @@ -4423,7 +4442,8 @@ span.tag { border-radius: 4px; box-sizing: border-box; margin-top: 1rem; - overflow-x: auto; } + overflow-x: auto; + border-top: 3px solid var(--box-highlight); } .portlet .portlet-head { background: #fff; border-top-left-radius: 4px; diff --git a/styles.scss b/styles.scss index fb4eb6d..c68e611 100644 --- a/styles.scss +++ b/styles.scss @@ -1,6 +1,4 @@ @import "clean", "default", "size", "transformation", "alignment", "visibility", "animate", "grid"; @import "article", "layout", "draggable", "text", "tooltip", "spinner", "canvas", "form", "icon", "image", "input", "accordion", "alert", "badge", "slider", "blockquote", "breadcrumb", "button", "link", "list", "nav", "note", "pagination", "popup", "progress", "section", "tab", "table", "tag"; @import "media"; - - @import "portlet"; \ No newline at end of file diff --git a/tab.scss b/tab.scss index f7cd409..996e2b1 100644 --- a/tab.scss +++ b/tab.scss @@ -112,7 +112,6 @@ .tab-links { label { padding: 5px 10px 5px 10px; - border: 1px solid transparent; // fixes jumping text for active and non-active labels } li { @@ -121,7 +120,6 @@ .active a, .active label { color: var(--text-on-background-color-2); - border: 1px solid var(--box-border); background: var(--button-colored-background) } }