Minor styling improvements. Bedtime

devinhalladay · Jul 29, 2020 · 341fe43 · 341fe43
1 parent 1d1ea3a
commit 341fe43
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,7 @@ certs/
 .env.development.local
 .env.test.local
 .env.build
+.vscode
 
 *.lock
 yarn.lock

diff --git a/public/style.scss b/public/style.scss
@@ -492,8 +492,8 @@ header {
   display: block;
   background-color: white;
   user-select: none;
-  width: 315px;
-  height: 315px;
+  // width: 315px;
+  // height: 315px;
   margin-bottom: 3em;
   text-decoration: none;
 }
@@ -770,8 +770,11 @@ header {
 }
 
 .draggable-block-container {
+<<<<<<< HEAD
   // width: 100%;
   // height: 100%;
+=======
+>>>>>>> 5d01cff... Minor styling improvements. Bedtime
   background: #ffffff;
   border: 1px solid #bdc3ca;
   color: #6f7b8a;
@@ -782,7 +785,11 @@ header {
   transform: rotate(0deg);
   transition: 0.2s all ease;
 
+<<<<<<< HEAD
   &.Channel {
+=======
+  &.Channel,&.Text {
+>>>>>>> 5d01cff... Minor styling improvements. Bedtime
     width: 100%;
     height: 100%;
   }
@@ -892,8 +899,8 @@ header {
   }
 
   .block {
-    width: 100%;
-    height: 100%;
+    // width: 100%;
+    // height: 100%;
     display: flex;
     flex-direction: column;
     flex-flow: column;
@@ -911,6 +918,13 @@ header {
       box-shadow: none;
     }
 
+    .image {
+      overflow-y: scroll;
+      // width: unset;
+      // height: unset;
+      box-shadow: none;
+    }
+
     &.block--expanded {
       overflow: hidden;
       display: block;