Merge pull request #11 from vegaitglobal/develop

Develop
vegaitglobal · Oct 15, 2023 · ed776b3 · ed776b3
2 parents 01d5eae + 4328a7f
commit ed776b3
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 8 deletions.
diff --git a/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/Header.cshtml b/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/Views/Partials/Header.cshtml
@@ -20,9 +20,21 @@
  <ul class="nav__list" role="menubar">
  @foreach (var pageItem in homePage.NavigationPages)
  {
- <li class="nav__item active" role="menuitem">
- <a class="nav__link" href="@pageItem.Url" rel="noopener noreferrer">@pageItem.Name</a>
- </li>
+ var currentPageUrl = Umbraco.AssignedContentItem.Url();
+
+ if (currentPageUrl.Equals(pageItem.Url))
+ {
+ <li class="nav__item active" role="menuitem">
+ <a class="nav__link" href="@pageItem.Url" rel="noopener noreferrer">@pageItem.Name</a>
+ </li>
+ }
+ else
+ {
+ <li class="nav__item" role="menuitem">
+ <a class="nav__link" href="@pageItem.Url" target="@pageItem.Target" rel="noopener noreferrer">@pageItem.Name</a>
+ </li>
+ }
+
  }
  </ul>
  </nav>

diff --git a/...katon.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/backgroundTextModule.cshtml b/...katon.SlobodaNemaCenu.Web/Views/Partials/blocklist/Components/backgroundTextModule.cshtml
@@ -6,6 +6,8 @@
 
 <section class="background-text js-scroll">
  <div>
- <span class="background-text__content js-outer-scroll-text"><span class="js-scroll-text">@item.Text</span></span>
+ <span class="background-text__content js-outer-scroll-text">
+ <span class="js-scroll-text">@item.Text &nbsp;</span>
+ </span>
  </div>
 </section>
diff --git a/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/wwwroot/css/style.css b/Hakaton.SlobodaNemaCenu/Hakaton.SlobodaNemaCenu.Web/wwwroot/css/style.css
@@ -1717,6 +1717,7 @@ button.swiper-pagination-bullet {
 .background-text {
  overflow: hidden;
  margin-bottom: 64px;
+ position: relative;
 }
 
 .background-text__content {
@@ -1731,6 +1732,7 @@ button.swiper-pagination-bullet {
  filter: drop-shadow(0 0 17px rgba(255, 255, 255, 0.4));
  font-family: sans-serif;
  mix-blend-mode: soft-light;
+ position: relative;
 }
 @media only screen and (max-width: 767.98px) {
  .background-text__content {
@@ -1750,6 +1752,15 @@ button.swiper-pagination-bullet {
  margin-left: -50%;
  }
 }
+.additional-text {
+ position: absolute;
+ top: 4.5rem;
+ justify-self: center;
+ font-size: 2vw;
+ font-weight: 700;
+ z-index: 1;
+}
+
 .image-text-box {
  margin-bottom: 64px;
 }
@@ -1841,11 +1852,17 @@ button.swiper-pagination-bullet {
 .image-grid .background-text {
  overflow: initial;
  margin-bottom: 0;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
 }
 .image-grid .background-text__content {
  font-size: 185px;
  text-align: center;
  animation: none;
+ overflow: hidden;
+ letter-spacing: 0.14rem;
  -webkit-text-stroke-color: #084a7c;
  mix-blend-mode: screen;
  white-space: normal;

diff --git a/frontend/src/about.html b/frontend/src/about.html
@@ -249,9 +249,11 @@ <h4 class="h4">About us</h4>
  <div class="wrap">
  <div class="image-grid-wrap">
  <div class="background-text">
- <span class="background-text__content"
- ><span>Nasi projekti</span></span
- >
+
+ <span class="background-text__content ">Nasi projekti </span> 
+ <span class="additional-text">Nasi projekti</span>
+
+
  </div>
  <div class="image-grid__content">
  <div class="image-grid__images">

diff --git a/frontend/src/assets/images/sloboda-nema-cenu.jpg b/frontend/src/assets/images/sloboda-nema-cenu.jpg
diff --git a/frontend/src/blog.html b/frontend/src/blog.html
@@ -59,7 +59,7 @@
  </button>
  <ul class="js-dropdown-list checkbox-dropdown-list">
  <li>
- <img src="./assets/images/state.svg" alt="Serbian language" />
+ <img src="./assets/images/state.svg" alt="Serbian" />
  </li>
  <li>
  <img src="./assets/images/great-britain.png" alt="English" />

diff --git a/frontend/src/scss/components/_background-text.scss b/frontend/src/scss/components/_background-text.scss
@@ -6,6 +6,9 @@
 .background-text {
  overflow: hidden;
  margin-bottom: 64px;
+ position: relative;
+
+
 }
 .background-text__content {
  font-size: 217px;
@@ -19,6 +22,7 @@
  filter: drop-shadow(0 0 17px rgba($white, 0.4));
  font-family: sans-serif;
  mix-blend-mode: soft-light;
+ position: relative;
  @include media-breakpoint-down(sm) {
  font-size: 60px;
  -webkit-text-stroke-width: 1px;
@@ -35,3 +39,12 @@
  margin-left: -50%;
  }
 }
+
+.additional-text {
+ position: absolute;
+ top: 4.5rem;
+ justify-self: center;
+ font-size: 2vw;
+ font-weight: 700;
+ z-index: 1;
+}
diff --git a/frontend/src/scss/components/_image-grid.scss b/frontend/src/scss/components/_image-grid.scss
@@ -8,11 +8,17 @@
  .background-text {
  overflow: initial;
  margin-bottom: 0;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
  }
  .background-text__content {
  font-size: 185px;
  text-align: center;
  animation: none;
+ overflow: hidden;
+ letter-spacing:0.14rem;
  -webkit-text-stroke-color: #084a7c;
  mix-blend-mode: screen;
  white-space: normal;
@@ -21,7 +27,11 @@
  font-size: 14vw;
  }
  }
+
 }
+
+
+
 .image-grid__content {
  text-align: center;
 }