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
b8ed111a
Commit
b8ed111a
authored
Aug 11, 2013
by
Jacob Thornton
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
parents
89b3cb0d
9b07b999
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
4 deletions
+24
-4
dist/css/bootstrap.css
dist/css/bootstrap.css
+8
-0
dist/css/bootstrap.min.css
dist/css/bootstrap.min.css
+1
-1
less/carousel.less
less/carousel.less
+0
-1
less/panels.less
less/panels.less
+14
-1
less/scaffolding.less
less/scaffolding.less
+1
-1
No files found.
dist/css/bootstrap.css
View file @
b8ed111a
...
...
@@ -2426,6 +2426,14 @@ a.list-group-item.active .list-group-item-text {
border-bottom
:
0
;
}
.panel-heading
+
.list-group
{
margin-top
:
-15px
;
}
.panel-heading
+
.list-group
.list-group-item
:first-child
{
border-top-width
:
0
;
}
.panel-heading
{
padding
:
10px
15px
;
margin
:
-15px
-15px
15px
;
...
...
dist/css/bootstrap.min.css
View file @
b8ed111a
This source diff could not be displayed because it is too large. You can
view the blob
instead.
less/carousel.less
View file @
b8ed111a
...
...
@@ -97,7 +97,6 @@
}
// Toggles
.glyphicon,
.icon-prev,
.icon-next {
position: absolute;
...
...
less/panels.less
View file @
b8ed111a
...
...
@@ -11,8 +11,14 @@
border: 1px solid @panel-border;
border-radius: @panel-border-radius;
.box-shadow(0 1px 1px rgba(0,0,0,.05));
}
// List groups in panels
//
// By default, space out list group content from panel headings to account for
// any kind of custom content between the two.
// List groups in panels
.panel {
.list-group {
margin: 15px -15px -15px;
...
...
@@ -30,6 +36,13 @@
}
}
}
// Collapse space between when there's no additional content.
.panel-heading + .list-group {
margin-top: -15px;
.list-group-item:first-child {
border-top-width: 0;
}
}
// Optional heading
.panel-heading {
...
...
less/scaffolding.less
View file @
b8ed111a
...
...
@@ -79,7 +79,7 @@ img {
// Perfect circle
.img-circle {
border-radius: 50
0px; // crank the border-radius so it works with most reasonably sized image
s
border-radius: 50
%; // set radius in percent
s
}
...
...
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