diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-01-13 14:41:06 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-13 14:41:06 +0100 |
| commit | eff1c94744609b432c8dba8a35cd97e9a20ce652 (patch) | |
| tree | e173621ead4c940b201d419971c291530d575103 /app/javascript/styles/mastodon/admin.scss | |
| parent | 2cfa55185a5fc7d93a160a4e9a4730aae6725b0f (diff) | |
| parent | 4fb94c758e3bf2e1c0525e9075c2d5dedc14c666 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/styles/mastodon/admin.scss')
| -rw-r--r-- | app/javascript/styles/mastodon/admin.scss | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index e7124a2c0..4e969601b 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -1,4 +1,6 @@ $no-columns-breakpoint: 600px; +$sidebar-width: 240px; +$content-width: 840px; .admin-wrapper { display: flex; @@ -6,7 +8,7 @@ $no-columns-breakpoint: 600px; height: 100%; .sidebar-wrapper { - flex: 1; + flex: 1 1 $sidebar-width; height: 100%; background: $ui-base-color; display: flex; @@ -14,7 +16,7 @@ $no-columns-breakpoint: 600px; } .sidebar { - width: 240px; + width: $sidebar-width; height: 100%; padding: 0; overflow-y: auto; @@ -95,12 +97,12 @@ $no-columns-breakpoint: 600px; } .content-wrapper { - flex: 2; + flex: 2 1 $content-width; overflow: auto; } .content { - max-width: 700px; + max-width: $content-width; padding: 20px 15px; padding-top: 60px; padding-left: 25px; |