Skip to content

Commit

Permalink
merge optimization
Browse files Browse the repository at this point in the history
  • Loading branch information
@BurntWaffleCake
BurntWaffleCake committed Nov 16, 2023
2 parents 7fc6a1e + 2f48e93 commit 055a27f
Show file tree
Hide file tree
Showing 18 changed files with 529 additions and 276 deletions.
141 changes: 71 additions & 70 deletions articleTemplateObjects/articleGlobalNavObject.html
View file
Original file line number Diff line number Diff line change
@@ -1,89 +1,90 @@
<!DOCTYPE html>
<style>
html,
body {
overflow: hidden;
min-height: 100%;
height: 100%;
padding: 0;
margin: 0;
}
html,
body {
overflow: hidden;
min-height: 100%;
height: 100%;
padding: 0;
margin: 0;
}

#global-nav {
box-sizing: border-box;
display: flex;
flex-direction: row;
justify-content: center;
gap: .5em;
#global-nav {
box-sizing: border-box;
display: flex;
flex-direction: row;
justify-content: center;
gap: 0.5em;

height: 100%;
width: 100%;
padding: 0.5em;
height: 100%;
width: 100%;
padding: 0.5em;

background-color: #1e1e1e;
}
background-color: #1e1e1e;
}

#global-nav-icon-link {
margin-right: auto;
height: 100%;
width: auto;
}
#global-nav-icon-link {
margin-right: auto;
height: 100%;
width: auto;
}

#global-nav-icon {
margin: 0%;
padding: 0%;
align-self: flex-start;
height: 100%;
filter: brightness(0) saturate(100%) invert(77%) sepia(44%) saturate(6714%) hue-rotate(215deg) brightness(101%) contrast(96%);
}
#global-nav-icon {
margin: 0%;
padding: 0%;
align-self: flex-start;
height: 100%;
filter: brightness(0) saturate(100%) invert(77%) sepia(44%) saturate(6714%) hue-rotate(215deg) brightness(101%) contrast(96%);
}

@font-face {
font-family: myFirstFont;
src: url(Lora-VariableFont_wght.ttf);
}
@font-face {
font-family: myFirstFont;
src: url(Lora-VariableFont_wght.ttf);
}

.global-nav-link {
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
.global-nav-link {
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;

/* width: 6rem; */
padding-left: 2em;
padding-right: 2em;
border-radius: 2em;
border: 3px solid #a688fa;
/* width: 6rem; */
padding-left: 2em;
padding-right: 2em;
border-radius: 2em;
border: 3px solid #a688fa;

text-decoration: none;
font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
color: #a688fa;
font-weight: bolder;
text-decoration: none;
font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
color: #a688fa;
font-weight: bolder;

background-color: #282828;
transition: 500ms;
}
background-color: #282828;
transition: 500ms;
}

.global-nav-link:hover {
background-color: #575757;
color: white;
}
.global-nav-link:hover {
background-color: #575757;
color: white;
}

#global-nav-extra {
margin-left: auto;
justify-self: flex-end;
background-color: transparent;
filter: brightness(0) saturate(100%) invert(77%) sepia(44%) saturate(6714%) hue-rotate(215deg) brightness(101%) contrast(96%);
}
#global-nav-extra {
margin-left: auto;
justify-self: flex-end;
background-color: transparent;
filter: brightness(0) saturate(100%) invert(77%) sepia(44%) saturate(6714%) hue-rotate(215deg) brightness(101%) contrast(96%);
}
</style>

<body>
<nav id="global-nav">
<a href="../index.html" target="_top" id="global-nav-icon-link"><img id="global-nav-icon" src="../images/digitalPortfolioLogo.png"></a>
<nav id="global-nav">
<a href="../index.html" target="_top" id="global-nav-icon-link"><img id="global-nav-icon" src="../images/digitalPortfolioLogo.png" /></a>

<a class="global-nav-link" target="_top" href="../mainPages/articles.html">Articles</a>
<a class="global-nav-link" target="_top" href="../Blogs.html">Blog</a>
<a class="global-nav-link" target="_top" href="../mainPages/index.html">About Me</a>
<a class="global-nav-link" target="_top" href="../mainPages/articles.html">Articles</a>
<a class="global-nav-link" target="_top" href="../Blogs.html">Blog</a>
<a class="global-nav-link" target="_top" href="../mainPages/projects.html">Projects</a>
<a class="global-nav-link" target="_top" href="../mainPages/index.html">About Me</a>

<img id="global-nav-extra" src="../images/signature.png">
</nav>
</body>
<img id="global-nav-extra" src="../images/signature.png" />
</nav>
</body>
141 changes: 71 additions & 70 deletions articleTemplateObjects/articleGlobalNavObjectHome.html
View file
Original file line number Diff line number Diff line change
@@ -1,89 +1,90 @@
<!DOCTYPE html>
<style>
html,
body {
overflow: hidden;
min-height: 100%;
height: 100%;
padding: 0;
margin: 0;
}
html,
body {
overflow: hidden;
min-height: 100%;
height: 100%;
padding: 0;
margin: 0;
}

#global-nav {
box-sizing: border-box;
display: flex;
flex-direction: row;
justify-content: center;
gap: .5em;
#global-nav {
box-sizing: border-box;
display: flex;
flex-direction: row;
justify-content: center;
gap: 0.5em;

height: 100%;
width: 100%;
padding: 0.5em;
height: 100%;
width: 100%;
padding: 0.5em;

