diff options
| author | Lynx Kotoura <lynx@lv9.org> | 2017-09-09 09:26:58 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-09 02:26:58 +0200 |
| commit | 3c45d3963a21812f00318353be90010df636bd0d (patch) | |
| tree | 6515296d8f4c9713d0b57d6aefa5127cc10d510c /app/javascript | |
| parent | baa8b82179203a8c035dab23fbea48a0e6cfc886 (diff) | |
Scrollable tables in settings pages (#4857)
* Scrollable tables in settings pages * Add space before curly brace
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/styles/admin.scss | 8 | ||||
| -rw-r--r-- | app/javascript/styles/tables.scss | 19 |
2 files changed, 14 insertions, 13 deletions
diff --git a/app/javascript/styles/admin.scss b/app/javascript/styles/admin.scss index b86de75b6..fa7859e38 100644 --- a/app/javascript/styles/admin.scss +++ b/app/javascript/styles/admin.scss @@ -190,11 +190,15 @@ .filters { display: flex; - margin-bottom: 20px; + flex-wrap: wrap; .filter-subset { flex: 0 0 auto; - margin-right: 40px; + margin: 0 40px 10px 0; + + &:last-child { + margin-bottom: 20px; + } ul { margin-top: 5px; diff --git a/app/javascript/styles/tables.scss b/app/javascript/styles/tables.scss index f6e57e196..ad46f5f9f 100644 --- a/app/javascript/styles/tables.scss +++ b/app/javascript/styles/tables.scss @@ -3,7 +3,6 @@ max-width: 100%; border-spacing: 0; border-collapse: collapse; - margin-bottom: 20px; th, td { @@ -43,19 +42,17 @@ font-weight: 500; } - &.inline-table { - td, - th { - padding: 8px 2px; - } - - & > tbody > tr:nth-child(odd) > td, - & > tbody > tr:nth-child(odd) > th { - background: transparent; - } + &.inline-table > tbody > tr:nth-child(odd) > td, + &.inline-table > tbody > tr:nth-child(odd) > th { + background: transparent; } } +.table-wrapper { + overflow: auto; + margin-bottom: 20px; +} + samp { font-family: 'mastodon-font-monospace', monospace; } |