Skip to content

Commit

Permalink
fix lists (#1902)
Browse files Browse the repository at this point in the history
* fix lists

* lint
  • Loading branch information
jina anne authored Jan 6, 2017
1 parent 31a4385 commit df2ad7f
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 20 deletions.
5 changes: 5 additions & 0 deletions site/assets/styles/_site/_site-stencils.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
42 changes: 23 additions & 19 deletions site/assets/styles/_site/_site-typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
ol {
ul,
ol {
margin-bottom: 0; // Is this needed? Rule above should cover this, I think
margin-bottom: 0;
}
}

Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion site/platforms/ios/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default (
<li><a href="#setup">Setup</a></li>
<li>
<a href="#usage">Usage</a>
<ul>
<ul className="slds-list--vertical slds-has-block-links slds-is-nested">
<li><a href="#colors">Colors</a></li>
<li><a href="#fonts">Fonts and Text Sizes</a></li>
<li><a href="#icons">Icons</a></li>
Expand Down

0 comments on commit df2ad7f

Please sign in to comment.