diff --git a/src/components/containers/Group/styles.scss b/src/components/containers/Group/styles.scss index 98cc0d6e..2590e46b 100644 --- a/src/components/containers/Group/styles.scss +++ b/src/components/containers/Group/styles.scss @@ -1,5 +1,6 @@ .group { display: flex; + flex: 1; > :global(.group_filler) { flex: 1; diff --git a/src/components/containers/Panel/styles.scss b/src/components/containers/Panel/styles.scss index d225ab95..bfaa8c27 100644 --- a/src/components/containers/Panel/styles.scss +++ b/src/components/containers/Panel/styles.scss @@ -1,5 +1,11 @@ .panel { padding: $gap; + min-height: $input_height + $gap; + display: flex; + align-items: center; + justify-content: stretch; + box-sizing: border-box; + flex-direction: row; @include outer_shadow(); diff --git a/src/components/input/Button/style.scss b/src/components/input/Button/style.scss index 63c59b7b..91cfe8dc 100644 --- a/src/components/input/Button/style.scss +++ b/src/components/input/Button/style.scss @@ -9,6 +9,7 @@ font-weight: 600; font-size: $text_small; cursor: pointer; + flex: 1; @include outer_shadow(); } diff --git a/src/components/input/TextInput/styles.scss b/src/components/input/TextInput/styles.scss index 3bf01683..55324332 100644 --- a/src/components/input/TextInput/styles.scss +++ b/src/components/input/TextInput/styles.scss @@ -4,6 +4,7 @@ flex-direction: column; align-items: flex-start; position: relative; + flex: 1; } .label { diff --git a/src/components/main/SidePane/index.tsx b/src/components/main/SidePane/index.tsx index 83546dc0..0e010837 100644 --- a/src/components/main/SidePane/index.tsx +++ b/src/components/main/SidePane/index.tsx @@ -33,8 +33,6 @@ export const SidePane: FC = ({ return (
-
-
diff --git a/src/containers/examples/EditorExample/index.tsx b/src/containers/examples/EditorExample/index.tsx index 972f62fc..2cf837b6 100644 --- a/src/containers/examples/EditorExample/index.tsx +++ b/src/containers/examples/EditorExample/index.tsx @@ -17,52 +17,63 @@ interface IProps {} const EditorExample: FC = () => ( - -
- - - + + + + TITLE +
+ + - - - -
-
-
-
- - - -
+ +
+ + + -
- - - Layout setup + + + +
+
+
+
+ + + +
- Cover changer +
+ + + + Layout setup - Track + Cover changer - + Track - + - - + - - - -
+ + + + + + + +
+ ); diff --git a/src/containers/examples/EditorExample/styles.scss b/src/containers/examples/EditorExample/styles.scss index 8bab00f1..688d51c3 100644 --- a/src/containers/examples/EditorExample/styles.scss +++ b/src/containers/examples/EditorExample/styles.scss @@ -15,16 +15,17 @@ .panel { background: $editor_panel_bg; - flex: 0 0 33%; - border-radius: 0 $radius $radius 0; + flex: 1; + //border-radius: 0 $radius $radius 0; + border-radius: $radius 0 $radius 0; box-sizing: border-box; display: flex; flex-direction: column; - @include outer_shadow(); + //@include outer_shadow(); } .editor { - flex: 1; + flex: 2; display: flex; align-items: stretch; flex-direction: column; @@ -56,3 +57,11 @@ flex: 1; display: flex; } + +.close_icon { + height: 24px; + width: 24px; + background: transparentize(white, 0.95); + flex: 0 0 24px; + border-radius: $radius; +} diff --git a/src/styles/global.scss b/src/styles/global.scss index 561622a4..7b7077b7 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -5,10 +5,10 @@ html { } body { - background: $main_bg_color; + background: darken($main_bg_color, 12%); min-height: 100vh; //background: $main_bg_color url("../sprites/dots.svg"); - background: url("http://vault48.org/pixmaps/texture.jpg"); + // background: url("http://vault48.org/pixmaps/texture.jpg"); //background: #111111; color: $main_text_color; font-family: Raleway, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; @@ -23,8 +23,9 @@ body { top: 0; left: 0; z-index: -1; - //background: url("../sprites/circles.svg"); - background: url("http://vault48.org/pixmaps/texture_alt.jpg"); + // background: url("../sprites/circles.svg"); + // background: url("http://vault48.org/pixmaps/texture_alt.jpg"); + background: linear-gradient(darken($main_bg_color, 15%), darken($main_bg_color, 12%)); pointer-events: none; //background-size: cover; }