From 00b788f90bd01210ed35498b2defaa0440dce86f Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Sun, 24 Nov 2019 14:58:16 -0500 Subject: [PATCH] update collection view, update nav list so that 'my collections' doesn't overflow --- client/styles/components/_collection.scss | 24 +++++++++++------------ client/styles/components/_nav.scss | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/styles/components/_collection.scss b/client/styles/components/_collection.scss index b280109a..d3f0210c 100644 --- a/client/styles/components/_collection.scss +++ b/client/styles/components/_collection.scss @@ -1,11 +1,14 @@ .collection-container { - width: 1012px; - margin: 0 auto; + padding: #{24 / $base-font-size}rem #{66 / $base-font-size}rem; + flex: 1; + display: flex; + flex-direction: column; } .collection-metadata { - margin: 0px #{56 / $base-font-size}rem; - padding: #{24 / $base-font-size}rem 0; + width: #{1012 / $base-font-size}rem; + margin: 0 auto; + margin-bottom: #{24 / $base-font-size}rem; } .collection-metadata__columns { @@ -30,7 +33,7 @@ } .collection-metadata__name { - padding: #{8 / $base-font-size}rem 0; + // padding: #{8 / $base-font-size}rem 0; } .collection-metadata__name .editable-input__label span { @@ -57,7 +60,7 @@ } .collection-metadata__description { - padding-top: #{8 / $base-font-size}rem; + margin-top: #{8 / $base-font-size}rem; text-align: left; font-size: 14px; } @@ -74,10 +77,6 @@ width: 100%; } -.collection-table-wrapper { - margin: #{28 / $base-font-size}rem #{56 / $base-font-size}rem; -} - .collection-add-sketch { min-width: #{600 / $base-font-size}rem; overflow: scroll; @@ -106,8 +105,9 @@ } .collection-table-wrapper { - min-height: 100%; - + width: #{1012 / $base-font-size}rem; + margin: 0 auto; + flex: 1; @include themify() { border: 1px solid getThemifyVariable('modal-border-color'); } diff --git a/client/styles/components/_nav.scss b/client/styles/components/_nav.scss index 65c243a5..7f5a45ac 100644 --- a/client/styles/components/_nav.scss +++ b/client/styles/components/_nav.scss @@ -109,7 +109,7 @@ padding-right: #{20 / $base-font-size}rem; & .nav__dropdown { - width: #{121 / $base-font-size}rem; + width: #{122 / $base-font-size}rem; } }