Skip to content

Commit 0822ceb

Browse files
authored
Merge pull request #374 from acelaya-forks/feature/responsive-table
Feature/responsive table
2 parents c0098ac + 01a18f2 commit 0822ceb

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2121
* [#364](https://github.com/shlinkio/shlink-web-client/issues/364) Fixed all dropdowns so that they are consistently styled.
2222
* [#366](https://github.com/shlinkio/shlink-web-client/issues/366) Fixed text in visits menu jumping to next line in some tablet resolutions.
2323
* [#367](https://github.com/shlinkio/shlink-web-client/issues/367) Removed conflicting overflow in visits table for mobile devices.
24+
* [#365](https://github.com/shlinkio/shlink-web-client/issues/365) Fixed weird rendering of short URLs list in tablets.
2425

2526

2627
## [3.0.0] - 2020-12-22

src/short-urls/ShortUrlsList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const ShortUrlsList = (ShortUrlsTable: FC<ShortUrlsTableProps>) => boundToMercur
7878

7979
return (
8080
<>
81-
<div className="d-block d-md-none mb-3">
81+
<div className="d-block d-lg-none mb-3">
8282
<SortingDropdown
8383
items={SORTABLE_FIELDS}
8484
orderField={order.orderField}

src/short-urls/ShortUrlsTable.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import '../utils/base';
22

33
.short-urls-table__header {
4-
@media (max-width: $smMax) {
4+
@media (max-width: $responsiveTableBreakpoint) {
55
display: none;
66
}
77
}

src/short-urls/helpers/ShortUrlsRow.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@import '../../utils/mixins/vertical-align';
33

44
.short-urls-row {
5-
@media (max-width: $smMax) {
5+
@media (max-width: $responsiveTableBreakpoint) {
66
display: block;
77
margin-bottom: 10px;
88
border-bottom: 1px solid $lightGrey;
@@ -13,7 +13,7 @@
1313
.short-urls-row__cell.short-urls-row__cell {
1414
vertical-align: middle !important;
1515

16-
@media (max-width: $smMax) {
16+
@media (max-width: $responsiveTableBreakpoint) {
1717
display: block;
1818
width: 100%;
1919
position: relative;
@@ -22,7 +22,7 @@
2222

2323
&:before {
2424
content: attr(data-th);
25-
font-weight: bold;
25+
font-weight: 700;
2626
}
2727

2828
&:last-child {
@@ -55,9 +55,10 @@
5555

5656
.short-urls-row__copy-hint {
5757
@include vertical-align(translateX(10px));
58+
5859
box-shadow: 0 3px 15px rgba(0, 0, 0, .25);
5960

60-
@media (max-width: $smMax) {
61+
@media (max-width: $responsiveTableBreakpoint) {
6162
@include vertical-align(translateX(calc(-100% - 20px)));
6263
}
6364
}

src/utils/base.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $mdMax: 991px;
77
$lgMin: 992px;
88
$lgMax: 1199px;
99
$xlgMin: 1200px;
10+
$responsiveTableBreakpoint: $mdMax;
1011

1112
// Colors
1213
$mainColor: #4696e5;

0 commit comments

Comments
 (0)