From 97245781e5393d8233e6dcc3f720842dec814675 Mon Sep 17 00:00:00 2001 From: Rukmini Bose Date: Mon, 3 Oct 2022 15:50:37 -0700 Subject: [PATCH] Fix inner shadows. Revert tag code change. Create new theme constants. Make embed container constant --- src/styles/_constants-espresso.scss | 2 ++ src/styles/_constants-maelstrom.scss | 1 + src/styles/_constants-snow.scss | 1 + src/styles/notebook.scss | 12 +++++++----- src/ui/components/tags/tags.scss | 1 - 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/styles/_constants-espresso.scss b/src/styles/_constants-espresso.scss index 684a3a7fec..3ac9188aff 100644 --- a/src/styles/_constants-espresso.scss +++ b/src/styles/_constants-espresso.scss @@ -463,6 +463,8 @@ $transInBounceBig: all 300ms cubic-bezier(.2,1.6,.6,3); $createBtnTextTransform: uppercase; $colorDiscreteItemBg: rgba($colorBodyFg,0.1); $colorDiscreteItemCurrentBg: rgba($colorOk,0.3); +$scrollContainer: $colorBodyBg; +; @mixin discreteItem() { background: $colorDiscreteItemBg; diff --git a/src/styles/_constants-maelstrom.scss b/src/styles/_constants-maelstrom.scss index 9077592ea2..555e5f5e66 100644 --- a/src/styles/_constants-maelstrom.scss +++ b/src/styles/_constants-maelstrom.scss @@ -467,6 +467,7 @@ $transInBounceBig: all 300ms cubic-bezier(.2,1.6,.6,3); $createBtnTextTransform: uppercase; $colorDiscreteItemBg: rgba($colorBodyFg,0.1); $colorDiscreteItemCurrentBg: rgba($colorOk,0.3); +$scrollContainer: $colorBodyBg; @mixin discreteItem() { background: rgba($colorBodyFg,0.1); diff --git a/src/styles/_constants-snow.scss b/src/styles/_constants-snow.scss index 1e88d4928a..7198f199fe 100644 --- a/src/styles/_constants-snow.scss +++ b/src/styles/_constants-snow.scss @@ -463,6 +463,7 @@ $transInBounceBig: all 300ms cubic-bezier(.2,1.6,.6,3); $createBtnTextTransform: uppercase; $colorDiscreteItemBg: rgba($colorBodyFg,0.1); $colorDiscreteItemCurrentBg: rgba($colorOk,0.3); +$scrollContainer: rgba(102, 102, 102, 0.1); @mixin discreteItem() { background: $colorDiscreteItemBg; diff --git a/src/styles/notebook.scss b/src/styles/notebook.scss index 1d620af5f2..2dc86aa38d 100644 --- a/src/styles/notebook.scss +++ b/src/styles/notebook.scss @@ -29,9 +29,10 @@ .scrollContainer{ // Class for overflow embeds (possibly for text entry overflow in future) - background: $colorBodyBg; - box-shadow: inset 0 5px 5px rgb(0 0 0 / 20%); + background: $scrollContainer; + box-shadow: inset 0 3px 4px rgb(0 0 0 / 40%); overflow-y: scroll; + border-radius: $controlCr; } .c-notebook { @@ -417,9 +418,9 @@ @include snapThumb(); } .c-ne__embeds-wrapper{ - max-height: 11vh; - padding-left: $interiorMarginLg; - padding-top: $interiorMarginLg; + max-height: 75px; + padding-left: $interiorMargin; + padding-top: $interiorMargin; display: flex; } @@ -428,6 +429,7 @@ display: inline-flex; flex: 0 0 auto; padding: $interiorMargin; + border: 1px solid $colorInteriorBorder; &__info { display: flex; diff --git a/src/ui/components/tags/tags.scss b/src/ui/components/tags/tags.scss index 97b8bdda82..ebd3e7a184 100644 --- a/src/ui/components/tags/tags.scss +++ b/src/ui/components/tags/tags.scss @@ -34,7 +34,6 @@ flex-direction: row; flex-wrap: wrap; align-items: center; - margin-bottom: 5px; > * + * { margin-left: $interiorMargin;