diff --git a/.gitignore b/.gitignore index 91dfed8..e194fa6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .DS_Store +.vscode node_modules \ No newline at end of file diff --git a/components/banner.html b/components/banner.html new file mode 100644 index 0000000..2243ceb --- /dev/null +++ b/components/banner.html @@ -0,0 +1,95 @@ + \ No newline at end of file diff --git a/components/ftProducts.html b/components/ftProducts.html new file mode 100644 index 0000000..ddb5687 --- /dev/null +++ b/components/ftProducts.html @@ -0,0 +1,87 @@ +
+
+
+
+

Featured Product

+

+ Reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. + Excepteur sint occaecat cupidatat non proident. +

+
+
+
+
+
+ + ... + +
+
    +
  • + + + + + +
    • +
  • $240.00
    • +
+ Gym Weight +

+ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sunt in culpa qui officia deserunt. +

+

Reviews (24)

+
+
+
+
+
+ + ... + +
+
    +
  • + + + + + +
    • +
  • $480.00
    • +
+ Cloud Nike Shoes +

+ Aenean gravida dignissim finibus. Nullam ipsum diam, posuere vitae pharetra sed, commodo ullamcorper. +

+

Reviews (48)

+
+
+
+
+
+ + ... + +
+
    +
  • + + + + + +
    • +
  • $360.00
    • +
+ Summer Addides Shoes +

+ Curabitur ac mi sit amet diam luctus porta. Phasellus pulvinar sagittis diam, et scelerisque ipsum lobortis nec. +

+

Reviews (74)

+
+
+
+
+
+
\ No newline at end of file diff --git a/index.html b/index.html index f41ea41..bfa3147 100644 --- a/index.html +++ b/index.html @@ -2,44 +2,63 @@ - - - - - - - - - - - - - - MarmeladenLaden - + + + + + + + + + + + + MarmeladenLaden + - - - - - -

Test

-

This is a test commit

- + + + + + + + + + + + +
+ +
+ + + +
+ +
+ - + + + + - - + + + \ No newline at end of file diff --git a/js/app.ts b/js/app.ts index 4597c9c..9368d9b 100644 --- a/js/app.ts +++ b/js/app.ts @@ -1,6 +1,8 @@ $(document).ready(function() { $('#top_nav_bar').load('../components/top_nav.html'); $('#main_nav_bar').load('../components/main_nav.html'); + $('#mmlcarousel').load('../components/banner.html'); + $('#mmlMainContent').load('../components/ftProducts.html'); $('#marmeladenladen_footer').load('../components/footer.html'); $('#marmeladenladen_search').load('../components/modal.html'); }); \ No newline at end of file diff --git a/res/css/style.css b/res/css/style.css index a5fa026..e2f2755 100644 --- a/res/css/style.css +++ b/res/css/style.css @@ -43,6 +43,17 @@ } #marmeladenladen_footer .border-light { border-color: #2d343f !important;} +/* Carousel*/ +#marmeladenLadencarousel .carousel-indicators li { + margin-top: -50px; + background-color: #d86f23; +} +#marmeladenLadencarousel .carousel-control-next i, +#marmeladenLadencarousel .carousel-control-prev i { + color: #d86f23 !important; + font-size: 2.8em !important; +} + /* Medium devices */ @media (min-width: 768px) { #main_nav_bar .navbar-nav {max-width: 450px;} diff --git a/res/img/berries.jpg b/res/img/berries.jpg new file mode 100644 index 0000000..17b4a43 Binary files /dev/null and b/res/img/berries.jpg differ diff --git a/res/img/cottage.jpg b/res/img/cottage.jpg new file mode 100644 index 0000000..6d28f0b Binary files /dev/null and b/res/img/cottage.jpg differ diff --git a/res/img/jam.jpg b/res/img/jam.jpg new file mode 100644 index 0000000..c00d097 Binary files /dev/null and b/res/img/jam.jpg differ