jinql
/
blur-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor(panelsPage): same width for bootrap panels

pull/3/head
alex 2016-02-18 17:20:01 +03:00
parent 9c34dc5b0c
commit 4668d84766
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/pages/ui/panels/panels.html
View File

@ -68,7 +68,7 @@
<div class="row"> <div class="row">
<div class="col-md-12 col-lg-4"> <div class="col-md-12 col-lg-4">
<div class="panel panel-default bootstrap-panel"> <div class="panel panel-default bootstrap-panel xsmall-panel">
<div class="panel-body"> <div class="panel-body">
<p>A panel in bootstrap is a bordered box with some padding around its content.</p> <p>A panel in bootstrap is a bordered box with some padding around its content.</p>
@ -81,7 +81,7 @@
</div> </div>
<div class="col-md-12 col-lg-4"> <div class="col-md-12 col-lg-4">
<div class="panel panel-default bootstrap-panel"> <div class="panel panel-default bootstrap-panel xsmall-panel">
<div class="panel-heading">Panel Heading</div> <div class="panel-heading">Panel Heading</div>
<div class="panel-body"> <div class="panel-body">
<p class="p-with-code">The <code>.panel-heading</code> class adds a heading to the panel.Easily add a heading <p class="p-with-code">The <code>.panel-heading</code> class adds a heading to the panel.Easily add a heading
@ -95,7 +95,7 @@
<div class="col-md-12 col-lg-4"> <div class="col-md-12 col-lg-4">
<div class="panel panel-default bootstrap-panel"> <div class="panel panel-default bootstrap-panel">
<div class="panel-body"> <div class="panel-body footer-panel">
<p class="p-with-code"> <p class="p-with-code">
Wrap buttons or secondary text in <code>.panel-footer</code>. Note that panel footers do not inherit colors Wrap buttons or secondary text in <code>.panel-footer</code>. Note that panel footers do not inherit colors
and and

16
src/app/pages/ui/slider/slider.html
View File

@ -9,7 +9,7 @@
max="100" max="100"
from="45" from="45"
disable="false" disable="false"
timeout="150"> timeout="350">
</ion-slider> </ion-slider>
</div> </div>
<div class="slider-box"> <div class="slider-box">
@ -21,7 +21,7 @@
prefix="$" prefix="$"
from="420" from="420"
disable="false" disable="false"
timeout="150"> timeout="350">
</ion-slider> </ion-slider>
</div> </div>
<div class="slider-box"> <div class="slider-box">
@ -33,7 +33,7 @@
postfix="°" postfix="°"
from="36" from="36"
disable="false" disable="false"
timeout="150"> timeout="350">
</ion-slider> </ion-slider>
</div> </div>
<div class="slider-box"> <div class="slider-box">
@ -45,7 +45,7 @@
from="420" from="420"
to="900" to="900"
disable="false" disable="false"
timeout="150"> timeout="350">
</ion-slider> </ion-slider>
</div> </div>
<div class="slider-box"> <div class="slider-box">
@ -57,7 +57,7 @@
from="300" from="300"
step="50" step="50"
disable="false" disable="false"
timeout="150"> timeout="350">
</ion-slider> </ion-slider>
</div> </div>
<div class="slider-box"> <div class="slider-box">
@ -71,7 +71,7 @@
prettify-separator="." prettify-separator="."
prettify="true" prettify="true"
disable="false" disable="false"
timeout="150"> timeout="350">
</ion-slider> </ion-slider>
</div> </div>
<div class="slider-box"> <div class="slider-box">
@ -85,7 +85,7 @@
'July', 'August', 'September', 'July', 'August', 'September',
'October', 'November', 'December']" 'October', 'November', 'December']"
disable="false" disable="false"
timeout="150"> timeout="350">
</ion-slider> </ion-slider>
</div> </div>
<div class="slider-box"> <div class="slider-box">
@ -96,7 +96,7 @@
max="100" max="100"
from="45" from="45"
disable="true" disable="true"
timeout="150"> timeout="350">
</ion-slider> </ion-slider>
</div> </div>
</div> </div>

4
src/sass/theme/bootstrap-overrides/_panel.scss
View File

@ -169,6 +169,10 @@ $panel-heading-font-size: 16px;
height: 120px; height: 120px;
} }
.footer-panel{
height: 142px;
}
/* /*
.panel-group .panel { .panel-group .panel {
border-radius: 0; border-radius: 0;