YourWishes/domsPlace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The rest of the cleanup is going to be hard, so this is the last commit before I go test my last changes and get them working.

Browse Source
This commit is contained in:
Dominic Masters
2018-10-25 06:54:25 +11:00
parent dab9e27b24
commit 37114b2ad6
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/objects/window/_window95.scss
View File

@ -21,25 +21,25 @@ $o-window--one-third: #{"33.333333333%"};//I needed greater accuracy than SCSS p
@mixin o-window-border($thickness) { @mixin o-window-border($thickness) {
border: (3px * $thickness) solid black; border: (3px * $thickness) solid black;
border-image-source: url($s-asset--directory+'images/window/window.svg'); border-image-source: url('~@assets/images/window/window.svg');
border-image-slice: $o-window--one-third; border-image-slice: $o-window--one-third;
} }
@mixin o-window-button($thickness) { @mixin o-window-button($thickness) {
border: (2px * $thickness) solid black; border: (2px * $thickness) solid black;
border-image-source: url($s-asset--directory+'images/window/button.svg'); border-image-source: url('~@assets/images/window/button.svg');
border-image-slice: $o-window--one-third; border-image-slice: $o-window--one-third;
display: inline-block; display: inline-block;
background: $o-window--color-background; background: $o-window--color-background;
&:not(.is-disabled):active { &:not(.is-disabled):active {
border-image-source: url($s-asset--directory+'images/window/button-inverted.svg'); border-image-source: url('~@assets/images/window/button-inverted.svg');
} }
} }
@mixin o-window-frame($thickness) { @mixin o-window-frame($thickness) {
border: (2px * $thickness) solid black; border: (2px * $thickness) solid black;
border-image: url($s-asset--directory+'images/window/frame.svg') $o-window--one-third repeat; border-image: url('~@assets/images/window/frame.svg') $o-window--one-third repeat;
} }
//Classes //Classes
@ -88,7 +88,7 @@ $o-window--one-third: #{"33.333333333%"};//I needed greater accuracy than SCSS p
height: 14px * $o-window--scale; height: 14px * $o-window--scale;
font-size: $o-window--font-size; font-size: $o-window--font-size;
background-image: url($s-asset--directory+'images/window/icons.png'); background-image: url('~@assets/images/window/icons.png');
background-position: 0px 0px; background-position: 0px 0px;
background-size: 48px*$o-window--scale 20px*$o-window--scale; background-size: 48px*$o-window--scale 20px*$o-window--scale;

6
public/styles/common.scss
View File

@ -42,6 +42,12 @@
@import './elements/_body.scss'; @import './elements/_body.scss';
@import './elements/_headings.scss'; @import './elements/_headings.scss';
//TEMP
@import './objects/_page-transition.scss';
@import './pages/_contact-page.scss';
@import './pages/_home-page.scss';
@import './pages/_privacy-policy-page.scss';
//Utilities //Utilities
@import './utilities/text-align.scss'; @import './utilities/text-align.scss';