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
a27ecfcc
Commit
a27ecfcc
authored
Jul 01, 2013
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make more components mixin-friendly
parent
2d2828d3
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
68 additions
and
93 deletions
+68
-93
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+5
-13
less/accordion.less
less/accordion.less
+5
-8
less/alerts.less
less/alerts.less
+8
-7
less/carousel.less
less/carousel.less
+2
-12
less/close.less
less/close.less
+10
-10
less/labels.less
less/labels.less
+3
-3
less/list-group.less
less/list-group.less
+35
-40
No files found.
docs/assets/css/bootstrap.css
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
;
}
...
...
less/accordion.less
View file @
a27ecfcc
...
...
@@ -16,15 +16,12 @@
}
.accordion-heading {
border-bottom: 0;
}
.accordion-heading
.accordion-toggle {
.accordion-toggle {
display: block;
padding: 8px 15px;
}
// General toggle styles
.accordion-toggle {
cursor: pointer;
}
}
// Inner needs the styles because you can't animate properly with any styles on the element
...
...
less/alerts.less
View file @
a27ecfcc
...
...
@@ -82,11 +82,12 @@
.alert-block {
padding-top: 15px;
padding-bottom: 15px;
}
.alert-block
> p,
.alert-block
> ul {
> p,
> ul {
margin-bottom: 0;
}
.alert-block
p + p {
}
p + p {
margin-top: 5px;
}
}
less/carousel.less
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 {
...
...
less/close.less
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
{
// 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;
}
}
less/labels.less
View file @
a27ecfcc
less/list-group.less
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 {
// Round the first and last items
&
:first-child {
.border-top-radius(@border-radius-base);
}
.list-group-item
:last-child {
}
&
: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,23 +56,23 @@
// 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 {
// Hover state
&
:hover,
&
:focus {
text-decoration: none;
background-color: @list-group-hover-bg;
}
}
// Active class on item itself, not parent
a.list-group-item
.active {
// 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;
...
...
@@ -79,16 +85,5 @@ a.list-group-item.active {
.list-group-item-text {
color: lighten(@list-group-active-bg, 40%);
}
}
// Chevrons and badges within list items
// -------------------------
.list-group-item > .badge,
.list-group-item > .glyphicon-chevron-right {
float: right;
margin-right: -15px;
}
.list-group-item > .glyphicon + .badge {
margin-right: 5px;
}
}
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