Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Firefox miss bottom line when use sorter #16174

Merged
merged 3 commits into from Apr 22, 2019
Merged

fix: Firefox miss bottom line when use sorter #16174

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a137749
move background color into tr
zombieJ Apr 18, 2019
09ed59d
rm useless code
zombieJ Apr 18, 2019
7e3c338
remove background lock
zombieJ Apr 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
245 changes: 123 additions & 122 deletions components/table/style/index.less
View file
Open in desktop
Expand Up @@ -32,169 +32,174 @@
border-collapse: collapse;
}

&-thead > tr > th {
color: @table-header-color;
font-weight: 500;
text-align: left;
&-thead > tr {
// For Chrome extra space:
// - https://github.com/ant-design/ant-design/issues/14926
// - https://github.com/ant-design/ant-design/issues/16131
background: @table-header-bg;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cause #16933

border-bottom: @border-width-base @border-style-base @border-color-split;
transition: background 0.3s ease;

&[colspan] {
text-align: center;
}

.@{iconfont-css-prefix}-filter,
.@{table-prefix-cls}-filter-icon {
position: absolute;
top: 0;
right: 0;
width: 28px;
height: 100%;
color: @table-header-icon-color;
font-size: @font-size-sm;
text-align: center;
cursor: pointer;
transition: all 0.3s;
> th {
color: @table-header-color;
font-weight: 500;
text-align: left;
background: transparent;
border-bottom: @border-width-base @border-style-base @border-color-split;
transition: background 0.3s ease;

> svg {
position: absolute;
top: 50%;
left: 50%;
margin-top: -@font-size-sm / 2 + 1px;
margin-left: -@font-size-sm / 2;
&[colspan] {
text-align: center;
}
}

.@{table-prefix-cls}-filter-selected.@{iconfont-css-prefix}-filter {
color: @primary-color;
}

.@{table-prefix-cls}-column-sorter {
display: table-cell;
vertical-align: middle;

.@{table-prefix-cls}-column-sorter-inner {
height: 1em;
margin-top: 0.35em;
margin-left: 0.57142857em;
.@{iconfont-css-prefix}-filter,
.@{table-prefix-cls}-filter-icon {
position: absolute;
top: 0;
right: 0;
width: 28px;
height: 100%;
color: @table-header-icon-color;
line-height: 1em;
font-size: @font-size-sm;
text-align: center;
cursor: pointer;
transition: all 0.3s;

.@{table-prefix-cls}-column-sorter-up,
.@{table-prefix-cls}-column-sorter-down {
.iconfont-size-under-12px(11px);
> svg {
position: absolute;
top: 50%;
left: 50%;
margin-top: -@font-size-sm / 2 + 1px;
margin-left: -@font-size-sm / 2;
}
}

.@{table-prefix-cls}-filter-selected.@{iconfont-css-prefix}-filter {
color: @primary-color;
}

.@{table-prefix-cls}-column-sorter {
display: table-cell;
vertical-align: middle;

display: block;
.@{table-prefix-cls}-column-sorter-inner {
height: 1em;
margin-top: 0.35em;
margin-left: 0.57142857em;
color: @table-header-icon-color;
line-height: 1em;
text-align: center;
transition: all 0.3s;
&.on {
color: @primary-color;
}
}

&-full {
margin-top: -0.15em;

.@{table-prefix-cls}-column-sorter-up,
.@{table-prefix-cls}-column-sorter-down {
height: 0.5em;
line-height: 0.5em;
.iconfont-size-under-12px(11px);

display: block;
height: 1em;
line-height: 1em;
transition: all 0.3s;
&.on {
color: @primary-color;
}
}

.@{table-prefix-cls}-column-sorter-down {
margin-top: 0.125em;
&-full {
margin-top: -0.15em;

.@{table-prefix-cls}-column-sorter-up,
.@{table-prefix-cls}-column-sorter-down {
height: 0.5em;
line-height: 0.5em;
}

.@{table-prefix-cls}-column-sorter-down {
margin-top: 0.125em;
}
}
}
}
}

&.@{table-prefix-cls}-column-has-actions {
position: relative;
background-clip: padding-box; // For Firefox background bug, https://github.com/ant-design/ant-design/issues/12628
/* stylelint-disable-next-line */
-webkit-background-clip: border-box; // For Chrome extra space: https://github.com/ant-design/ant-design/issues/14926
&.@{table-prefix-cls}-column-has-actions {
position: relative;
background-clip: padding-box; // For Firefox background bug, https://github.com/ant-design/ant-design/issues/12628

&.@{table-prefix-cls}-column-has-filters {
// https://github.com/ant-design/ant-design/issues/12650
padding-right: 30px !important;
&.@{table-prefix-cls}-column-has-filters {
// https://github.com/ant-design/ant-design/issues/12650
padding-right: 30px !important;

.@{iconfont-css-prefix}-filter,
.@{table-prefix-cls}-filter-icon {
&.@{table-prefix-cls}-filter-open {
color: @text-color-secondary;
background: @table-header-filter-active-bg;
}
}
// Very complicated styles logic but necessary
&:hover {
.@{iconfont-css-prefix}-filter,
.@{table-prefix-cls}-filter-icon {
&:hover {
&.@{table-prefix-cls}-filter-open {
color: @text-color-secondary;
background: @table-header-filter-active-bg;
}
&:active {
color: @text-color;
}
// Very complicated styles logic but necessary
&:hover {
.@{iconfont-css-prefix}-filter,
.@{table-prefix-cls}-filter-icon {
&:hover {
color: @text-color-secondary;
background: @table-header-filter-active-bg;
}
&:active {
color: @text-color;
}
}
}
}
}

&.@{table-prefix-cls}-column-has-sorters {
cursor: pointer;
&:hover {
background: @table-header-sort-active-bg;
.@{iconfont-css-prefix}-filter,
.@{table-prefix-cls}-filter-icon {
&.@{table-prefix-cls}-column-has-sorters {
cursor: pointer;
&:hover {
background: @table-header-sort-active-bg;
.@{iconfont-css-prefix}-filter,
.@{table-prefix-cls}-filter-icon {
background: @table-header-sort-active-bg;
}
}
}
&:active {
.@{table-prefix-cls}-column-sorter-up:not(.on),
.@{table-prefix-cls}-column-sorter-down:not(.on) {
color: @text-color-secondary;
&:active {
.@{table-prefix-cls}-column-sorter-up:not(.on),
.@{table-prefix-cls}-column-sorter-down:not(.on) {
color: @text-color-secondary;
}
}
}
}
}

.@{table-prefix-cls}-header-column {
display: inline-block;
vertical-align: top;
.@{table-prefix-cls}-header-column {
display: inline-block;
vertical-align: top;

.@{table-prefix-cls}-column-sorters {
display: table;
.@{table-prefix-cls}-column-sorters {
display: table;

> .@{table-prefix-cls}-column-title {
display: table-cell;
vertical-align: middle;
}
> .@{table-prefix-cls}-column-title {
display: table-cell;
vertical-align: middle;
}

> *:not(.@{table-prefix-cls}-column-sorter) {
position: relative;
}
&::before {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
background: transparent;
transition: all 0.3s;
content: '';
}
&:hover::before {
background: rgba(0, 0, 0, 0.04);
> *:not(.@{table-prefix-cls}-column-sorter) {
position: relative;
}
&::before {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
background: transparent;
transition: all 0.3s;
content: '';
}
&:hover::before {
background: rgba(0, 0, 0, 0.04);
}
}
}
}

&.@{table-prefix-cls}-column-has-sorters {
user-select: none;
&.@{table-prefix-cls}-column-has-sorters {
user-select: none;
}
}
}

Expand Down Expand Up @@ -230,10 +235,6 @@
}
}

&-thead > tr:hover {
background: none;
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这边移除了 标题 hover 的样式，看起来没什么影响。帮忙 double confirm 一下：
@afc163 27a7730

&-footer {
position: relative;
padding: @table-padding-vertical @table-padding-horizontal;
Expand Down