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

BS3: Refactor panels to require default class #9819

Merged
merged 3 commits into from
Aug 19, 2013
Merged

BS3: Refactor panels to require default class #9819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bab51d2
Refactor panels to have a base class for improved flexibility when cu…
mdo Aug 19, 2013
0615142
update customizer to latest vars
mdo Aug 19, 2013
a1db2d7
Merge branch '3.0.0-wip' into bs3_panel_base_class
mdo Aug 19, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions components.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2669,14 +2669,14 @@ <h1 id="panels">Panels</h1>
<h3 id="panels-basic">Basic example</h3>
<p>By default, all the <code>.panel</code> does is apply some basic border and padding to contain some content.</p>
<div class="bs-example">
<div class="panel">
<div class="panel panel-default">
<div class="panel-body">
Basic panel example
</div>
</div>
</div>
{% highlight html %}
<div class="panel">
<div class="panel panel-default">
<div class="panel-body">
Basic panel example
</div>
Expand All @@ -2686,13 +2686,13 @@ <h3 id="panels-basic">Basic example</h3>
<h3 id="panels-heading">Panel with heading</h3>
<p>Easily add a heading container to your panel with <code>.panel-heading</code>. You may also include any <code>&lt;h1&gt;</code>-<code>&lt;h6&gt;</code> with a <code>.panel-title</code> class to add a pre-styled heading.</p>
<div class="bs-example">
<div class="panel">
<div class="panel panel-default">
<div class="panel-heading">Panel heading without title</div>
<div class="panel-body">
Panel content
</div>
</div>
<div class="panel">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
Expand All @@ -2702,14 +2702,14 @@ <h3 class="panel-title">Panel title</h3>
</div>
</div>
{% highlight html %}
<div class="panel">
<div class="panel panel-default">
<div class="panel-heading">Panel heading without title</div>
<div class="panel-body">
Panel content
</div>
</div>

<div class="panel">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Panel title</h3>
</div>
Expand All @@ -2722,15 +2722,15 @@ <h3 class="panel-title">Panel title</h3>
<h3 id="panels-footer">Panel with footer</h3>
<p>Wrap buttons or secondary text in <code>.panel-footer</code>. Note that panel footers <strong>do not</strong> inherit colors and borders when using contextual variations as they are not meant to be in the foreground.</p>
<div class="bs-example">
<div class="panel">
<div class="panel panel-default">
<div class="panel-body">
Panel content
</div>
<div class="panel-footer">Panel footer</div>
</div>
</div>
{% highlight html %}
<div class="panel">
<div class="panel panel-default">
<div class="panel-body">
Panel content
</div>
Expand Down
44 changes: 15 additions & 29 deletions customize.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,83 +931,69 @@ <h3>Dropdown items</h3>
</div>

