Skip to content

READY: Add columnal list classes #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tandrewnichols wants to merge 2 commits into
base: master
Choose a base branch
from
Open

READY: Add columnal list classes #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90a3d18
Add columnal list classes
Dec 4, 2013
e42e3b6
Use static variable for margin
Dec 5, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/js/raw-files.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap",
"version": "3.0.26",
"version": "3.0.27",
"main": [
"./dist/js/bootstrap.js",
"./dist/css/bootstrap-manta.css"
Expand Down
27 changes: 27 additions & 0 deletions dist/css/bootstrap-manta.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7485,4 +7485,31 @@ ul.nav li.dropdown:hover > ul.dropdown-menu.dropdown-onhover {
text-overflow: ellipsis;
white-space: nowrap;
vertical-align: middle;
}

.columnal-list-2 {
padding-left: 0;
margin-bottom: 20px;
list-style-position: inside;
columns: 2;
-webkit-columns: 2;
-moz-columns: 2;
}

.columnal-list-3 {
padding-left: 0;
margin-bottom: 20px;
list-style-position: inside;
columns: 3;
-webkit-columns: 3;
-moz-columns: 3;
}

.columnal-list-4 {
padding-left: 0;
margin-bottom: 20px;
list-style-position: inside;
columns: 4;
-webkit-columns: 4;
-moz-columns: 4;
}
2 changes: 1 addition & 1 deletion dist/css/bootstrap-manta.min.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* bootstrap.js v3.0.26 by @fat and @mdo
* bootstrap.js v3.0.27 by @fat and @mdo
* Copyright 2013 Twitter Inc.
* http://www.apache.org/licenses/LICENSE-2.0
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/js/bootstrap.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 25 additions & 1 deletion less/manta-custom.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ ul.nav li.dropdown:hover > ul.dropdown-menu.dropdown-onhover {
height: @input-height-small;
}

// User name truncation for navigation
// Text truncation with ellipsis
.ellipsis {
vertical-align: middle;
display: inline-block;
Expand All @@ -359,3 +359,27 @@ ul.nav li.dropdown:hover > ul.dropdown-menu.dropdown-onhover {
white-space: nowrap;
}

// Columnal lists
// NOTE: these won't work in ie
.columnal-list (@columns: 2) {
columns: @columns;
-webkit-columns: @columns;
-moz-columns: @columns;
list-style-position: inside;
padding-left: 0;
margin-bottom: @padding-large-vertical * 2;
}

.columnal-list-2 {
.columnal-list;
}

.columnal-list-3 {
.columnal-list(3);
}

.columnal-list-4 {
.columnal-list(4);
}


90 changes: 90 additions & 0 deletions manta-components.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,96 @@ <h3 id="inline-delete">Inline Delete Confirmation</h1>
</div>
</div>
{% endhighlight %}

<h3 id="columnal-list">Columnal Lists</h3>
<p>Add lists with 2, 3, or 4 columns</p>
<div class="bs-example">
<h5>Animals (2 columns)</h5>
<ul class="columnal-list-2">
<li>Aardvark</li>
<li>Badger</li>
<li>Sloth</li>
<li>Anteater</li>
<li>Wombat</li>
<li>Aye-aye</li>
<li>Tapir</li>
<li>Sea Pig</li>
<li>Owl</li>
<li>Gila Monster</li>
</ul>
</div>
{% highlight html %}
<ul class="columnal-list-2">
<li>Aardvark</li>
<li>Badger</li>
<li>Sloth</li>
<li>Anteater</li>
<li>Wombat</li>
<li>Aye-aye</li>
<li>Tapir</li>
<li>Sea Pig</li>
<li>Owl</li>
<li>Gila Monster</li>
</ul>
{% endhighlight %}
<div class="bs-example">
<h5>Animals (3 columns)</h5>
<ul class="columnal-list-3">
<li>Aardvark</li>
<li>Badger</li>
<li>Sloth</li>
<li>Anteater</li>
<li>Wombat</li>
<li>Aye-aye</li>
<li>Tapir</li>
<li>Sea Pig</li>
<li>Owl</li>
<li>Gila Monster</li>
</ul>
</div>
{% highlight html %}
<ul class="columnal-list-3">
<li>Aardvark</li>
<li>Badger</li>
<li>Sloth</li>
<li>Anteater</li>
<li>Wombat</li>
<li>Aye-aye</li>
<li>Tapir</li>
<li>Sea Pig</li>
<li>Owl</li>
<li>Gila Monster</li>
</ul>
{% endhighlight %}
<div class="bs-example">
<h5>Animals (4 columns)</h5>
<ul class="columnal-list-4">
<li>Aardvark</li>
<li>Badger</li>
<li>Sloth</li>
<li>Anteater</li>
<li>Wombat</li>
<li>Aye-aye</li>
<li>Tapir</li>
<li>Sea Pig</li>
<li>Owl</li>
<li>Gila Monster</li>
</ul>
</div>
{% highlight html %}
<ul class="columnal-list-4">
<li>Aardvark</li>
<li>Badger</li>
<li>Sloth</li>
<li>Anteater</li>
<li>Wombat</li>
<li>Aye-aye</li>
<li>Tapir</li>
<li>Sea Pig</li>
<li>Owl</li>
<li>Gila Monster</li>
</ul>
{% endhighlight %}
</div>

<div class="bs-docs-section">
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bootstrap"
, "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
, "version": "3.0.26"
, "version": "3.0.27"
, "keywords": ["bootstrap", "css"]
, "homepage": "http://bootstrap-docs.aws.ecnext.net/"
, "author": "Twitter Inc."
Expand Down