From f55bd69470a68dcecc9eccdd8885c883b9f15f42 Mon Sep 17 00:00:00 2001 From: Steev Date: Sun, 20 Mar 2022 12:51:30 +0100 Subject: [PATCH] merging --- src/index.html | 2 +- src/js/steevcss.js | 4 +++- src/sass/button.sass | 3 +++ src/sass/selector.sass | 2 +- src/sass/variables.sass | 5 +++-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/index.html b/src/index.html index 4141c38..e4674b7 100644 --- a/src/index.html +++ b/src/index.html @@ -164,7 +164,7 @@ code here, escape it yourself.





- + diff --git a/src/js/steevcss.js b/src/js/steevcss.js index a8be249..2a610ee 100644 --- a/src/js/steevcss.js +++ b/src/js/steevcss.js @@ -1,6 +1,8 @@ var code = document.querySelectorAll("code"); -// code embed +// TODO: Split a html tag by character +// current way taking 1:1 html and changing how it is setup +// problem: this endsup in breaking once the file itself should be inside the display area code.forEach(c => { let code = c.innerHTML.toString(); var output = ""; diff --git a/src/sass/button.sass b/src/sass/button.sass index af9421e..aafde71 100644 --- a/src/sass/button.sass +++ b/src/sass/button.sass @@ -4,7 +4,10 @@ .btn border-radius: $border_radius border-width: $border_width + border: $border_width solid #d1d1d1 padding: $padding + font-size: 12pt + min-width: 100px transition: 50ms .btn-primary background-color: $primary diff --git a/src/sass/selector.sass b/src/sass/selector.sass index d68da9b..ecc6253 100644 --- a/src/sass/selector.sass +++ b/src/sass/selector.sass @@ -1,5 +1,5 @@ @import variables - +/* todo: make the sliders smaller */ /* The switch - the box around the slider */ .switch position: relative diff --git a/src/sass/variables.sass b/src/sass/variables.sass index fa1710c..ea6257c 100644 --- a/src/sass/variables.sass +++ b/src/sass/variables.sass @@ -1,4 +1,4 @@ -$border_width: 2px +$border_width: 1px $border_radius: 5px $padding: 5px $columns: 12 @@ -7,7 +7,8 @@ $navgap: 1em /* Colours */ $navhovcolor: #a5a5a5 $navdefcolor: #2e2e2e -$primBG: rgb(248, 248, 248) +$default: rgb(248, 248, 248) +$default_dark: #d1d1d1 $primary: #3498db $primary_dark: #2980b9 $danger: #e74c3c