Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
47bef3c6
Commit
47bef3c6
authored
10 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
more media query mixins
parent
44f948ad
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
less/_carousel.less
+2
-3
less/_carousel.less
less/_dropdown.less
+2
-2
less/_dropdown.less
less/_forms.less
+4
-4
less/_forms.less
less/_grid.less
+6
-6
less/_grid.less
less/_jumbotron.less
+2
-2
less/_jumbotron.less
less/_modal.less
+4
-4
less/_modal.less
with
20 additions
and
21 deletions
+20
-21
less/_carousel.less
+
2
-
3
View file @
47bef3c6
...
...
@@ -219,8 +219,7 @@
// Scale up controls for tablets and up
@media screen and (min-width: @screen-sm-min) {
.media-sm({
// Scale up the controls a smidge
.carousel-control {
.icon-prev,
...
...
@@ -249,4 +248,4 @@
.carousel-indicators {
bottom: 20px;
}
}
}
);
This diff is collapsed.
Click to expand it.
less/_dropdown.less
+
2
-
2
View file @
47bef3c6
...
...
@@ -192,7 +192,7 @@
//
// Reiterate per navbar.less and the modified component alignment there.
@
media
(min-width: @grid-float-breakpoint)
{
.
media
-sm(
{
.navbar-right {
.dropdown-menu {
.dropdown-menu-right();
...
...
@@ -203,4 +203,4 @@
.dropdown-menu-left();
}
}
}
}
);
This diff is collapsed.
Click to expand it.
less/_forms.less
+
4
-
4
View file @
47bef3c6
...
...
@@ -424,7 +424,7 @@ input[type="checkbox"] {
.form-inline {
// Kick in the inline
@
media
(min-width: @screen-sm-min)
{
.
media
-sm(
{
// Inline-block all the things for "inline"
.form-group {
display: inline-block;
...
...
@@ -489,7 +489,7 @@ input[type="checkbox"] {
.has-feedback .form-control-feedback {
top: 0;
}
}
}
);
}
...
...
@@ -525,13 +525,13 @@ input[type="checkbox"] {
// Reset spacing and right align labels, but scope to media queries so that
// labels on narrow viewports stack the same as a default form example.
@
media
(min-width: @screen-sm-min)
{
.
media
-sm(
{
.control-label {
text-align: right;
margin-bottom: 0;
padding-top: (@padding-base-vertical + 1); // Default padding plus a border
}
}
}
);
// Validation states
//
...
...
This diff is collapsed.
Click to expand it.
less/_grid.less
+
6
-
6
View file @
47bef3c6
...
...
@@ -61,24 +61,24 @@
// Columns, offsets, pushes, and pulls for the small device range, from phones
// to tablets.
@
media
(min-width: @screen-sm-min)
{
.
media
-sm(
{
.make-grid(sm);
}
}
);
// Medium grid
//
// Columns, offsets, pushes, and pulls for the desktop device range.
@
media
(min-width: @screen-md-min)
{
.
media
-md(
{
.make-grid(md);
}
}
);
// Large grid
//
// Columns, offsets, pushes, and pulls for the large desktop device range.
@
media
(min-width: @screen-lg-min)
{
.
media
-lg(
{
.make-grid(lg);
}
}
);
This diff is collapsed.
Click to expand it.
less/_jumbotron.less
+
2
-
2
View file @
47bef3c6
...
...
@@ -27,7 +27,7 @@
border-top-color: darken(@jumbotron-bg, 10%);
}
@
media
(min-width: @screen-sm-min)
{
.
media
-sm(
{
.jumbotron {
padding: (@jumbotron-padding * 1.6) 0;
...
...
@@ -41,4 +41,4 @@
.jumbotron-heading {
font-size: (@font-size-base * 4.5);
}
}
}
);
This diff is collapsed.
Click to expand it.
less/_modal.less
+
4
-
4
View file @
47bef3c6
...
...
@@ -130,7 +130,7 @@
}
// Scale up the modal
@
media
(min-width: @screen-sm-min)
{
.
media
-sm(
{
// Automatically set modal's width for larger viewports
.modal-dialog {
width: @modal-md;
...
...
@@ -142,8 +142,8 @@
// Modal sizes
.modal-sm { width: @modal-sm; }
}
}
);
@
media
(min-width: @screen-md-min)
{
.
media
-sm(
{
.modal-lg { width: @modal-lg; }
}
}
);
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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
Menu
Explore
Projects
Groups
Snippets