From cceebade8d743507f58047550ce7eabd308946d7 Mon Sep 17 00:00:00 2001 From: Nikolas Wise Date: Wed, 27 Jul 2016 11:13:39 -0700 Subject: [PATCH] Release --- dist/css/calcite-web-no-fonts.css | 15 ++++++++++----- dist/css/calcite-web.css | 15 ++++++++++----- dist/sass/calcite-web/grid/_block-groups.scss | 2 +- .../calcite-web/patterns/_filter-dropdown.scss | 1 - dist/sass/calcite-web/patterns/_side-nav.scss | 8 +++++++- dist/sass/calcite-web/type/_styles.scss | 7 +++++-- 6 files changed, 33 insertions(+), 15 deletions(-) diff --git a/dist/css/calcite-web-no-fonts.css b/dist/css/calcite-web-no-fonts.css index 84f693ca7..7c607f28b 100644 --- a/dist/css/calcite-web-no-fonts.css +++ b/dist/css/calcite-web-no-fonts.css @@ -2416,7 +2416,7 @@ img { margin-right: 0.75rem; -webkit-box-flex: 1; -ms-flex-positive: 1; - flex-grow: 1; + flex-grow: 0; -ms-flex-negative: 1; flex-shrink: 1; } @@ -2824,8 +2824,11 @@ li { list-style-position: outside; margin: 0.3875rem 0 0.3875rem 1.5rem; } -ul li { - list-style-type: disc; } +ul ul, +ul ol, +ol ul, +ol ol { + margin-bottom: 0; } li ul, li ol { margin-bottom: 0; } @@ -5287,7 +5290,7 @@ input.input-group-input, -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; - padding: 0.51667rem 1.55rem 0.51667rem 0.51667rem; + padding: 0.51667rem; font-size: 0.875rem; line-height: 1.55rem; color: #595959; @@ -5307,6 +5310,9 @@ input.input-group-input, .side-nav-link.is-active { text-indent: -3px; border-left: 3px solid #0079c1; } + html[dir="rtl"] .side-nav-link.is-active { + border-left: none; + border-right: 3px solid #0079c1; } body { display: flex; @@ -5876,7 +5882,6 @@ input.filter-dropdown-input { .filter-dropdown-remove { float: right; - position: absolute; right: 0; top: 1.3rem; } html[dir="rtl"] .filter-dropdown-remove { diff --git a/dist/css/calcite-web.css b/dist/css/calcite-web.css index 9ccdc03f1..5e5f63aa0 100644 --- a/dist/css/calcite-web.css +++ b/dist/css/calcite-web.css @@ -2417,7 +2417,7 @@ img { margin-right: 0.75rem; -webkit-box-flex: 1; -ms-flex-positive: 1; - flex-grow: 1; + flex-grow: 0; -ms-flex-negative: 1; flex-shrink: 1; } @@ -2946,8 +2946,11 @@ li { list-style-position: outside; margin: 0.3875rem 0 0.3875rem 1.5rem; } -ul li { - list-style-type: disc; } +ul ul, +ul ol, +ol ul, +ol ol { + margin-bottom: 0; } li ul, li ol { margin-bottom: 0; } @@ -5409,7 +5412,7 @@ input.input-group-input, -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; - padding: 0.51667rem 1.55rem 0.51667rem 0.51667rem; + padding: 0.51667rem; font-size: 0.875rem; line-height: 1.55rem; color: #595959; @@ -5429,6 +5432,9 @@ input.input-group-input, .side-nav-link.is-active { text-indent: -3px; border-left: 3px solid #0079c1; } + html[dir="rtl"] .side-nav-link.is-active { + border-left: none; + border-right: 3px solid #0079c1; } body { display: flex; @@ -5998,7 +6004,6 @@ input.filter-dropdown-input { .filter-dropdown-remove { float: right; - position: absolute; right: 0; top: 1.3rem; } html[dir="rtl"] .filter-dropdown-remove { diff --git a/dist/sass/calcite-web/grid/_block-groups.scss b/dist/sass/calcite-web/grid/_block-groups.scss index 6562afb00..f0e897809 100644 --- a/dist/sass/calcite-web/grid/_block-groups.scss +++ b/dist/sass/calcite-web/grid/_block-groups.scss @@ -23,7 +23,7 @@ $full-gutter: $half-gutter * 2; margin-right: $half-gutter; -webkit-box-flex: 1; -ms-flex-positive: 1; - flex-grow: 1; + flex-grow: 0; -ms-flex-negative: 1; flex-shrink: 1; } diff --git a/dist/sass/calcite-web/patterns/_filter-dropdown.scss b/dist/sass/calcite-web/patterns/_filter-dropdown.scss index b5f9bf423..8ef53fd92 100644 --- a/dist/sass/calcite-web/patterns/_filter-dropdown.scss +++ b/dist/sass/calcite-web/patterns/_filter-dropdown.scss @@ -134,7 +134,6 @@ @mixin filter-dropdown-remove() { @include right(); // ie 11 fix; - position: absolute; right: 0; top: 1.3rem; &:after { diff --git a/dist/sass/calcite-web/patterns/_side-nav.scss b/dist/sass/calcite-web/patterns/_side-nav.scss index 13b390e50..c429bcf0d 100644 --- a/dist/sass/calcite-web/patterns/_side-nav.scss +++ b/dist/sass/calcite-web/patterns/_side-nav.scss @@ -26,7 +26,7 @@ position: relative; display: block; @include box-sizing(border-box); - padding: $baseline/3 $baseline $baseline/3 $baseline/3; + padding: $baseline/3; @include font-size(-2); color: $darkest-gray; background-color: $white; @@ -40,6 +40,12 @@ &.is-active { text-indent: -3px; border-left: 3px solid $blue; + @if ($include-right-to-left) { + html[dir="rtl"] & { + border-left: none; + border-right: 3px solid $blue; + } + } } } diff --git a/dist/sass/calcite-web/type/_styles.scss b/dist/sass/calcite-web/type/_styles.scss index f048584f4..031ece6ff 100644 --- a/dist/sass/calcite-web/type/_styles.scss +++ b/dist/sass/calcite-web/type/_styles.scss @@ -146,8 +146,11 @@ margin: $baseline/4 0 $baseline/4 1.5rem; } - ul li { - list-style-type: disc; + ul ul, + ul ol, + ol ul, + ol ol { + margin-bottom: 0; } li ul, li ol {