background-color: #1e1e1e;
}
background-color: #1e1e1e;
}

#global-nav-icon-link {
margin-right: auto;
height: 100%;
width: auto;
}
#global-nav-icon-link {
margin-right: auto;
height: 100%;
width: auto;
}

#global-nav-icon {
margin: 0%;
padding: 0%;
align-self: flex-start;
height: 100%;
filter: brightness(0) saturate(100%) invert(77%) sepia(44%) saturate(6714%) hue-rotate(215deg) brightness(101%) contrast(96%);
}
#global-nav-icon {
margin: 0%;
padding: 0%;
align-self: flex-start;
height: 100%;
filter: brightness(0) saturate(100%) invert(77%) sepia(44%) saturate(6714%) hue-rotate(215deg) brightness(101%) contrast(96%);
}

@font-face {
font-family: myFirstFont;
src: url(Lora-VariableFont_wght.ttf);
}
@font-face {
font-family: myFirstFont;
src: url(Lora-VariableFont_wght.ttf);
}

.global-nav-link {
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
.global-nav-link {
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;

/* width: 6rem; */
padding-left: 2em;
padding-right: 2em;
border-radius: 2em;
border: 3px solid #a688fa;
/* width: 6rem; */
padding-left: 2em;
padding-right: 2em;
border-radius: 2em;
border: 3px solid #a688fa;

text-decoration: none;
font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
color: #a688fa;
font-weight: bolder;
text-decoration: none;
font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
color: #a688fa;
font-weight: bolder;

background-color: #282828;
transition: 500ms;
}
background-color: #282828;
transition: 500ms;
}

.global-nav-link:hover {
background-color: #575757;
color: white;
}
.global-nav-link:hover {
background-color: #575757;
color: white;
}

#global-nav-extra {
margin-left: auto;
justify-self: flex-end;
background-color: transparent;
filter: brightness(0) saturate(100%) invert(77%) sepia(44%) saturate(6714%) hue-rotate(215deg) brightness(101%) contrast(96%);
}
#global-nav-extra {
margin-left: auto;
justify-self: flex-end;
background-color: transparent;
filter: brightness(0) saturate(100%) invert(77%) sepia(44%) saturate(6714%) hue-rotate(215deg) brightness(101%) contrast(96%);
}
</style>

<body>
<nav id="global-nav">
<a href="../index.html" target="_top" id="global-nav-icon-link"><img id="global-nav-icon" src="../images/digitalPortfolioLogo.png"></a>
<nav id="global-nav">
<a href="../index.html" target="_top" id="global-nav-icon-link"><img id="global-nav-icon" src="../images/digitalPortfolioLogo.png" /></a>

<a class="global-nav-link" target="_top" href="../mainPages/articles.html">Articles</a>
<a class="global-nav-link" target="_top" href="../Blogs.html">Blog</a>
<a class="global-nav-link" target="_top" href="../mainPages/index.html">About Me</a>
<a class="global-nav-link" target="_top" href="../mainPages/articles.html">Articles</a>
<a class="global-nav-link" target="_top" href="../Blogs.html">Blog</a>
<a class="global-nav-link" target="_top" href="../mainPages/projects.html">Projects</a>
<a class="global-nav-link" target="_top" href="../mainPages/index.html">About Me</a>

<img id="global-nav-extra" src="../images/signature.png">
</nav>
</body>
<img id="global-nav-extra" src="../images/signature.png" />
</nav>
</body>
75 changes: 75 additions & 0 deletions articleTemplateObjects/physicsEngineArticleNavObject.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<!DOCTYPE html>
<style>
html,
body {
overflow: hidden;
min-height: 100%;
height: 100%;
padding: 0;
margin: 0;
}

#article-nav {
box-sizing: border-box;
overflow-y: scroll;
scrollbar-width: thin;
scrollbar-color: rgba(255, 255, 255, 0.1) transparent;

flex-direction: column;
width: 100%;
flex-grow: 0;
flex-shrink: 0;
margin-top: 2em;
/* margin: 0%; */
}

.article-nav-link {
box-sizing: border-box;
display: flex;
align-items: center;

padding: 0.25em;
padding-left: 25px;
/* width: 100%; */
min-height: 1.5em;

text-decoration: none;
font-size: large;
font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
text-wrap: wrap;

background-image: linear-gradient(to left, transparent, transparent);
color: #d4c2ff;
}

.article-nav-header {
display: flex;
align-items: center;
margin: 0%;
padding-left: 25px;
margin-bottom: 1rem;

font-size: x-large;
font-weight: bold;
text-decoration: underline;
font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;

background-image: linear-gradient(to left, transparent, transparent);
color: #d4c2ff;
}

.article-nav-link:hover {
background-image: linear-gradient(to left, transparent, #3f3f3f);
}
</style>

<body>
<nav id="article-nav">
<a href="../index.html" target="_top" class="article-nav-link">Back</a>
<hr style="width: 75%" />
<a href="../projects/Physics/BallCollision/index.html" target="_top" class="article-nav-link">Ball Collision</a>
<a href="../projects/Physics/index.html" target="_top" class="article-nav-link">Ball Collision Optimization</a>
<a href="../projects/Physics/index.html" target="_top" class="article-nav-link">Polygon Collision</a>
<a href="../projects/Physics/index.html" target="_top" class="article-nav-link">Physics Engine</a>
</nav>
</body>
Loading

0 comments on commit 055a27f

Please sign in to comment.