Merge Conflict behoben
This commit is contained in:
commit
f567c2b1f1
7 changed files with 25 additions and 8 deletions
|
|
@ -1,6 +1,5 @@
|
|||
.blog-content {
|
||||
max-width: 900px;
|
||||
|
||||
.highlight {
|
||||
pre {
|
||||
padding: 16px;
|
||||
|
|
@ -8,3 +7,8 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
.blog-single {
|
||||
padding-top: 8rem !important;
|
||||
background: $bg-vanilla;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
.section.portfolio {
|
||||
background: $bg-vanilla;
|
||||
.portfolio-feature:nth-child(odd) {
|
||||
@media (min-width: 1200px) {
|
||||
flex-direction: row-reverse;
|
||||
|
|
|
|||
|
|
@ -7,11 +7,12 @@
|
|||
|
||||
$font-family-base: "Inter", sans-serif;
|
||||
|
||||
// Diese Variablen werden in der _custom.scss wieder überschrieben
|
||||
$primary: #aa69b5;
|
||||
$secondary: #5d2169;
|
||||
$danger: #5d2169;
|
||||
$light: #faefdd;
|
||||
$light-90: #faefddd0;
|
||||
$light: #ffffff;
|
||||
|
||||
|
||||
// scss-docs-start import-stack
|
||||
// Configuration
|
||||
|
|
|
|||
8
assets/scss/shared/_custom.scss
Normal file
8
assets/scss/shared/_custom.scss
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
$primary: #aa69b5;
|
||||
$secondary: #5d2169;
|
||||
$danger: #5d2169;
|
||||
$light: #faefdd;
|
||||
|
||||
$bg-vanilla: #faefdd url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='380' height='380' viewBox='0 0 800 800'%3E%3Cg fill='none' stroke='%23E4CBA1' stroke-width='1'%3E%3Cpath d='M769 229L1037 260.9M927 880L731 737 520 660 309 538 40 599 295 764 126.5 879.5 40 599-197 493 102 382-31 229 126.5 79.5-69-63'/%3E%3Cpath d='M-31 229L237 261 390 382 603 493 308.5 537.5 101.5 381.5M370 905L295 764'/%3E%3Cpath d='M520 660L578 842 731 737 840 599 603 493 520 660 295 764 309 538 390 382 539 269 769 229 577.5 41.5 370 105 295 -36 126.5 79.5 237 261 102 382 40 599 -69 737 127 880'/%3E%3Cpath d='M520-140L578.5 42.5 731-63M603 493L539 269 237 261 370 105M902 382L539 269M390 382L102 382'/%3E%3Cpath d='M-222 42L126.5 79.5 370 105 539 269 577.5 41.5 927 80 769 229 902 382 603 493 731 737M295-36L577.5 41.5M578 842L295 764M40-201L127 80M102 382L-261 269'/%3E%3C/g%3E%3Cg fill='%2398886B'%3E%3Ccircle cx='769' cy='229' r='5'/%3E%3Ccircle cx='539' cy='269' r='5'/%3E%3Ccircle cx='603' cy='493' r='5'/%3E%3Ccircle cx='731' cy='737' r='5'/%3E%3Ccircle cx='520' cy='660' r='5'/%3E%3Ccircle cx='309' cy='538' r='5'/%3E%3Ccircle cx='295' cy='764' r='5'/%3E%3Ccircle cx='40' cy='599' r='5'/%3E%3Ccircle cx='102' cy='382' r='5'/%3E%3Ccircle cx='127' cy='80' r='5'/%3E%3Ccircle cx='370' cy='105' r='5'/%3E%3Ccircle cx='578' cy='42' r='5'/%3E%3Ccircle cx='237' cy='261' r='5'/%3E%3Ccircle cx='390' cy='382' r='5'/%3E%3C/g%3E%3C/svg%3E");
|
||||
|
||||
|
||||
|
|
@ -2,9 +2,8 @@
|
|||
position: fixed;
|
||||
z-index: 100;
|
||||
width: 100%;
|
||||
background-color: $light;
|
||||
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='380' height='380' viewBox='0 0 800 800'%3E%3Cg fill='none' stroke='%23E4CBA1' stroke-width='1'%3E%3Cpath d='M769 229L1037 260.9M927 880L731 737 520 660 309 538 40 599 295 764 126.5 879.5 40 599-197 493 102 382-31 229 126.5 79.5-69-63'/%3E%3Cpath d='M-31 229L237 261 390 382 603 493 308.5 537.5 101.5 381.5M370 905L295 764'/%3E%3Cpath d='M520 660L578 842 731 737 840 599 603 493 520 660 295 764 309 538 390 382 539 269 769 229 577.5 41.5 370 105 295 -36 126.5 79.5 237 261 102 382 40 599 -69 737 127 880'/%3E%3Cpath d='M520-140L578.5 42.5 731-63M603 493L539 269 237 261 370 105M902 382L539 269M390 382L102 382'/%3E%3Cpath d='M-222 42L126.5 79.5 370 105 539 269 577.5 41.5 927 80 769 229 902 382 603 493 731 737M295-36L577.5 41.5M578 842L295 764M40-201L127 80M102 382L-261 269'/%3E%3C/g%3E%3Cg fill='%2398886B'%3E%3Ccircle cx='769' cy='229' r='5'/%3E%3Ccircle cx='539' cy='269' r='5'/%3E%3Ccircle cx='603' cy='493' r='5'/%3E%3Ccircle cx='731' cy='737' r='5'/%3E%3Ccircle cx='520' cy='660' r='5'/%3E%3Ccircle cx='309' cy='538' r='5'/%3E%3Ccircle cx='295' cy='764' r='5'/%3E%3Ccircle cx='40' cy='599' r='5'/%3E%3Ccircle cx='102' cy='382' r='5'/%3E%3Ccircle cx='127' cy='80' r='5'/%3E%3Ccircle cx='370' cy='105' r='5'/%3E%3Ccircle cx='578' cy='42' r='5'/%3E%3Ccircle cx='237' cy='261' r='5'/%3E%3Ccircle cx='390' cy='382' r='5'/%3E%3C/g%3E%3C/svg%3E");
|
||||
/* background by SVGBackgrounds.com */
|
||||
background: $bg-vanilla;
|
||||
|
||||
.navbar-brand {
|
||||
img {
|
||||
width: auto;
|
||||
|
|
@ -15,4 +14,5 @@
|
|||
}
|
||||
a.nav-link.text-primary {
|
||||
background-color: $light-90;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
@import "bootstrap";
|
||||
|
||||
@import "custom";
|
||||
|
||||
@import "fonts";
|
||||
@import "utilities";
|
||||
|
||||
|
|
@ -16,3 +18,4 @@
|
|||
|
||||
@import "../sections/blog-list";
|
||||
@import "../sections/blog-single";
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<div class="container">
|
||||
<a class="navbar-brand d-flex align-items-center" href="{{ .Site.BaseURL }}">
|
||||
<span class="text-logo">{{ .Site.Title }}</span>
|
||||
<img src="images/ve_logo.svg" heigth="86px">
|
||||
<img src="/images/ve_logo.svg" heigth="86px">
|
||||
</a>
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarContent" aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
|
|
|
|||
Loading…
Reference in a new issue