Skip to content

Commit

Permalink
Merge branch 'master' of github.com:microweber-templates/new-world
Browse files Browse the repository at this point in the history
  • Loading branch information
peter-mw committed Oct 18, 2023
2 parents d1122c6 + 1514192 commit 7598d98
Show file tree
Hide file tree
Showing 26 changed files with 4,689 additions and 5,194 deletions.
2 changes: 1 addition & 1 deletion assets/css/_theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6327,7 +6327,7 @@ select.form-control {
}

.sticky-nav-disabled .navigation-holder {
position: unset;
position: unset !important;
}

.container .container {
Expand Down
6 changes: 3 additions & 3 deletions assets/css/color-loops.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Error: Undefined variable: "$colors".
on line 15 of C:\xampp\htdocs\microweber\userfiles\templates\new-world\assets\css\color-loops.scss
on line 15 of D:\xampp\htdocs\git\microweber-dev-dusk\userfiles\templates\new-world\assets\css\color-loops.scss
10:
11:
Expand All @@ -15,7 +15,7 @@ Error: Undefined variable: "$colors".
20: .hr-bg-#{name}{
Backtrace:
C:\xampp\htdocs\microweber\userfiles\templates\new-world\assets\css\color-loops.scss:15
D:\xampp\htdocs\git\microweber-dev-dusk\userfiles\templates\new-world\assets\css\color-loops.scss:15
C:/Program Files (x86)/Koala/rubygems/gems/sass-3.5.2/lib/sass/script/tree/variable.rb:49:in `_perform'
C:/Program Files (x86)/Koala/rubygems/gems/sass-3.5.2/lib/sass/script/tree/node.rb:50:in `perform'
C:/Program Files (x86)/Koala/rubygems/gems/sass-3.5.2/lib/sass/tree/visitors/perform.rb:233:in `visit_each'
Expand Down Expand Up @@ -51,4 +51,4 @@ C:/Program Files (x86)/Koala/bin/sass:22:in `<main>'
body:before {
white-space: pre;
font-family: monospace;
content: "Error: Undefined variable: \"$colors\".\A on line 15 of C:\xampp\htdocs\microweber\userfiles\templates\new-world\assets\css\color-loops.scss\A \A 10: \A 11: \A 12: /*Color mixer*/\A 13: \A 14: \A 15: @each $name, $color in $colors {\A 16: .btn-#{name},\A 17: .bg-#{name},\A 18: .badge-#{name},\A 19: .icon-bg-#{name},\A 20: .hr-bg-#{name}{"; }
content: "Error: Undefined variable: \"$colors\".\A on line 15 of D:\xampp\htdocs\git\microweber-dev-dusk\userfiles\templates\new-world\assets\css\color-loops.scss\A \A 10: \A 11: \A 12: /*Color mixer*/\A 13: \A 14: \A 15: @each $name, $color in $colors {\A 16: .btn-#{name},\A 17: .bg-#{name},\A 18: .badge-#{name},\A 19: .icon-bg-#{name},\A 20: .hr-bg-#{name}{"; }
6 changes: 3 additions & 3 deletions assets/css/header-styles.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Error: Undefined variable: "$header-background-color".
on line 42 of C:\xampp\htdocs\microweber\userfiles\templates\new-world\assets\css\header-styles.scss
on line 42 of D:\xampp\htdocs\git\microweber-dev-dusk\userfiles\templates\new-world\assets\css\header-styles.scss
37: height: 100%;
38: display: block;
Expand All @@ -15,7 +15,7 @@ Error: Undefined variable: "$header-background-color".
47: @media screen and (min-width: 1451px) {
Backtrace:
C:\xampp\htdocs\microweber\userfiles\templates\new-world\assets\css\header-styles.scss:42
D:\xampp\htdocs\git\microweber-dev-dusk\userfiles\templates\new-world\assets\css\header-styles.scss:42
C:/Program Files (x86)/Koala/rubygems/gems/sass-3.5.2/lib/sass/script/tree/variable.rb:49:in `_perform'
C:/Program Files (x86)/Koala/rubygems/gems/sass-3.5.2/lib/sass/script/tree/node.rb:50:in `perform'
C:/Program Files (x86)/Koala/rubygems/gems/sass-3.5.2/lib/sass/tree/visitors/perform.rb:402:in `visit_prop'
Expand Down Expand Up @@ -62,4 +62,4 @@ C:/Program Files (x86)/Koala/bin/sass:22:in `<main>'
body:before {
white-space: pre;
font-family: monospace;
content: "Error: Undefined variable: \"$header-background-color\".\A on line 42 of C:\xampp\htdocs\microweber\userfiles\templates\new-world\assets\css\header-styles.scss\A \A 37: height: 100%;\A 38: display: block;\A 39: top: 0;\A 40: left: 0;\A 41: \A 42: background-color: $header-background-color;\A 43: opacity: 1;\A 44: z-index: -1;\A 45: }\A 46: \A 47: @media screen and (min-width: 1451px) {"; }
content: "Error: Undefined variable: \"$header-background-color\".\A on line 42 of D:\xampp\htdocs\git\microweber-dev-dusk\userfiles\templates\new-world\assets\css\header-styles.scss\A \A 37: height: 100%;\A 38: display: block;\A 39: top: 0;\A 40: left: 0;\A 41: \A 42: background-color: $header-background-color;\A 43: opacity: 1;\A 44: z-index: -1;\A 45: }\A 46: \A 47: @media screen and (min-width: 1451px) {"; }
Loading

0 comments on commit 7598d98

Please sign in to comment.