Merge pull request #79 from ThornWalli/feature/update

feat(update): update screen; add no-disk
ThornWalli · May 10, 2020 · b30aabb · b30aabb
2 parents df8f702 + 585f6df
commit b30aabb
Show file tree

Hide file tree

Showing 17 changed files with 728 additions and 259 deletions.
diff --git a/src/assets/css/base.pcss b/src/assets/css/base.pcss
@@ -53,3 +53,15 @@ textarea {
   font: inherit;
   color: inherit;
 }
+
+
+
+fieldset {
+  padding: var(--default-element-margin) calc(var(--default-element-margin) * 2);
+  border: solid var(--color__form__fieldsetBorder) 2px;
+
+  & legend {
+    padding: 0  calc(var(--default-element-margin) * 2);
+    line-height: 1;
+  }
+}
diff --git a/src/assets/svg/no_disk.svg b/src/assets/svg/no_disk.svg
diff --git a/src/assets/svg/screen.svg b/src/assets/svg/screen.svg
diff --git a/src/components/disks/debug/Tests.vue b/src/components/disks/debug/Tests.vue
@@ -1,21 +1,32 @@
 <template>
   <div class="wb-disks-debug-tests">
-    <wb-button-wrapper>
-      <wb-button label="toggle theme-color" @click="onClickToggleThemeColor" />
-    </wb-button-wrapper>
+    <div class="splitter">
+      <div>
+        <div class="slider">
+          <wb-radial-slider />
+        </div>
+      </div>
+      <div>
+        <wb-button-wrapper>
+          <wb-button label="toggle theme-color" @click="onClickToggleThemeColor" />
+        </wb-button-wrapper>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
 
+import WbRadialSlider from '@/components/environments/atoms/RadialSlider';
 import WbButton from '@/components/environments/atoms/Button';
 import WbButtonWrapper from '@/components/environments/molecules/ButtonWrapper';
 import MixinWindowComponent from '@/components/mixins/WindowComponent';
 
 export default {
   components: {
     WbButton,
-    WbButtonWrapper
+    WbButtonWrapper,
+    WbRadialSlider
   },
 
   mixins: [
@@ -42,6 +53,30 @@ export default {
 <style lang="postcss">
 .wb-disks-debug-tests {
   min-width: 380px;
+  height: 100%;
+
+  & .slider {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+
+    & > * {
+      width: 120px;
+      height: 120px;
+    }
+  }
+
+  & .splitter {
+    display: flex;
+    height: 100%;
+
+    & > div {
+      position: relative;
+      flex: 1;
+      height: 100%;
+    }
+  }
 
 }
 </style>
diff --git a/src/components/disks/extras13/webPainting/Display.vue b/src/components/disks/extras13/webPainting/Display.vue
@@ -127,9 +127,6 @@ export default {
   & .display__canvas {
     width: 100%;
     height: 100%;
-
-    /* cursor: '~assets/img/cursor/crosshair-brush.png' 11 11, auto !important; */
-
     cursor: none;
     user-select: none;
     background: var(--display-foreground);
@@ -141,7 +138,6 @@ export default {
     bottom: 0;
     padding: 2px;
     text-align: right;
-    mix-blend-mode: difference;
   }
 }
 </style>