Merge remote-tracking branch 'origin/master'

SkuciSe/src/main/resources/templates/onama.html

@@ -106,12 +106,12 @@
     </div>
 </nav>
 <div class="bg-image" style="background-image: url('/images/ehl-real-estate-building.jpg');
-            height: 80vh;background-size: cover">
+            height: 70vh;background-size: cover">
     <div class="w-100">
-        <div class="row h-100 justify-content-end align-items-left px-5 m-2">
+        <div class="row h-100 justify-content-end align-items-left px-5">
             <div class="col-lg-5 my-10">
-                <h1 class="mt-5 pt-5 text-center text-white">O nama</h1>
-                <p class="mt-5 text-white h4">Cilj projekta <span><b>SkućiSe</b></span> je razvoj internet platforme za oglašavanje i zakazivanje razgledanja nekretnina, koja će korisnicima omogućiti direktnu razmenu informacija o ponudi i potražnji, bez posrednika i bez mogućnosti manipulacije podacima. Cilj je ušteda vremena obe strane i pouzdanost. Multiplatformska web aplikacija će korisnicima omogućiti pristup sa različitih vrsta računara i mobilnih uređaja. Zahvaljujući ovoj platformi, oglašivači stanova će bez posrednika lakše pronalaziti put do svojih budućih stanara/kupaca, dok će sa druge strane potencijalni stanari/kupci imati priliku da na pouzdan način dođu do svog stana.</p>
+                <h1 class="mt-5 pt-5 pr-5 text-center text-white">O nama</h1>
+                <p class="mt-5 pr-5 text-white h4">Cilj projekta <span><b>SkućiSe</b></span> je razvoj internet platforme za oglašavanje i zakazivanje razgledanja nekretnina, koja će korisnicima omogućiti direktnu razmenu informacija o ponudi i potražnji, bez posrednika i bez mogućnosti manipulacije podacima. Cilj je ušteda vremena obe strane i pouzdanost. Multiplatformska web aplikacija će korisnicima omogućiti pristup sa različitih vrsta računara i mobilnih uređaja. Zahvaljujući ovoj platformi, oglašivači stanova će bez posrednika lakše pronalaziti put do svojih budućih stanara/kupaca, dok će sa druge strane potencijalni stanari/kupci imati priliku da na pouzdan način dođu do svog stana.</p>
                 </p>
     </div>
 </div>

SkuciSe/src/main/resources/templates/portfolio.html

@@ -110,21 +110,21 @@
   <div class="container py-5">
     <div class="row mb-4">
       <div class="col-lg-6">
-        <h2 class="display-4 font-weight-light">Upoznajte nas tim</h2>
-        <p class="font-italic text-muted">Ovo su profili ljudi koji su zasluzni za kreiranje ove platfmorme.</p>
+        <h2 class="display-4 font-weight-light">Upoznajte naš tim</h2>
+        <p class="font-italic text-muted">Profili ljudi koji su zaslužni za kreiranje ove platfmorme.</p>
       </div>
     </div>
 
     <div class="row text-center">
       <!-- Team item-->
       <div class="col-xl-3 col-sm-6 mb-5">
-        <div class="bg-white rounded shadow-sm py-5 px-4"><img src="images/retard.jpg" alt="" width="100" class="img-fluid rounded-circle mb-3 img-thumbnail shadow-sm">
-          <h5 class="mb-0">Milovan Samardzić </h5><span class="small text-uppercase text-muted">Front-End Developer </span>
-          <ul class="social mb-0 list-inline mt-3">
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-facebook-f"></i></a></li>
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-twitter"></i></a></li>
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-instagram"></i></a></li>
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-linkedin"></i></a></li>
+        <div class="bg-white rounded shadow-sm py-5 px-4 h-100"><img src="/images/milovan.png" alt="" width="100" class="img-fluid rounded-circle mb-3 img-thumbnail shadow-sm">
+          <h5 class="mb-0">Milovan Samardzić </h5><span class="small text-uppercase text-muted row pt-2 justify-content-center mb-3">Front-End Developer </span>
+          <ul class="social mb-0 list-inline pt-3">
+            <li class="list-inline-item"><a href="https://facebook.com" class="social-link"><i class="fa fa-facebook-f"></i></a></li>
+            <li class="list-inline-item"><a href="https://twitter.com" class="social-link "><i class="fa fa-twitter"></i></a></li>
+            <li class="list-inline-item"><a href="https://www.instagram.com" class="social-link"><i class="fa fa-instagram"></i></a></li>
+            <li class="list-inline-item"><a href="https://www.linkedin.com" class="social-link"><i class="fa fa-linkedin"></i></a></li>
           </ul>
         </div>
       </div>
@@ -132,13 +132,13 @@
 
       <!-- Team item-->
       <div class="col-xl-3 col-sm-6 mb-5">
