From df2ad7f659fa246147774a7b20fa9ad6f88ff093 Mon Sep 17 00:00:00 2001 From: jina anne Date: Thu, 5 Jan 2017 17:27:21 -0800 Subject: [PATCH] fix lists (#1902) * fix lists * lint --- site/assets/styles/_site/_site-stencils.scss | 5 +++ .../assets/styles/_site/_site-typography.scss | 42 ++++++++++--------- site/platforms/ios/index.jsx | 2 +- 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/site/assets/styles/_site/_site-stencils.scss b/site/assets/styles/_site/_site-stencils.scss index 58bc8c372e..c686f00731 100644 --- a/site/assets/styles/_site/_site-stencils.scss +++ b/site/assets/styles/_site/_site-stencils.scss @@ -113,6 +113,11 @@ $stencil-dark: #a8b8d0 !default; &__squeeze { letter-spacing: -2px; } + + // scss-lint:disable SelectorDepth + .slds-picklist .slds-button { + display: block; + } } .site-list--reset { diff --git a/site/assets/styles/_site/_site-typography.scss b/site/assets/styles/_site/_site-typography.scss index 3d9b657126..bfe7451f0e 100644 --- a/site/assets/styles/_site/_site-typography.scss +++ b/site/assets/styles/_site/_site-typography.scss @@ -36,7 +36,7 @@ ol { ul, ol { - margin-bottom: 0; // Is this needed? Rule above should cover this, I think + margin-bottom: 0; } } @@ -109,28 +109,32 @@ } } - .site-main-content, - .site-guidelines, - .site-release-notes { - - ul:not(.slds-grid), - ol:not(.slds-grid) { - @include mq-small-min { - margin-left: $spacing-x-large; - } - - @include mq-medium-min { - margin-left: $spacing-xx-large; - } + ul:not(.slds-grid), + ol:not(.slds-grid) { + @include mq-small-min { + margin-left: $spacing-x-large; } - ul:not(.slds-grid) { - @include list-has-bullets; + @include mq-medium-min { + margin-left: $spacing-xx-large; } + } - ol:not(.slds-grid) { - @include list-has-numbers; - } + ul:not(.slds-grid) { + @include list-has-bullets; + } + + ol:not(.slds-grid) { + @include list-has-numbers; + } + + ul.slds-list--vertical { + margin-left: 0; + list-style: none; + } + + .site-menu--jump-links .slds-is-nested { + margin-left: $spacing-medium; } .site-main-content { diff --git a/site/platforms/ios/index.jsx b/site/platforms/ios/index.jsx index 42b214266b..a8f44e8c30 100644 --- a/site/platforms/ios/index.jsx +++ b/site/platforms/ios/index.jsx @@ -25,7 +25,7 @@ export default (
  • Setup
  • Usage -