Update 2021

xevorte · Aug 28, 2021 · fe83cea · fe83cea
1 parent b7ad472
commit fe83cea
Show file tree

Hide file tree

Showing 7 changed files with 297 additions and 0 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "liveServer.settings.port": 5501
+}
diff --git a/css/style.css b/css/style.css
diff --git a/css/style.css.map b/css/style.css.map
diff --git a/css/style.scss b/css/style.scss
@@ -666,7 +666,11 @@ input {
     background-color: royalblue;
 
     .img-profile {
+<<<<<<< HEAD
       width: 35%;
+=======
+      width: 32%;
+>>>>>>> 5cb1b34 (Update 2021)
       border-radius: 100px;
       box-shadow: 0 3px 3px #333646;
     }
@@ -680,8 +684,11 @@ input {
 
   .profile-main {
     color: #fff;
+<<<<<<< HEAD
     height: 855px;
     overflow: auto;
+=======
+>>>>>>> 5cb1b34 (Update 2021)
 
     .kontak {
       margin-bottom: 20px;

diff --git a/img/profile/Politeknik_SSR.jpg b/img/profile/Politeknik_SSR.jpg
diff --git a/img/profile/me.png b/img/profile/me.png
diff --git a/profile.html b/profile.html