Merge branch 'main' into origin/feature/one_card

ae46e41b · maria-moroz · GitHub · 9323bb5c · 5f54026e · ae46e41b
Unverified Commit ae46e41b authored 2 years ago by maria-moroz Committed by GitHub 2 years ago
--- a/src/index.html
+++ b/src/index.html
@@ -18,6 +18,7 @@
    />
  </head>
  <body>
+    <include src = "./partials/footer.html"></include>
    <!-- Так добавляются фрагменты в главные HTML-файлы страниц. -->
    <!-- <include src="./partials/example.html"></include> -->
    <include src="./partials/one-card-preview.html"></include>

--- a/src/partials/footer.html
+++ b/src/partials/footer.html
+<footer>
+  <div class="footer_container container">
+    <p class="footer_text">
+      &copy; 2022 | All Rights Reserved | Developed with<svg
+        class="footer_icon"
+        width="14px"
+        height="12.88px"
+      >
+        <use href="./images/sprite.svg#heart"></use></svg>by <a href="#"> GoIT Students </a>
+    </p>
+  </div>
+</footer>
--- a/src/sass/_footer.scss
+++ b/src/sass/_footer.scss
+footer {
+    background-color: $secondary-white-color;
+}
+
+.footer_container {
+    padding-top: 30px;
+    padding-bottom: 30px;
+}
+
+.footer_text {
+    color: $footer-text-color;
+    font-size: 16px;
+    font-weight: 400;
+    text-align: center;
+    line-height: 1.14;
+    margin-top: 0px;
+    margin-bottom: 0px;
+
+    @media screen and (max-width: 768px) {
+        width: 270px;
+        margin-left: auto;
+        margin-right: auto;
+    }
+
+}
+
+.footer_icon {
+    margin-left: 10px;
+    margin-right: 10px
+}
\ No newline at end of file
--- a/src/sass/_variables.scss
+++ b/src/sass/_variables.scss
@@ -4,4 +4,6 @@ $secondary-white-color: #F7F7F7;
 $primary-text-color: #000000;
 $secondary-text-color: #8C8C8C;
 $footer-text-color: #545454;
-$alert-color: #FF001B;
\ No newline at end of file
+$alert-color: #FF001B;
+$transition-duration: 250ms;
+$transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
\ No newline at end of file
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -6,5 +6,4 @@
 // Стили для файла с примером HTML-фрагмента
 @import './variables';
 @import './utility-classes';
-@import './components/one-card-preview';
-
+@import "./footer";