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
9ed9fba4
Commit
9ed9fba4
authored
11 years ago
by
Mark Otto
Browse files
Options
Download
Plain Diff
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
parents
5b2d9335
526d1399
3 merge requests
!8635
ignore Gruntfile.js in jekyll
,
!8656
Added rel="stylesheet" to CDN-Examples
,
!8527
Inner properties move 1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
less/mixins.less
+1
-1
less/mixins.less
less/tables.less
+35
-39
less/tables.less
with
36 additions
and
40 deletions
+36
-40
less/mixins.less
+
1
-
1
View file @
9ed9fba4
...
...
@@ -71,7 +71,7 @@
// CSS image replacement
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
.hide-text() {
font: 0/0 a;
font:
~"
0/0
"
a;
color: transparent;
text-shadow: none;
background-color: transparent;
...
...
This diff is collapsed.
Click to expand it.
less/tables.less
+
35
-
39
View file @
9ed9fba4
...
...
@@ -95,33 +95,31 @@ th {
> tbody:first-child > tr:first-child td {
border-top: 0;
}
// For first th/td in the first row in the first thead or tbody
> thead:first-child > tr:first-child > th:first-child,
> tbody:first-child > tr:first-child > td:first-child,
> tbody:first-child > tr:first-child > th:first-child {
border-top-left-radius: @border-radius-base;
}
// For last th/td in the first row in the first thead or tbody
> thead:first-child > tr:first-child > th:last-child,
> tbody:first-child > tr:first-child > td:last-child,
> tbody:first-child > tr:first-child > th:last-child {
border-top-right-radius: @border-radius-base;
}
// For first th/td (can be either) in the last row in the last thead, tbody, and tfoot
> thead:last-child > tr:last-child > th:first-child,
> tbody:last-child > tr:last-child > td:first-child,
> tbody:last-child > tr:last-child > th:first-child,
> tfoot:last-child > tr:last-child > td:first-child,
> tfoot:last-child > tr:last-child > th:first-child {
border-bottom-left-radius: @border-radius-base;
}
// For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
> thead:last-child > tr:last-child > th:last-child,
> tbody:last-child > tr:last-child > td:last-child,
> tbody:last-child > tr:last-child > th:last-child,
> tfoot:last-child > tr:last-child > td:last-child,
> tfoot:last-child > tr:last-child > th:last-child {
border-bottom-right-radius: @border-radius-base;
> thead:first-child > tr:first-child > th,
> tbody:first-child > tr:first-child > td,
> tbody:first-child > tr:first-child > th {
// For first th/td in the first row in the first thead or tbody
&:first-child{
border-top-left-radius: @border-radius-base;
}
// For last th/td in the first row in the first thead or tbody
&:last-child{
border-top-right-radius: @border-radius-base;
}
}
> thead:last-child > tr:last-child > th,
> tbody:last-child > tr:last-child > td,
> tbody:last-child > tr:last-child > th,
> tfoot:last-child > tr:last-child > td,
> tfoot:last-child > tr:last-child > th {
// For first th/td (can be either) in the last row in the last thead, tbody, and tfoot
&:first-child{
border-bottom-left-radius: @border-radius-base;
}
// For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
&:last-child{
border-bottom-right-radius: @border-radius-base;
}
}
// Clear border-radius for first and last td in the last row in the last tbody for table with tfoot
...
...
@@ -133,19 +131,17 @@ th {
}
// Special fixes to round the left border on the first td/th
> caption + thead > tr:first-child > th:first-child,
> caption + tbody > tr:first-child > td:first-child,
> colgroup + thead > tr:first-child > th:first-child,
> colgroup + tbody > tr:first-child > td:first-child {
border-top-left-radius: @border-radius-base;
}
> caption + thead > tr:first-child > th:last-child,
> caption + tbody > tr:first-child > td:last-child,
> colgroup + thead > tr:first-child > th:last-child,
> colgroup + tbody > tr:first-child > td:last-child {
border-top-right-radius: @border-radius-base;
> caption + thead > tr:first-child > th,
> caption + tbody > tr:first-child > td,
> colgroup + thead > tr:first-child > th,
> colgroup + tbody > tr:first-child > td {
&:first-child{
border-top-left-radius: @border-radius-base;
}
&:last-child{
border-top-right-radius: @border-radius-base;
}
}
}
...
...
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