Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
fee3f1e7
Commit
fee3f1e7
authored
Aug 15, 2013
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes #9582: restore img-responsive as a class and move it's mixin to mixins.less
parent
1b6a5bbc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
11 deletions
+26
-11
dist/css/bootstrap.css
dist/css/bootstrap.css
+6
-0
dist/css/bootstrap.min.css
dist/css/bootstrap.min.css
+1
-1
less/mixins.less
less/mixins.less
+17
-6
less/scaffolding.less
less/scaffolding.less
+2
-4
No files found.
dist/css/bootstrap.css
View file @
fee3f1e7
...
@@ -344,6 +344,12 @@ img {
...
@@ -344,6 +344,12 @@ img {
vertical-align
:
middle
;
vertical-align
:
middle
;
}
}
.img-responsive
{
display
:
block
;
height
:
auto
;
max-width
:
100%
;
}
.img-rounded
{
.img-rounded
{
border-radius
:
6px
;
border-radius
:
6px
;
}
}
...
...
dist/css/bootstrap.min.css
View file @
fee3f1e7
This source diff could not be displayed because it is too large. You can
view the blob
instead.
less/mixins.less
View file @
fee3f1e7
...
@@ -294,10 +294,10 @@
...
@@ -294,10 +294,10 @@
// RETINA IMAGE SUPPORT
// Retina images
// --------------------------------------------------
//
// Short retina mixin for setting background-image and -size
// Short retina mixin for setting background-image and -size
.img-retina(@file-1x; @file-2x; @width-1x; @height-1x) {
.img-retina(@file-1x; @file-2x; @width-1x; @height-1x) {
background-image: url("@{file-1x}");
background-image: url("@{file-1x}");
...
@@ -314,6 +314,17 @@
...
@@ -314,6 +314,17 @@
}
}
// Responsive image
//
// Keep images from scaling beyond the width of their parents.
.img-responsive(@display: block;) {
display: @display;
max-width: 100%; // Part 1: Set a maximum relative to the parent
height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
}
// COMPONENT MIXINS
// COMPONENT MIXINS
// --------------------------------------------------
// --------------------------------------------------
...
@@ -376,7 +387,7 @@
...
@@ -376,7 +387,7 @@
border-color: @border;
border-color: @border;
}
}
}
}
// Hover states for `.table-hover`
// Hover states for `.table-hover`
// Note: this is not available for cells or rows within `thead` or `tfoot`.
// Note: this is not available for cells or rows within `thead` or `tfoot`.
.table-hover > tbody > tr {
.table-hover > tbody > tr {
...
@@ -710,12 +721,12 @@
...
@@ -710,12 +721,12 @@
font-size: @font-size;
font-size: @font-size;
line-height: @line-height;
line-height: @line-height;
border-radius: @border-radius;
border-radius: @border-radius;
select& {
select& {
height: @input-height;
height: @input-height;
line-height: @input-height;
line-height: @input-height;
}
}
textarea& {
textarea& {
height: auto;
height: auto;
}
}
...
...
less/scaffolding.less
View file @
fee3f1e7
...
@@ -73,10 +73,8 @@ img {
...
@@ -73,10 +73,8 @@ img {
}
}
// Responsive images (ensure images don't scale beyond their parents)
// Responsive images (ensure images don't scale beyond their parents)
.img-responsive(@display: block;) {
.img-responsive {
display: @display;
.img-responsive();
max-width: 100%; // Part 1: Set a maximum relative to the parent
height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
}
}
// Rounded corners
// Rounded corners
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment