Skip to content

Commit ade2e01

Browse files
bootflatbootflat
committed
modify Thumbnails‘s images and carousel's imagees
1 parent c646da2 commit ade2e01

19 files changed

+28
-435
lines changed

‎Gruntfile.js

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ module.exports = function(grunt) {
77
'js/site.min.js': [
88
'js/jquery-1.10.1.min.js',
99
'js/bootstrap.min.js',
10-
'js/holder.js',
1110
'bootflat/js/icheck.min.js',
1211
'js/application.js'
1312
]

‎bootflat/css/bootflat.css

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootflat/css/bootflat.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootflat/css/bootflat.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootflat/scss/bootflat/_jumbotron.scss

+4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ $jumbotron-shadow: 0 1px 2px rgba(0, 0, 0, .2) !default;
4242
& .carousel-inner > .item.active img {
4343
@include radius($type: border-radius, $value: $jumbotron-radius $jumbotron-radius 0 0);
4444
}
45+
.carousel-inner > .item > a >img,
46+
.carousel-inner > .item > img {
47+
width: 100%;
48+
}
4549
& .carousel-control.left {
4650
@include radius($type: border-radius, $value: $jumbotron-radius 0 0 0);
4751
}

‎bootflat/scss/bootflat/_thumbnail.scss

+4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ $thumbnail-shadow: 0 1px 2px rgba(0, 0, 0, .2) !default;
1919
border: none;
2020
@include box-shadow($value: $list-shadow);
2121

22+
& a > img, & > img {
23+
width: 100%;
24+
}
25+
2226
& .caption {
2327
font-size: 14px;
2428
}

‎css/site.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎documentation.html

+9-9
Original file line numberDiff line numberDiff line change
@@ -1591,7 +1591,7 @@ <h2 class="example-title">Thumbnails</h2>
15911591
<div class="row">
15921592
<div class="col-sm-6 col-md-3">
15931593
<div class="thumbnail">
1594-
<img class="img-rounded" data-src="holder.js/300x200/new" alt="300x200" src="" style="width: 300px; height: 200px; ">
1594+
<img class="img-rounded" src="img/thumbnail-1.jpg" >
15951595
<div class="caption text-center">
15961596
<h3>Thumbnail label</h3>
15971597
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id ...</p>
@@ -1601,7 +1601,7 @@ <h3>Thumbnail label</h3>
16011601
</div>
16021602
<div class="col-sm-6 col-md-3">
16031603
<div class="thumbnail">
1604-
<img class="img-rounded" data-src="holder.js/300x200/new" alt="300x200" src="" style="width: 300px; height: 200px; ">
1604+
<img class="img-rounded" src="img/thumbnail-2.jpg">
16051605
<div class="caption text-center">
16061606
<h3>Thumbnail label</h3>
16071607
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id ...</p>
@@ -1611,7 +1611,7 @@ <h3>Thumbnail label</h3>
16111611
</div>
16121612
<div class="col-sm-6 col-md-3">
16131613
<div class="thumbnail">
1614-
<img class="img-rounded" data-src="holder.js/300x200/new" alt="300x200" src="" style="width: 300px; height: 200px; ">
1614+
<img class="img-rounded" src="img/thumbnail-3.jpg">
16151615
<div class="caption text-center">
16161616
<h3>Thumbnail label</h3>
16171617
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id ...</p>
@@ -1621,7 +1621,7 @@ <h3>Thumbnail label</h3>
16211621
</div>
16221622
<div class="col-sm-6 col-md-3">
16231623
<div class="thumbnail">
1624-
<img class="img-rounded" data-src="holder.js/300x200/new" alt="300x200" src="" style="width: 300px; height: 200px; ">
1624+
<img class="img-rounded" src="img/thumbnail-4.jpg">
16251625
<div class="caption text-center">
16261626
<h3>Thumbnail label</h3>
16271627
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id ...</p>
@@ -1790,21 +1790,21 @@ <h3 class="panel-title">Panel title</h3>
17901790
<h2 class="example-title">Media list</h2>
17911791
<ul class="media-list">
17921792
<li class="media">
1793-
<a class="pull-left" href="#"><img class="media-object img-rounded" data-src="holder.js/64x64/new" alt="64x64" src="" style="width: 64px; height: 64px; "></a>
1793+
<a class="pull-left" href="#"><img class="media-object img-rounded" src="img/photo-1.jpg"></a>
17941794
<div class="media-body">
17951795
<h4 class="media-heading">Media heading</h4>
17961796
<p>12 Apr, 2013 at 12:00</p>
17971797
<p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.</p>
17981798
<!-- Nested media object -->
17991799
<div class="media">
1800-
<a class="pull-left" href="#"><img class="media-object img-rounded" data-src="holder.js/64x64/new" alt="64x64" src="" style="width: 64px; height: 64px; "></a>
1800+
<a class="pull-left" href="#"><img class="media-object img-rounded" src="img/photo-2.jpg"></a>
18011801
<div class="media-body">
18021802
<h4 class="media-heading">Nested media heading</h4>
18031803
<p>12 Apr, 2013 at 12:10</p>
18041804
<p>Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis.</p>
18051805
<!-- Nested media object -->
18061806
<div class="media">
1807-
<a class="pull-left" href="#"><img class="media-object img-rounded" data-src="holder.js/64x64/new" alt="64x64" src="" style="width: 64px; height: 64px; "></a>
1807+
<a class="pull-left" href="#"><img class="media-object img-rounded" src="img/photo-3.jpg"></a>
18081808
<div class="media-body">
18091809
<h4 class="media-heading">Nested media heading</h4>
18101810
<p>12 Apr, 2013 at 12:20</p>
@@ -1815,7 +1815,7 @@ <h4 class="media-heading">Nested media heading</h4>
18151815
</div>
18161816
<!-- Nested media object -->
18171817
<div class="media">
1818-
<a class="pull-left" href="#"><img class="media-object img-rounded" data-src="holder.js/64x64/new" alt="64x64" src="" style="width: 64px; height: 64px; "></a>
1818+
<a class="pull-left" href="#"><img class="media-object img-rounded" src="img/photo-2.jpg"></a>
18191819
<div class="media-body">
18201820
<h4 class="media-heading">Nested media heading</h4>
18211821
<p>12 Apr, 2013 at 12:30</p>
@@ -1825,7 +1825,7 @@ <h4 class="media-heading">Nested media heading</h4>
18251825
</div>
18261826
</li>
18271827
<li class="media">
1828-
<a class="pull-right" href="#"><img class="media-object img-rounded" data-src="holder.js/64x64/new" alt="64x64" src="" style="width: 64px; height: 64px; "></a>
1828+
<a class="pull-right" href="#"><img class="media-object img-rounded" src="img/photo-4.jpg"></a>
18291829
<div class="media-body">
18301830
<h4 class="media-heading">Media heading</h4>
18311831
<p>12 Apr, 2013 at 12:50</p>

‎img/photo-1.jpg

25.1 KB
Loading

‎img/photo-2.jpg

25 KB
Loading

‎img/photo-3.jpg

22.2 KB
Loading

‎img/photo-4.jpg

23.2 KB
Loading

‎img/thumbnail-1.jpg

121 KB
Loading

‎img/thumbnail-2.jpg

74.1 KB
Loading

‎img/thumbnail-3.jpg

63.9 KB
Loading

‎img/thumbnail-4.jpg

113 KB
Loading

‎js/application.js

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
!function ($) {
66
$(function(){
7-
Holder.add_theme("new", { background: "#AC92EC", foreground: "#fff", size: 12 }).run();
87

98
$('.tooltip-demo').tooltip({
109
selector: "[data-toggle=tooltip]",

0 commit comments

Comments
 (0)