Skip to content
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

Jump to bottom

Restore grid mixins #11050

Merged
merged 4 commits into from
Oct 14, 2013
Merged

Restore grid mixins #11050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c814ad1
Combine separate efforts for grid mixins into one, cleanup and reorga…
mdo Oct 12, 2013
a46003b
restore var to customizer
mdo Oct 12, 2013
265fda7
Merge branch 'master' into restore_grid_mixins
mdo Oct 14, 2013
bf73f1f
Merge branch 'master' into restore_grid_mixins
mdo Oct 14, 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 _includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</title>

<!-- Bootstrap core CSS -->
<link href="{{ page.base_url }}dist/css/bootstrap.css" rel="stylesheet">
<link href="{{ page.base_url }}dist/css/bootstrap.min.css" rel="stylesheet">

<!-- Documentation extras -->
<link href="{{ page.base_url }}docs-assets/css/docs.css" rel="stylesheet">
Expand Down
3 changes: 0 additions & 3 deletions customize.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,14 +509,11 @@ <h3>Layout and grid system</h3>
</div>

<div class="row">
<!--
Temporarily removed until mixins are restored in v3.1
<div class="col-xs-6 col-sm-4">
<label>@grid-columns</label>
<input type="text" class="form-control" placeholder="12" data-var="@grid-columns">
<p class="help-block">Number of columns in the grid.</p>
</div>
-->
<div class="col-xs-6 col-sm-4">
<label>@grid-gutter-width</label>
<input type="text" class="form-control" placeholder="30px" data-var="@grid-gutter-width">
Expand Down
Loading