Skip to content

Commit

Permalink
Merge pull request #528 from twbs/and-badge
Browse files Browse the repository at this point in the history 
Fix the padding on table-views in the android theme
  • Loading branch information
@connors
connors committed Apr 1, 2014
2 parents 4a89b23 + 9d8b0d9 commit f4c5395
Show file tree
Hide file tree
Showing 7 changed files with 100 additions and 3 deletions.
27 changes: 27 additions & 0 deletions dist/css/ratchet-theme-android.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,33 @@ a:active {
border-bottom: 2px solid #a9a9a9;
}

.table-view-cell .navigate-left > .btn,
.table-view-cell .navigate-left > .badge,
.table-view-cell .navigate-left > .toggle,
.table-view-cell .navigate-right > .btn,
.table-view-cell .navigate-right > .badge,
.table-view-cell .navigate-right > .toggle,
.table-view-cell .push-left > .btn,
.table-view-cell .push-left > .badge,
.table-view-cell .push-left > .toggle,
.table-view-cell .push-right > .btn,
.table-view-cell .push-right > .badge,
.table-view-cell .push-right > .toggle,
.table-view-cell > a .navigate-left > .btn,
.table-view-cell > a .navigate-left > .badge,
.table-view-cell > a .navigate-left > .toggle,
.table-view-cell > a .navigate-right > .btn,
.table-view-cell > a .navigate-right > .badge,
.table-view-cell > a .navigate-right > .toggle,
.table-view-cell > a .push-left > .btn,
.table-view-cell > a .push-left > .badge,
.table-view-cell > a .push-left > .toggle,
.table-view-cell > a .push-right > .btn,
.table-view-cell > a .push-right > .badge,
.table-view-cell > a .push-right > .toggle {
right: 15px;
}

select,
textarea,
input[type="text"],
Expand Down
2 changes: 1 addition & 1 deletion dist/css/ratchet-theme-android.min.css
View file

Large diffs are not rendered by default.

26 changes: 26 additions & 0 deletions docs/assets/css/docs.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1696,6 +1696,32 @@ hr {
border-top: 0;
border-bottom: 2px solid #a9a9a9;
}
.platform-android .table-view-cell .navigate-left > .btn,
.platform-android .table-view-cell .navigate-left > .badge,
.platform-android .table-view-cell .navigate-left > .toggle,
.platform-android .table-view-cell .navigate-right > .btn,
.platform-android .table-view-cell .navigate-right > .badge,
.platform-android .table-view-cell .navigate-right > .toggle,
.platform-android .table-view-cell .push-left > .btn,
.platform-android .table-view-cell .push-left > .badge,
.platform-android .table-view-cell .push-left > .toggle,
.platform-android .table-view-cell .push-right > .btn,
.platform-android .table-view-cell .push-right > .badge,
.platform-android .table-view-cell .push-right > .toggle,
.platform-android .table-view-cell > a .navigate-left > .btn,
.platform-android .table-view-cell > a .navigate-left > .badge,
.platform-android .table-view-cell > a .navigate-left > .toggle,
.platform-android .table-view-cell > a .navigate-right > .btn,
.platform-android .table-view-cell > a .navigate-right > .badge,
.platform-android .table-view-cell > a .navigate-right > .toggle,
.platform-android .table-view-cell > a .push-left > .btn,
.platform-android .table-view-cell > a .push-left > .badge,
.platform-android .table-view-cell > a .push-left > .toggle,
.platform-android .table-view-cell > a .push-right > .btn,
.platform-android .table-view-cell > a .push-right > .badge,
.platform-android .table-view-cell > a .push-right > .toggle {
right: 15px;
}
.platform-android select,
.platform-android textarea,
.platform-android input[type="text"],
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/css/docs.min.css
View file

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions docs/dist/css/ratchet-theme-android.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,33 @@ a:active {
border-bottom: 2px solid #a9a9a9;
}

.table-view-cell .navigate-left > .btn,
.table-view-cell .navigate-left > .badge,
.table-view-cell .navigate-left > .toggle,
.table-view-cell .navigate-right > .btn,
.table-view-cell .navigate-right > .badge,
.table-view-cell .navigate-right > .toggle,
.table-view-cell .push-left > .btn,
.table-view-cell .push-left > .badge,
.table-view-cell .push-left > .toggle,
.table-view-cell .push-right > .btn,
.table-view-cell .push-right > .badge,
.table-view-cell .push-right > .toggle,
.table-view-cell > a .navigate-left > .btn,
.table-view-cell > a .navigate-left > .badge,
.table-view-cell > a .navigate-left > .toggle,
.table-view-cell > a .navigate-right > .btn,
.table-view-cell > a .navigate-right > .badge,
.table-view-cell > a .navigate-right > .toggle,
.table-view-cell > a .push-left > .btn,
.table-view-cell > a .push-left > .badge,
.table-view-cell > a .push-left > .toggle,
.table-view-cell > a .push-right > .btn,
.table-view-cell > a .push-right > .badge,
.table-view-cell > a .push-right > .toggle {
right: 15px;
}

select,
textarea,
input[type="text"],
Expand Down
2 changes: 1 addition & 1 deletion docs/dist/css/ratchet-theme-android.min.css
View file

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions sass/theme-android.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,23 @@ a {
}
}

// Table-views with buttons, badges and toggles
// --------------------------------------------------
.table-view-cell,
.table-view-cell > a {
// Android has no cheverons so don't bump the buttons, badges, or toggles over.
.navigate-left,
.navigate-right,
.push-left,
.push-right {
> .btn,
> .badge,
> .toggle {
right: 15px;
}
}
}

// Forms
// --------------------------------------------------

Expand Down

0 comments on commit f4c5395

Please sign in to comment.