Skip to content

Commit f4c5395

Browse files
committed
Merge pull request #528 from twbs/and-badge
Fix the padding on table-views in the android theme
2 parents 4a89b23 + 9d8b0d9 commit f4c5395

File tree

7 files changed

+100
-3
lines changed

7 files changed

+100
-3
lines changed

dist/css/ratchet-theme-android.css

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,33 @@ a:active {
332332
border-bottom: 2px solid #a9a9a9;
333333
}
334334

335+
.table-view-cell .navigate-left > .btn,
336+
.table-view-cell .navigate-left > .badge,
337+
.table-view-cell .navigate-left > .toggle,
338+
.table-view-cell .navigate-right > .btn,
339+
.table-view-cell .navigate-right > .badge,
340+
.table-view-cell .navigate-right > .toggle,
341+
.table-view-cell .push-left > .btn,
342+
.table-view-cell .push-left > .badge,
343+
.table-view-cell .push-left > .toggle,
344+
.table-view-cell .push-right > .btn,
345+
.table-view-cell .push-right > .badge,
346+
.table-view-cell .push-right > .toggle,
347+
.table-view-cell > a .navigate-left > .btn,
348+
.table-view-cell > a .navigate-left > .badge,
349+
.table-view-cell > a .navigate-left > .toggle,
350+
.table-view-cell > a .navigate-right > .btn,
351+
.table-view-cell > a .navigate-right > .badge,
352+
.table-view-cell > a .navigate-right > .toggle,
353+
.table-view-cell > a .push-left > .btn,
354+
.table-view-cell > a .push-left > .badge,
355+
.table-view-cell > a .push-left > .toggle,
356+
.table-view-cell > a .push-right > .btn,
357+
.table-view-cell > a .push-right > .badge,
358+
.table-view-cell > a .push-right > .toggle {
359+
right: 15px;
360+
}
361+
335362
select,
336363
textarea,
337364
input[type="text"],

dist/css/ratchet-theme-android.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/assets/css/docs.css

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1696,6 +1696,32 @@ hr {
16961696
border-top: 0;
16971697
border-bottom: 2px solid #a9a9a9;
16981698
}
1699+
.platform-android .table-view-cell .navigate-left > .btn,
1700+
.platform-android .table-view-cell .navigate-left > .badge,
1701+
.platform-android .table-view-cell .navigate-left > .toggle,
1702+
.platform-android .table-view-cell .navigate-right > .btn,
1703+
.platform-android .table-view-cell .navigate-right > .badge,
1704+
.platform-android .table-view-cell .navigate-right > .toggle,
1705+
.platform-android .table-view-cell .push-left > .btn,
1706+
.platform-android .table-view-cell .push-left > .badge,
1707+
.platform-android .table-view-cell .push-left > .toggle,
1708+
.platform-android .table-view-cell .push-right > .btn,
1709+
.platform-android .table-view-cell .push-right > .badge,
1710+
.platform-android .table-view-cell .push-right > .toggle,
1711+
.platform-android .table-view-cell > a .navigate-left > .btn,
1712+
.platform-android .table-view-cell > a .navigate-left > .badge,
1713+
.platform-android .table-view-cell > a .navigate-left > .toggle,
1714+
.platform-android .table-view-cell > a .navigate-right > .btn,
1715+
.platform-android .table-view-cell > a .navigate-right > .badge,
1716+
.platform-android .table-view-cell > a .navigate-right > .toggle,
1717+
.platform-android .table-view-cell > a .push-left > .btn,
1718+
.platform-android .table-view-cell > a .push-left > .badge,
1719+
.platform-android .table-view-cell > a .push-left > .toggle,
1720+
.platform-android .table-view-cell > a .push-right > .btn,
1721+
.platform-android .table-view-cell > a .push-right > .badge,
1722+
.platform-android .table-view-cell > a .push-right > .toggle {
1723+
right: 15px;
1724+
}
16991725
.platform-android select,
17001726
.platform-android textarea,
17011727
.platform-android input[type="text"],

docs/assets/css/docs.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/dist/css/ratchet-theme-android.css

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,33 @@ a:active {
332332
border-bottom: 2px solid #a9a9a9;
333333
}
334334

335+
.table-view-cell .navigate-left > .btn,
336+
.table-view-cell .navigate-left > .badge,
337+
.table-view-cell .navigate-left > .toggle,
338+
.table-view-cell .navigate-right > .btn,
339+
.table-view-cell .navigate-right > .badge,
340+
.table-view-cell .navigate-right > .toggle,
341+
.table-view-cell .push-left > .btn,
342+
.table-view-cell .push-left > .badge,
343+
.table-view-cell .push-left > .toggle,
344+
.table-view-cell .push-right > .btn,
345+
.table-view-cell .push-right > .badge,
346+
.table-view-cell .push-right > .toggle,
347+
.table-view-cell > a .navigate-left > .btn,
348+
.table-view-cell > a .navigate-left > .badge,
349+
.table-view-cell > a .navigate-left > .toggle,
350+
.table-view-cell > a .navigate-right > .btn,
351+
.table-view-cell > a .navigate-right > .badge,
352+
.table-view-cell > a .navigate-right > .toggle,
353+
.table-view-cell > a .push-left > .btn,
354+
.table-view-cell > a .push-left > .badge,
355+
.table-view-cell > a .push-left > .toggle,
356+
.table-view-cell > a .push-right > .btn,
357+
.table-view-cell > a .push-right > .badge,
358+
.table-view-cell > a .push-right > .toggle {
359+
right: 15px;
360+
}
361+
335362
select,
336363
textarea,
337364
input[type="text"],

docs/dist/css/ratchet-theme-android.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sass/theme-android.scss

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,23 @@ a {
455455
}
456456
}
457457

458+
// Table-views with buttons, badges and toggles
459+
// --------------------------------------------------
460+
.table-view-cell,
461+
.table-view-cell > a {
462+
// Android has no cheverons so don't bump the buttons, badges, or toggles over.
463+
.navigate-left,
464+
.navigate-right,
465+
.push-left,
466+
.push-right {
467+
> .btn,
468+
> .badge,
469+
> .toggle {
470+
right: 15px;
471+
}
472+
}
473+
}
474+
458475
// Forms
459476
// --------------------------------------------------
460477

0 commit comments

Comments
 (0)