Skip to content

Commit

Permalink
Merge branch 'master' into dynamic-about
Browse files Browse the repository at this point in the history
  • Loading branch information
jjanzenn authored Mar 23, 2023
2 parents 6ba0514 + 7d1d978 commit 6196760
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 7 deletions.
Binary file added My project.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion about.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</nav>
<div class="top-bar">
<div class="logo">
<h1><i class="material-icons" style="font-size: 2em;">fullscreen_exit</i></h1>
<img src = "My project.png" alt="logo"/>
</div>
<div class="search-bar">
<input type="text" class="search-bar"></input>
Expand Down
4 changes: 1 addition & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@
</nav>
<div class="top-bar">
<div class="logo" id="logo">
<h1>
<i class="material-icons" style="font-size: 2em;">fullscreen_exit</i>
</h1>
<img src = "My project.png" alt="logo"/>
</div>
<div class="search-bar">
<input type="text" class="search-bar" id="searchbar"></input>
Expand Down
19 changes: 16 additions & 3 deletions styles/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,25 @@ p {
height: 80px;
align-items: center;
border: 1px solid black;
background-color: #c3d0d5;
background-color: rgb(226, 232, 238);
}

.logo img{

width: 150%;
left: 30px;
aspect-ratio: 1;

}

.container {
display: flex;
margin-top: 80px;
}

.fixed {
width: 94px;
left: 30px;
left: 0px;
top: 0px;
margin-top: 80px;
padding: .5rem .5rem 0;
Expand All @@ -59,11 +67,15 @@ p {
.side-menu-item{
height: 140px;
text-decoration: none;
display: block;
display: flex;
justify-content: center;
align-items: center;
transition: .25s ease-in;
}
.side-menu-item:hover{
color: black;
text-decoration: underline;
background-color: rgb(226, 232, 238);
}

.logo {
Expand Down Expand Up @@ -97,3 +109,4 @@ a {
align-items: center;
display: block;
}

0 comments on commit 6196760

Please sign in to comment.