diff options
| author | Mark Otto <[email protected]> | 2013-08-18 15:43:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 15:43:27 -0700 |
| commit | 7b4e2a9a4a9c3d6dc2298bb7a4cbfd9d86ac32fa (patch) | |
| tree | 55e084b792818900f4db658e60d8ff699e80c4ad /customize.html | |
| parent | fe767a18d369080df509377e049b616c0c572dcc (diff) | |
| parent | ef68cf8ebdabccfa4bb9126acdc79f0510b04537 (diff) | |
| download | bootstrap-7b4e2a9a4a9c3d6dc2298bb7a4cbfd9d86ac32fa.tar.xz bootstrap-7b4e2a9a4a9c3d6dc2298bb7a4cbfd9d86ac32fa.zip | |
Merge branch '3.0.0-navbar-default' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-navbar-default
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'customize.html')
| -rw-r--r-- | customize.html | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/customize.html b/customize.html index 9d6f2756b..b066bb8fc 100644 --- a/customize.html +++ b/customize.html @@ -710,41 +710,41 @@ base_url: "../" <input type="text" class="form-control" placeholder="50px" data-var="@navbar-height"> <label>@navbar-margin-bottom</label> <input type="text" class="form-control" placeholder="@line-height-computed" data-var="@navbar-margin-bottom"> - <label>@navbar-color</label> - <input type="text" class="form-control" placeholder="#777" data-var="@navbar-color"> - <label>@navbar-bg</label> - <input type="text" class="form-control" placeholder="#eee" data-var="@navbar-bg"> + <label>@navbar-default-color</label> + <input type="text" class="form-control" placeholder="#777" data-var="@navbar-default-color"> + <label>@navbar-default-bg</label> + <input type="text" class="form-control" placeholder="#eee" data-var="@navbar-default-bg"> <label>@navbar-border-radius</label> <input type="text" class="form-control" placeholder="@border-radius-base" data-var="@navbar-border-radius"> <h4>Links</h4> - <label>@navbar-link-color</label> - <input type="text" class="form-control" placeholder="#777" data-var="@navbar-link-color"> - <label>@navbar-link-hover-color</label> - <input type="text" class="form-control" placeholder="#333" data-var="@navbar-link-hover-color"> - <label>@navbar-link-hover-bg</label> - <input type="text" class="form-control" placeholder="transparent" data-var="@navbar-link-hover-bg"> - <label>@navbar-link-active-color</label> - <input type="text" class="form-control" placeholder="#555" data-var="@navbar-link-active-color"> - <label>@navbar-link-active-bg</label> - <input type="text" class="form-control" placeholder="darken(@navbar-bg, 10%)" data-var="@navbar-link-active-bg"> - <label>@navbar-link-disabled-color</label> - <input type="text" class="form-control" placeholder="#ccc" data-var="@navbar-link-disabled-color"> - <label>@navbar-link-disabled-bg</label> - <input type="text" class="form-control" placeholder="transparent" data-var="@navbar-link-disabled-bg"> + <label>@navbar-default-link-color</label> + <input type="text" class="form-control" placeholder="#777" data-var="@navbar-default-link-color"> + <label>@navbar-default-link-hover-color</label> + <input type="text" class="form-control" placeholder="#333" data-var="@navbar-default-link-hover-color"> + <label>@navbar-default-link-hover-bg</label> + <input type="text" class="form-control" placeholder="transparent" data-var="@navbar-default-link-hover-bg"> + <label>@navbar-default-link-active-color</label> + <input type="text" class="form-control" placeholder="#555" data-var="@navbar-default-link-active-color"> + <label>@navbar-default-link-active-bg</label> + <input type="text" class="form-control" placeholder="darken(@navbar-bg, 10%)" data-var="@navbar-default-link-active-bg"> + <label>@navbar-default-link-disabled-color</label> + <input type="text" class="form-control" placeholder="#ccc" data-var="@navbar-default-link-disabled-color"> + <label>@navbar-default-link-disabled-bg</label> + <input type="text" class="form-control" placeholder="transparent" data-var="@navbar-default-link-disabled-bg"> <h4>Brand</h4> - <label>@navbar-brand-color</label> - <input type="text" class="form-control" placeholder="@navbar-link-color" data-var="@navbar-brand-color"> - <label>@navbar-brand-hover-color</label> - <input type="text" class="form-control" placeholder="darken(@navbar-link-color, 10%)" data-var="@navbar-brand-hover-color"> - <label>@navbar-brand-hover-bg</label> - <input type="text" class="form-control" placeholder="transparent" data-var="@navbar-brand-hover-bg"> + <label>@navbar-default-brand-color</label> + <input type="text" class="form-control" placeholder="@navbar-link-color" data-var="@navbar-default-brand-color"> + <label>@navbar-default-brand-hover-color</label> + <input type="text" class="form-control" placeholder="darken(@navbar-link-color, 10%)" data-var="@navbar-default-brand-hover-color"> + <label>@navbar-default-brand-hover-bg</label> + <input type="text" class="form-control" placeholder="transparent" data-var="@navbar-default-brand-hover-bg"> <h4>Toggle</h4> - <label>@navbar-toggle-hover-bg</label> - <input type="text" class="form-control" placeholder="#ddd" data-var="@navbar-toggle-hover-bg"> - <label>@navbar-toggle-icon-bar-bg</label> - <input type="text" class="form-control" placeholder="#ccc" data-var="@navbar-toggle-icon-bar-bg"> - <label>@navbar-toggle-border-color</label> - <input type="text" class="form-control" placeholder="#ddd" data-var="@navbar-toggle-border-color"> + <label>@navbar-default-toggle-hover-bg</label> + <input type="text" class="form-control" placeholder="#ddd" data-var="@navbar-default-toggle-hover-bg"> + <label>@navbar-default-toggle-icon-bar-bg</label> + <input type="text" class="form-control" placeholder="#ccc" data-var="@navbar-default-toggle-icon-bar-bg"> + <label>@navbar-default-toggle-border-color</label> + <input type="text" class="form-control" placeholder="#ddd" data-var="@navbar-default-toggle-border-color"> </div> <div class="col-lg-6"> <h3>Inverted navbar</h3> |