-        <div class="bg-white rounded shadow-sm py-5 px-4"><img src="images/bogdanRetard.png" alt="" width="100" class="img-fluid rounded-circle mb-3 img-thumbnail shadow-sm">
-          <h5 class="mb-0">Bogdan Anđelković</h5><span class="small text-uppercase text-muted">Back-End Developer</span>
-          <ul class="social mb-0 list-inline mt-3">
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-facebook-f"></i></a></li>
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-twitter"></i></a></li>
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-instagram"></i></a></li>
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-linkedin"></i></a></li>
+        <div class="bg-white rounded shadow-sm py-5 px-4 h-100"><img src="/images/bogdan.png" alt="" width="100" class="img-fluid rounded-circle mb-3 img-thumbnail shadow-sm">
+          <h5 class="mb-0">Bogdan Anđelković</h5><span class="small text-uppercase text-muted row pt-2 justify-content-center mb-3">Back-End Developer</span>
+          <ul class="social mb-0 list-inline pt-3">
+            <li class="list-inline-item"><a href="https://facebook.com" class="social-link"><i class="fa fa-facebook-f"></i></a></li>
+            <li class="list-inline-item"><a href="https://twitter.com" class="social-link"><i class="fa fa-twitter"></i></a></li>
+            <li class="list-inline-item"><a href="https://www.instagram.com" class="social-link"><i class="fa fa-instagram"></i></a></li>
+            <li class="list-inline-item"><a href="https://www.linkedin.com" class="social-link"><i class="fa fa-linkedin"></i></a></li>
           </ul>
         </div>
       </div>
@@ -146,13 +146,13 @@
 
       <!-- Team item-->
       <div class="col-xl-3 col-sm-6 mb-5">
-        <div class="bg-white rounded shadow-sm py-5 px-4"><img src="https://bootstrapious.com/i/snippets/sn-about/avatar-2.png" alt="" width="100" class="img-fluid rounded-circle mb-3 img-thumbnail shadow-sm">
-          <h5 class="mb-0">Nikola Marković</h5><span class="small text-uppercase text-muted">Front-End Developer</span>
-          <ul class="social mb-0 list-inline mt-3">
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-facebook-f"></i></a></li>
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-twitter"></i></a></li>
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-instagram"></i></a></li>
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-linkedin"></i></a></li>
+        <div class="bg-white rounded shadow-sm py-5 px-4 h-100"><img src="/images/nikola.png" alt="" width="100" class="img-fluid rounded-circle mb-3 img-thumbnail shadow-sm">
+          <h5 class="mb-0">Nikola Marković</h5><span class="small text-uppercase text-muted row pt-2 justify-content-center mb-3">Front-End Developer</span>
+          <ul class="social mb-0 list-inline pt-3">
+            <li class="list-inline-item"><a href="https://facebook.com" class="social-link"><i class="fa fa-facebook-f"></i></a></li>
+            <li class="list-inline-item"><a href="https://twitter.com" class="social-link"><i class="fa fa-twitter"></i></a></li>
+            <li class="list-inline-item"><a href="https://www.instagram.com" class="social-link"><i class="fa fa-instagram"></i></a></li>
+            <li class="list-inline-item"><a href="https://www.linkedin.com" class="social-link"><i class="fa fa-linkedin"></i></a></li>
           </ul>
         </div>
       </div>
@@ -160,13 +160,13 @@
 
       <!-- Team item-->
       <div class="col-xl-3 col-sm-6 mb-5">
-        <div class="bg-white rounded shadow-sm py-5 px-4"><img src="https://cdn.discordapp.com/attachments/534446980194107395/1020436174436835459/22d0118fab8c343a3e0af4061314f96ce7f4820088857fcf37ed42c2c5a67adc.0.png" alt="" width="100" class="img-fluid rounded-circle mb-3 img-thumbnail shadow-sm">
-          <h5 class="mb-0">Mihailo Šebek</h5><span class="small text-uppercase text-muted">Back-End Developer</span>
-          <ul class="social mb-0 list-inline mt-3">
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-facebook-f"></i></a></li>
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-twitter"></i></a></li>
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-instagram"></i></a></li>
-            <li class="list-inline-item"><a href="#" class="social-link"><i class="fa fa-linkedin"></i></a></li>
+        <div class="bg-white rounded shadow-sm py-5 px-4 h-100"><img src="/images/mihailo.png" alt="" width="100" class="img-fluid rounded-circle mb-3 img-thumbnail shadow-sm">
+          <h5 class="mb-0">Mihailo Šebek</h5><span class="small text-uppercase text-muted row pt-2 justify-content-center mb-3">Back-End Developer</span>
+          <ul class="social mb-0 list-inline pt-3">
+            <li class="list-inline-item"><a href="https://facebook.com" class="social-link"><i class="fa fa-facebook-f"></i></a></li>
+            <li class="list-inline-item"><a href="https://twitter.com" class="social-link"><i class="fa fa-twitter"></i></a></li>
+            <li class="list-inline-item"><a href="https://www.instagram.com" class="social-link"><i class="fa fa-instagram"></i></a></li>
+            <li class="list-inline-item"><a href="https://www.linkedin.com" class="social-link"><i class="fa fa-linkedin"></i></a></li>
           </ul>
         </div>
       </div>