<h2 id="variables-panels-wells">Panels and wells</h2>
<h3>Default panel styles</h3>
<h3>Common panel styles</h3>
<div class="row">
<div class="col-lg-6">
<label>@panel-bg</label>
<input type="text" class="form-control" placeholder="#fff" data-var="@panel-bg">
<p class="help-block">Panel body background color</p>
<label>@panel-heading-bg</label>
<input type="text" class="form-control" placeholder="#f5f5f5" data-var="@panel-heading-bg">
<p class="help-block">Panel heading background color</p>
<label>@panel-footer-bg</label>
<input type="text" class="form-control" placeholder="#f5f5f5" data-var="@panel-footer-bg">
<p class="help-block">Panel footer background color</p>
<label>@panel-inner-border</label>
<input type="text" class="form-control" placeholder="#ddd" data-var="@panel-inner-border">
<p class="help-block">Border color for elements within panels</p>
</div>
<div class="col-lg-6">
<label>@panel-border</label>
<input type="text" class="form-control" placeholder="#ddd" data-var="@panel-border">
<p class="help-block">Panel border color</p>
<label>@panel-border-radius</label>
<input type="text" class="form-control" placeholder="@border-radius-base" data-var="@panel-border-radius">
<p class="help-block">Panel border radius</p>
<label>@panel-footer-bg</label>
<input type="text" class="form-control" placeholder="#f5f5f5" data-var="@panel-footer-bg">
</div>
</div>
<h3>Contextual panel colors</h3>
<div class="row">
<div class="col-lg-6">
<h4>Default</h4>
<label>@panel-default-text</label>
<input type="text" class="form-control" placeholder="@gray-dark" data-var="@panel-default-text">
<label>@panel-default-border</label>
<input type="text" class="form-control" placeholder="#ddd" data-var="@panel-default-border">
<label>@panel-default-heading-bg</label>
<input type="text" class="form-control" placeholder="#f5f5f5" data-var="@panel-default-heading-bg">
<h4>Primary</h4>
<label>@panel-primary-text</label>
<input type="text" class="form-control" placeholder="#fff" data-var="@panel-primary-text">
<p class="help-block">Primary text color</p>
<label>@panel-primary-border</label>
<input type="text" class="form-control" placeholder="@brand-primary" data-var="@panel-primary-border">
<p class="help-block">Primary border color</p>
<label>@panel-primary-heading-bg</label>
<input type="text" class="form-control" placeholder="@brand-primary" data-var="@panel-primary-heading-bg">
<p class="help-block">Primary heading background color</p>
<h4>Success</h4>
<label>@panel-success-text</label>
<input type="text" class="form-control" placeholder="@state-success-text" data-var="@panel-success-text">
<p class="help-block">Success text color</p>
<label>@panel-success-border</label>
<input type="text" class="form-control" placeholder="@state-success-border" data-var="@panel-success-border">
<p class="help-block">Success border color</p>
<label>@panel-success-heading-bg</label>
<input type="text" class="form-control" placeholder="@state-success-bg" data-var="@panel-success-heading-bg">
<p class="help-block">Success heading background color</p>
</div>
<div class="col-lg-6">
<h4>Info</h4>
<label>@panel-info-text</label>
<input type="text" class="form-control" placeholder="@state-info-text" data-var="@panel-info-text">
<p class="help-block">Info text color</p>
<label>@panel-info-border</label>
<input type="text" class="form-control" placeholder="@state-info-border" data-var="@panel-info-border">
<p class="help-block">Info border color</p>
<label>@panel-info-heading-bg</label>
<input type="text" class="form-control" placeholder="@state-info-bg" data-var="@panel-info-heading-bg">
<p class="help-block">Info heading background color</p>
</div>
<div class="col-lg-6">
<h4>Warning</h4>
<label>@panel-warning-text</label>
<input type="text" class="form-control" placeholder="@state-warning-text" data-var="@panel-warning-text">
<p class="help-block">Warning text color</p>
<label>@panel-warning-border</label>
<input type="text" class="form-control" placeholder="@state-warning-border" data-var="@panel-warning-border">
<p class="help-block">Warning border color</p>
<label>@panel-warning-heading-bg</label>
<input type="text" class="form-control" placeholder="@state-warning-bg" data-var="@panel-warning-heading-bg">
<p class="help-block">Warning heading background color</p>
<h4>Danger</h4>
<label>@panel-danger-text</label>
<input type="text" class="form-control" placeholder="@state-danger-text" data-var="@panel-danger-text">
<p class="help-block">Danger text color</p>
<label>@panel-danger-border</label>
<input type="text" class="form-control" placeholder="@state-danger-border" data-var="@panel-danger-border">
<p class="help-block">Danger border color</p>
<label>@panel-danger-heading-bg</label>
<input type="text" class="form-control" placeholder="@state-danger-bg" data-var="@panel-danger-heading-bg">
<p class="help-block">Danger heading background color</p>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion dist/css/bootstrap-theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
}

.panel-heading {
.panel-default > .panel-heading {
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f5f5f5), to(#e8e8e8));
background-image: -webkit-linear-gradient(top, #f5f5f5, 0%, #e8e8e8, 100%);
background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
Expand Down