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
a27ecfcc
Commit
a27ecfcc
authored
11 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Make more components mixin-friendly
parent
2d2828d3
3 merge requests
!8635
ignore Gruntfile.js in jekyll
,
!8656
Added rel="stylesheet" to CDN-Examples
,
!8527
Inner properties move 1
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
docs/assets/css/bootstrap.css
+5
-13
docs/assets/css/bootstrap.css
less/accordion.less
+5
-8
less/accordion.less
less/alerts.less
+8
-7
less/alerts.less
less/carousel.less
+2
-12
less/carousel.less
less/close.less
+10
-10
less/close.less
less/labels.less
+3
-3
less/labels.less
less/list-group.less
+35
-40
less/list-group.less
with
68 additions
and
93 deletions
+68
-93
docs/assets/css/bootstrap.css
+
5
-
13
View file @
a27ecfcc
...
...
@@ -2326,6 +2326,11 @@ input[type="button"].btn-block {
border-bottom-left-radius
:
4px
;
}
.list-group-item
>
.badge
{
float
:
right
;
margin-right
:
-15px
;
}
.list-group-item-heading
{
margin-top
:
0
;
margin-bottom
:
5px
;
...
...
@@ -2365,16 +2370,6 @@ a.list-group-item.active .list-group-item-text {
color
:
#e1edf7
;
}
.list-group-item
>
.badge
,
.list-group-item
>
.glyphicon-chevron-right
{
float
:
right
;
margin-right
:
-15px
;
}
.list-group-item
>
.glyphicon
+
.badge
{
margin-right
:
5px
;
}
.panel
{
padding
:
15px
;
margin-bottom
:
20px
;
...
...
@@ -4279,9 +4274,6 @@ a.list-group-item.active > .badge,
.accordion-heading
.accordion-toggle
{
display
:
block
;
padding
:
8px
15px
;
}
.accordion-toggle
{
cursor
:
pointer
;
}
...
...
This diff is collapsed.
Click to expand it.
less/accordion.less
+
5
-
8
View file @
a27ecfcc
...
...
@@ -16,15 +16,12 @@
}
.accordion-heading {
border-bottom: 0;
}
.accordion-heading .accordion-toggle {
display: block;
padding: 8px 15px;
}
// General toggle styles
.accordion-toggle {
cursor: pointer;
.accordion-toggle {
display: block;
padding: 8px 15px;
cursor: pointer;
}
}
// Inner needs the styles because you can't animate properly with any styles on the element
...
...
This diff is collapsed.
Click to expand it.
less/alerts.less
+
8
-
7
View file @
a27ecfcc
...
...
@@ -82,11 +82,12 @@
.alert-block {
padding-top: 15px;
padding-bottom: 15px;
}
.alert-block > p,
.alert-block > ul {
margin-bottom: 0;
}
.alert-block p + p {
margin-top: 5px;
> p,
> ul {
margin-bottom: 0;
}
p + p {
margin-top: 5px;
}
}
This diff is collapsed.
Click to expand it.
less/carousel.less
+
2
-
12
View file @
a27ecfcc
...
...
@@ -8,15 +8,10 @@
position: relative;
}
// Wrap all slides, but only show the active one
.carousel-inner {
position: relative;
overflow: hidden;
width: 100%;
}
// Immediate parent of all slides
.carousel-inner {
> .item {
display: none;
...
...
@@ -80,13 +75,8 @@
color: #fff;
text-align: center;
text-shadow: 0 1px 2px rgba(0,0,0,.6);
// we can't have this transition here
// because webkit cancels the carousel
// animation if you trip this while
// in the middle of another animation
// ;_;
// .transition(opacity .2s linear);
// We can't have this transition here because webkit cancels the carousel
// animation if you trip this while in the middle of another animation.
// Set gradients for backgrounds
&.left {
...
...
This diff is collapsed.
Click to expand it.
less/close.less
+
10
-
10
View file @
a27ecfcc
...
...
@@ -19,15 +19,15 @@
cursor: pointer;
.opacity(.5);
}
}
// Additional properties for button version
// iOS requires the button element instead of an anchor tag.
// If you want the anchor version, it requires `href="#"`.
button.close {
padding: 0;
cursor: pointer;
background: transparent;
border: 0;
-webkit-appearance: none;
// Additional properties for button version
// iOS requires the button element instead of an anchor tag.
// If you want the anchor version, it requires `href="#"`.
button& {
padding: 0;
cursor: pointer;
background: transparent;
border: 0;
-webkit-appearance: none;
}
}
This diff is collapsed.
Click to expand it.
less/labels.less
+
3
-
3
View file @
a27ecfcc
...
...
@@ -15,7 +15,7 @@
background-color: @gray-light;
border-radius: .25em;
// Add hover effects, but only for links
// Add hover effects, but only for links
&[href] {
&:hover,
&:focus {
...
...
@@ -32,7 +32,7 @@
.label-danger {
background-color: @label-danger-bg;
&[href] {
&:hover,
&:hover,
&:focus {
background-color: darken(@label-danger-bg, 10%);
}
...
...
@@ -67,4 +67,4 @@
background-color: darken(@label-info-bg, 10%);
}
}
}
\ No newline at end of file
}
This diff is collapsed.
Click to expand it.
less/list-group.less
+
35
-
40
View file @
a27ecfcc
...
...
@@ -22,16 +22,22 @@
// Place the border on the list items and negative margin up for better styling
margin-bottom: -1px;
border: 1px solid @list-group-border;
}
// Round the first and last items
.list-group-item:first-child {
.border-top-radius(@border-radius-base);
}
.list-group-item:last-child {
margin-bottom: 0;
.border-bottom-radius(@border-radius-base);
}
// Round the first and last items
&:first-child {
.border-top-radius(@border-radius-base);
}
&:last-child {
margin-bottom: 0;
.border-bottom-radius(@border-radius-base);
}
// Align badges within list items
> .badge {
float: right;
margin-right: -15px;
}
}
// Custom content options
// -------------------------
...
...
@@ -50,45 +56,34 @@
// Custom content within linked items
a.list-group-item {
// Colorize content accordingly
.list-group-item-heading {
color: #333;
}
.list-group-item-text {
color: #555;
}
}
// Hover state
a.list-group-item:hover,
a.list-group-item:focus {
text-decoration: none;
background-color: @list-group-hover-bg;
}
// Active class on item itself, not parent
a.list-group-item.active {
z-index: 2; // Place active items above their siblings for proper border styling
color: @list-group-active-color;
background-color: @list-group-active-bg;
border-color: @list-group-active-border;
// Force color to inherit for custom content
.list-group-item-heading {
color: inherit;
}
.list-group-item-text {
color: lighten(@list-group-active-bg, 40%);
// Hover state
&:hover,
&:focus {
text-decoration: none;
background-color: @list-group-hover-bg;
}
}
// Chevrons and badges within list items
// -------------------------
// Active class on item itself, not parent
&.active {
z-index: 2; // Place active items above their siblings for proper border styling
color: @list-group-active-color;
background-color: @list-group-active-bg;
border-color: @list-group-active-border;
.list-group-item > .badge,
.list-group-item > .glyphicon-chevron-right {
float: right;
margin-right: -15px;
}
.list-group-item > .glyphicon + .badge {
margin-right: 5px;
// Force color to inherit for custom content
.list-group-item-heading {
color: inherit;
}
.list-group-item-text {
color: lighten(@list-group-active-bg, 40%);
}
}
}
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