Skip to content

Commit

Permalink
Merge pull request #1383 from matuzalemsteles/issue-1226
Browse files Browse the repository at this point in the history
 Fixes #1226 - Replace tbar-inline-md-down with tbar-inline-xs-down
  • Loading branch information
jbalsas authored Dec 12, 2018
2 parents 24e803b + 67ae15b commit 0bf54e8
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -1026,7 +1026,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -2070,7 +2070,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay and change view o
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -2851,7 +2851,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with grouped item
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -3205,7 +3205,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with grouped item
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -3442,7 +3442,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and de
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -3836,7 +3836,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -4770,7 +4770,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -5814,7 +5814,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and li
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -6550,7 +6550,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with items and se
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -6739,7 +6739,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with selected gro
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -7468,7 +7468,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with selected ite
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -7980,7 +7980,7 @@ exports[`ClayDatasetDisplay should render a ClayDatasetDisplay with ungrouped it
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -8656,7 +8656,7 @@ exports[`ClayDatasetDisplay should select and unselect all items 1`] = `
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -9547,7 +9547,7 @@ exports[`ClayDatasetDisplay should select and unselect all items 2`] = `
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -10319,7 +10319,7 @@ exports[`ClayDatasetDisplay should select and unselect all items 3`] = `
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary"><div class="container-fluid container-fluid-max-xl"><ul class="tbar-nav tbar-nav-wrap"><li class="tbar-item"><div class="tbar-section"><span class="component-text text-truncate-inline"><span class="text-truncate">10-results-for-my search</span></span></div></li><li class="tbar-item"><div class="tbar-section"><span class="label label-dismissible component-label tbar-label"><span class="label-item label-item-expand"><div class="label-section">Label 1</div></span><span class="label-item label-item-after"><button class="btn close"aria-label="close"type="button"><svg class="lexicon-icon lexicon-icon-times"focusable="false"role="presentation"><use xlink:href="spritemap.svg#times" /></svg></button></span></span></div></li><li class="tbar-item tbar-item-expand"><div class="tbar-section"><span class="label label-dismissible component-label tbar-label"><span class="label-item label-item-expand"><div class="label-section">Label 2</div></span><span class="label-item label-item-after"><button class="btn close"aria-label="close"type="button"><svg class="lexicon-icon lexicon-icon-times"focusable="false"role="presentation"><use xlink:href="spritemap.svg#times" /></svg></button></span></span></div></li><li class="tbar-item"><div class="tbar-section"><a class=" component-link tbar-link"href="url">clear</a></div></li></ul></div></nav>
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary"><div class="container-fluid container-fluid-max-xl"><ul class="tbar-nav tbar-nav-wrap"><li class="tbar-item"><div class="tbar-section"><span class="component-text text-truncate-inline"><span class="text-truncate">10-results-for-my search</span></span></div></li><li class="tbar-item"><div class="tbar-section"><span class="label label-dismissible component-label tbar-label"><span class="label-item label-item-expand"><div class="label-section">Label 1</div></span><span class="label-item label-item-after"><button class="btn close"aria-label="close"type="button"><svg class="lexicon-icon lexicon-icon-times"focusable="false"role="presentation"><use xlink:href="spritemap.svg#times" /></svg></button></span></span></div></li><li class="tbar-item tbar-item-expand"><div class="tbar-section"><span class="label label-dismissible component-label tbar-label"><span class="label-item label-item-expand"><div class="label-section">Label 2</div></span><span class="label-item label-item-after"><button class="btn close"aria-label="close"type="button"><svg class="lexicon-icon lexicon-icon-times"focusable="false"role="presentation"><use xlink:href="spritemap.svg#times" /></svg></button></span></span></div></li><li class="tbar-item"><div class="tbar-section"><a class=" component-link tbar-link"href="url">clear</a></div></li></ul></div></nav>
2 changes: 1 addition & 1 deletion packages/clay-management-toolbar/src/ClayResultsBar.soy
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{@param? clearResultsURL: string}
{@param? searchValue: string}

<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
{let $hasFilterLabels: length($filterLabels) > 0 /}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ exports[`ClayManagementToolbar should render a disabled management toolbar with
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item tbar-item-expand">
Expand Down Expand Up @@ -391,7 +391,7 @@ exports[`ClayManagementToolbar should render a management toolbar with a clear r
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item tbar-item-expand">
Expand Down Expand Up @@ -1925,7 +1925,7 @@ exports[`ClayManagementToolbar should render a management toolbar with search re
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item tbar-item-expand">
Expand Down Expand Up @@ -1969,7 +1969,7 @@ exports[`ClayManagementToolbar should render a management toolbar with search re
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item tbar-item-expand">
Expand Down Expand Up @@ -2047,7 +2047,7 @@ exports[`ClayManagementToolbar should render a management toolbar with search re
</ul>
</div>
</nav>
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`ClayResultsBar should render a results bar with filter labels 1`] = `
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -64,7 +64,7 @@ exports[`ClayResultsBar should render a results bar with filter labels 1`] = `
`;
exports[`ClayResultsBar should render a results bar with filter labels and search value 1`] = `
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item">
Expand Down Expand Up @@ -127,7 +127,7 @@ exports[`ClayResultsBar should render a results bar with filter labels and searc
`;
exports[`ClayResultsBar should render a results bar with search value 1`] = `
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item tbar-item-expand">
Expand All @@ -148,7 +148,7 @@ exports[`ClayResultsBar should render a results bar with search value 1`] = `
`;
exports[`ClayResultsBar should render the default markup 1`] = `
<nav class="tbar tbar-inline-md-down subnav-tbar subnav-tbar-primary">
<nav class="tbar tbar-inline-xs-down subnav-tbar subnav-tbar-primary">
<div class="container-fluid container-fluid-max-xl">
<ul class="tbar-nav tbar-nav-wrap">
<li class="tbar-item tbar-item-expand">
Expand Down

0 comments on commit 0bf54e8

Please sign in to comment.