Merge pull request #156 from danielzhang2001/DanielsBranch

a
danielzhang2001 · Apr 19, 2024 · 8d365ab · 8d365ab
2 parents 5672a81 + 1fff796
commit 8d365ab
Show file tree

Hide file tree

Showing 3 changed files with 130 additions and 1 deletion.
diff --git a/.history/assets/css/custom_styles_20240418210954.css b/.history/assets/css/custom_styles_20240418210954.css
@@ -0,0 +1,64 @@
+.menu {
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+    position: absolute;
+    top: 0;
+    right: 0;
+    left: 30%;
+    width: auto;
+    height: 40px;
+    background: linear-gradient(to right, navy, #005085);
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+    border-top: none;
+    border-left: 4px solid rgb(0, 41, 102);
+    border-right: 4px solid rgb(0, 41, 102);
+    border-bottom: 4px solid rgb(0, 41, 102);
+    border-radius: 0 0 20px 20px;
+    z-index: 1000;
+}
+
+.menu a {
+    padding: 0 15px;
+    margin-right: auto;
+    border-right: 4px solid rgb(0, 41, 102);
+    color: white;
+    text-decoration: none;
+    display: flex;
+    justify-content: space-between;
+    text-align: center;
+    align-items: center;
+    width: 100%;
+    height: 100%;
+}
+
+.menu a:last-child {
+    border-right: none;
+}
+
+.banner {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 120px;
+    height: 25px;
+    color: #fff;
+    font-size: 14px;
+    font-weight: 700;
+    border-radius: 2px;
+    background-repeat: no-repeat;
+    background-position: right 15px center;
+    background-size: 20px 20px;
+}
+
+.home {
+    background-image: url('../images/home.png');
+}
+
+.github {
+    background-image: url('../images/github.png');
+}
+
+.privacy {
+    background-image: url('../images/privacy.png');
+}
diff --git a/.history/assets/css/custom_styles_20240418211018.css b/.history/assets/css/custom_styles_20240418211018.css
@@ -0,0 +1,64 @@
+.menu {
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+    position: absolute;
+    top: 0;
+    right: 0;
+    left: 30%;
+    width: auto;
+    height: 40px;
+    background: linear-gradient(to right, navy, #005085);
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+    border-top: none;
+    border-left: 4px solid rgb(0, 41, 102);
+    border-right: 4px solid rgb(0, 41, 102);
+    border-bottom: 4px solid rgb(0, 41, 102);
+    border-radius: 0 0 20px 20px;
+    z-index: 1000;
+}
+
+.menu a {
+    padding: 0 10px;
+    margin-right: auto;
+    border-right: 4px solid rgb(0, 41, 102);
+    color: white;
+    text-decoration: none;
+    display: flex;
+    justify-content: space-between;
+    text-align: center;
+    align-items: center;
+    width: 100%;
+    height: 100%;
+}
+
+.menu a:last-child {
+    border-right: none;
+}
+
+.banner {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 120px;
+    height: 25px;
+    color: #fff;
+    font-size: 14px;
+    font-weight: 700;
+    border-radius: 2px;
+    background-repeat: no-repeat;
+    background-position: right 15px center;
+    background-size: 20px 20px;
+}
+
+.home {
+    background-image: url('../images/home.png');
+}
+
+.github {
+    background-image: url('../images/github.png');
+}
+
+.privacy {
+    background-image: url('../images/privacy.png');
+}
diff --git a/assets/css/custom_styles.css b/assets/css/custom_styles.css
@@ -19,7 +19,7 @@
 }
 
 .menu a {
-    padding: 0 15px;
+    padding: 0 10px;
     margin-right: auto;
     border-right: 4px solid rgb(0, 41, 102);
     color: white;
@@ -29,6 +29,7 @@
     text-align: center;
     align-items: center;
     width: 100%;
+    height: 100%;
 }
 
 .menu a:last-child {