diff options
| author | Ivan Khalopik <[email protected]> | 2013-05-07 15:16:45 +0300 |
|---|---|---|
| committer | Ivan Khalopik <[email protected]> | 2013-05-07 15:16:45 +0300 |
| commit | 3c7a43a1f373d0c534476578b96a75ae2e63c985 (patch) | |
| tree | f11fa18c33d1a65ae4422dc3c352c34a2b323b8c /less/thumbnails.less | |
| parent | 41c782567775d3bbcfc62d163ae22a531277b5e2 (diff) | |
| parent | b352f98f325adbd994f01cb94f4d0a454783bbce (diff) | |
| download | bootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.tar.xz bootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.zip | |
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts:
js/tests/unit/bootstrap-collapse.js
Diffstat (limited to 'less/thumbnails.less')
| -rw-r--r-- | less/thumbnails.less | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/less/thumbnails.less b/less/thumbnails.less index 4ea27f517..f31d78617 100644 --- a/less/thumbnails.less +++ b/less/thumbnails.less @@ -12,8 +12,9 @@ .img-thumbnail { padding: 4px; line-height: @line-height-base; - border: 1px solid #ddd; - border-radius: @border-radius-base; + background-color: @thumbnail-bg; + border: 1px solid @thumbnail-border; + border-radius: @thumbnail-border-radius; .transition(all .2s ease-in-out); } .thumbnail { @@ -38,5 +39,5 @@ a.thumbnail:focus { } .thumbnail .caption { padding: 9px; - color: @gray; + color: @thumbnail-caption-color; } |