Skip to content

Commit

Permalink
Revert "initial review"
Browse files Browse the repository at this point in the history
This reverts commit 39ce41a.
  • Loading branch information
borishrncic committed Jun 29, 2024
1 parent 8a421e8 commit d667f33
Show file tree
Hide file tree
Showing 13 changed files with 62 additions and 38 deletions.
4 changes: 2 additions & 2 deletions app/current-page.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
document.addEventListener("DOMContentLoaded", function () {
let currentPage = window.location.pathname;
/* console.log(currentPage); */
let navLinks = document.querySelectorAll('.navbar a');
let navLinks = document.querySelectorAll('.hello-nav a');
navLinks.forEach(link => {
/* console.log(link.getAttribute('href')); */
if (link.getAttribute('href') === currentPage) {
Expand All @@ -11,7 +11,7 @@ document.addEventListener("DOMContentLoaded", function () {
});

// planeo remplazar con sticky
/* // navbar position when scrolling down
/* // hello-nav position when scrolling down
document.addEventListener('DOMContentLoaded', function () {
let nav = document.querySelector("#navbar");
let navHamb = document.querySelector('.nav-hamburger');
Expand Down
2 changes: 1 addition & 1 deletion app/docs-nav-v3.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
console.log("Soy el docs-nav-v3.js");

/* eventListener para el navbar para manejar el display con clases */
/* eventListener para el hello-nav para manejar el display con clases */

const navOpener = document.querySelector('.nav-hamburger')
const navCloser = document.querySelector('.nav-close')
Expand Down
16 changes: 8 additions & 8 deletions app/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ a:hover img.web-icon {
/* The navigation bar ------------------ */

/*reset agregado para buttons*/
.navbar button {
.hello-nav button {
border: none;
/* Elimina el borde por defecto */
background: none;
Expand All @@ -335,7 +335,7 @@ a:hover img.web-icon {
/* END reset agregado para buttons*/


.navbar div {
.hello-nav div {
text-align: right;
}

Expand Down Expand Up @@ -522,7 +522,7 @@ main.home .sub-brands-container hr:nth-last-of-type(-n+2) {
/* end family-of-brands */

/* hello social media */
.hellobar {
.hello-social {
position: relative;
width: 100%;
display: flex;
Expand All @@ -536,8 +536,8 @@ main.home .sub-brands-container hr:nth-last-of-type(-n+2) {

}

.hellobar a::before,
.navbar a::before,
.hello-social a::before,
.hello-nav a::before,
.link-logo:hover::before {
content: none;
}
Expand Down Expand Up @@ -1038,16 +1038,16 @@ i {
color: #ffffff;
}

div.hellobar {
div.hello-social {
display: flex;
flex-direction: row;
padding-top: 14px;
}

div.hellobar small, div.hellobar a {
div.hello-social small, div.hello-social a {
color: white;
}

div.hellobar a {
div.hello-social a {
display: flex;
}
18 changes: 13 additions & 5 deletions brand/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

<body>
<!-- INCLUDE HELLO's start -->
<?php include '../includes/hellobar.php';?>
<?php include '../includes/navbar.php';?>
<?php include '../includes/hello-social.php';?>
<?php include '../includes/hello-nav.php';?>
<!-- INCLUDE HELLO's end -->
<div class="sub-sites-container">
<nav id="navbar" class="sub-sites">
Expand Down Expand Up @@ -114,13 +114,21 @@
</ul>
<br><br>
</nav>

<!-- <button aria-label="Open/Close navbar" class="hamburger">
<img src="imgs/icons/hamburger_icon.svg" alt="" height="30px" width="auto">
</button>
<button class="close">
<svg xmlns="http://www.w3.org/2000/svg" width="72" height="72" viewBox="0 0 24 24">
<path fill="none" stroke="black" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
d="m16 16l-4-4m0 0L8 8m4 4l4-4m-4 4l-4 4" />
</svg>
</button> -->
<main class="sub-sites">
<section class="cover">
<img src="imgs/lightbulb-illustration.svg" alt="Folder Illustration" height="250px" width="auto" >
<h1 class="title-1">Brand Guidelines</h1>
<h1 class="title-2">Brand Guidelines</h1>
<h2 class="caption">The Polyfen Group LLC<br>Est. 2018</h2>
</section>
<hr>
<!-- INCLUDE OVERVIEW.PHP start -->
<?php include 'content/download-assets.php';?>
<!-- INCLUDE OVERVIEW.PHP end -->
Expand Down
8 changes: 4 additions & 4 deletions business/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

<body>
<!-- INCLUDE HELLO's start -->
<?php include '../includes/hellobar.php';?>
<?php include '../includes/navbar.php';?>
<?php include '../includes/hello-social.php';?>
<?php include '../includes/hello-nav.php';?>
<!-- INCLUDE HELLO's end -->
<div class="sub-sites-container">
<nav id="navbar" class="sub-sites">
Expand Down Expand Up @@ -65,8 +65,8 @@
<main class="sub-sites">
<section class="cover">
<img src="imgs/folder-illustration.svg" alt="Folder Illustration" height="200px" width="auto" >
<hr>
<h1 class="title-1">Business Plan</h1>
<h1 class="title-2">Business Plan</h1>
<h2 class="caption">The Polyfen Group LLC<br>Est. 2018</h2>
</section>
<!-- INCLUDE OVERVIEW.PHP start -->
<?php include 'content/overview.php';?>
Expand Down
2 changes: 1 addition & 1 deletion includes/common-app-calling.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

<!-- CSS General -->
<link rel="stylesheet" href="https://polykit.xyz/app/css/polykit-v0-1.css" type="text/css">
<link rel="stylesheet" href="https://polykit.xyz/polynucleus/polynucleus.css" type="text/css">
<link rel="stylesheet" href="../app/styles.css" type="text/css">
<link rel="stylesheet" href="../app/docs-styles.css" type="text/css">

Expand Down
24 changes: 20 additions & 4 deletions includes/head.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,31 @@
<meta name="author" content="The Polyfen Group LLC">

<!-- CSS General -->
<link rel="stylesheet" href="https://polykit.xyz/app/css/polykit-v0-1.css" type="text/css">
<link rel="stylesheet" href="https://polykit.xyz/polynucleus/polynucleus.css" type="text/css">
<link rel="stylesheet" href="app/styles.css" type="text/css">
<link rel="stylesheet" href="app/cookies.css" type="text/css">
<script defer src="../app/docs-nav-v3.js"></script>
<script defer src="../app/current-page.js"></script>

<!-- FONTS -->
<link href="https://fonts.googleapis.com/css2?family=Lora:ital,wght@0,400..700;1,400..700&amp;display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Figtree:ital,wght@0,300..900;1,300..900&amp;display=swap" rel="stylesheet">
<!--
/**
* @license
* MyFonts Webfont Build ID 568563
*
* The fonts listed in this notice are subject to the End User License
* Agreement(s) entered into by the website owner. All other parties are
* explicitly restricted from using the Licensed Webfonts(s).
*
* You may obtain a valid license from one of MyFonts official sites.
* http://www.fonts.com
* http://www.myfonts.com
* http://www.linotype.com
*
*/
-->
<link rel="stylesheet" type="text/css" href="app/fonts/Biotif.css">
<link rel="stylesheet" href="https://use.typekit.net/aba8ecz.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/all.css" integrity="sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU" crossorigin="anonymous">

<!-- FAVICON -->
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
Expand Down
2 changes: 1 addition & 1 deletion includes/navbar.php → includes/hello-nav.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<nav class="navbar">
<nav class="hello-nav">
<div class="nav-links">
<a href="/">Home</a>
<a href="/business/">Business Plan</a>
Expand Down
2 changes: 1 addition & 1 deletion includes/hellobar.php → includes/hello-social.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="hellobar"> <small>Follow us on ➞</small>
<div class="hello-social"> <small>Follow us on ➞</small>
<a href="http://polyfen.com/linkedin" target="_blank" title="Linkedin" class="icon-social">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
<path
Expand Down
10 changes: 5 additions & 5 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<!-- End Google Tag Manager (noscript) -->

<!-- INCLUDE HELLO's start -->
<?php include 'includes/hellobar.php';?>
<?php include 'includes/navbar.php';?>
<?php include 'includes/hello-social.php';?>
<?php include 'includes/hello-nav.php';?>
<!-- INCLUDE HELLO's end -->
<div class="home-container">
<header class="home">
Expand All @@ -55,10 +55,10 @@
</header>
<main class="home">
<section id="home-cover">
<h1 class="title-1">We play with tech</h1>
<p>The Polyfen Group is a small company parent of multiple brands in the software development
<h1 class="title-2">We explore new ways of using tech in creative projects.</h1>
<p>The Polyfen Group LLC is a small company parent of multiple brands related to software development
and
the creative industries.</p>
the creative industry.</p>
</section>
<section class="sub-brands-container">
<h2 class="heading-1">Family of Brands</h2>
Expand Down
2 changes: 1 addition & 1 deletion privacy/app/privacy-scroll.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// navbar position when scrolling down
// hello-nav position when scrolling down
document.addEventListener('DOMContentLoaded', function () {
let nav = document.querySelector("#navbar");

Expand Down
2 changes: 1 addition & 1 deletion terms-and-conditions/app/privacy-scroll.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// navbar position when scrolling down
// hello-nav position when scrolling down
document.addEventListener('DOMContentLoaded', function () {
let nav = document.querySelector("#navbar");

Expand Down
8 changes: 4 additions & 4 deletions wiki/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

<body>
<!-- INCLUDE HELLO's start -->
<?php include '../includes/hellobar.php';?>
<?php include '../includes/navbar.php';?>
<?php include '../includes/hello-social.php';?>
<?php include '../includes/hello-nav.php';?>
<!-- INCLUDE HELLO's end -->

<div class="sub-sites-container">
Expand Down Expand Up @@ -66,9 +66,9 @@
<main class="sub-sites">
<section class="cover">
<img src="imgs/videogame-illustratrion.svg" alt="Videogame Illustration" height="200px" width="auto">
<h1 class="title-1">Team Wiki</h1>
<h1 class="title-2">Team Wiki</h1>
<h2 class="caption">The Polyfen Group LLC<br>Est. 2018</h2>
</section>
<hr>
<!-- INCLUDE TECH-STACK.PHP start -->
<?php include 'content/tech-stack.php';?>
<!-- INCLUDE TECH-STACK.PHP end -->
Expand Down

0 comments on commit d667f33

Please sign in to comment.