-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4 from autoslug/dev
fix paths, formatting
- Loading branch information
Showing
8 changed files
with
140 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,67 +1,72 @@ | ||
| .topbar{ | ||
| .topbar { | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: space-between; | ||
| align-items: center; | ||
| position: fixed; | ||
| background-color:rgb(31, 10, 45); | ||
| background-color: rgb(31, 10, 45); | ||
| width: 100%; | ||
| } | ||
| .midbox{ | ||
| display:flex; | ||
|
|
||
| .midbox { | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: space-between; | ||
| align-items: center; | ||
| } | ||
| .topbarRight{ | ||
|
|
||
| .topbarRight { | ||
| padding-right: 20px; | ||
| } | ||
| .topbarLeft | ||
| { | ||
| padding-left:10px; | ||
|
|
||
| .topbarLeft { | ||
| padding-left: 10px; | ||
| } | ||
|
|
||
| .bottomTile { | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: center; | ||
| align-items: center; | ||
| } | ||
| .centerTile{ | ||
|
|
||
| .centerTile { | ||
| padding-left: 40px; | ||
| padding-right: 40px; | ||
| } | ||
| a.links:link{ | ||
|
|
||
| a.links:link { | ||
| color: white; | ||
| text-decoration: none; | ||
| font-size:20px; | ||
| font-size: 20px; | ||
| font-weight: bold; | ||
| font-family: 'Orbitron', sans-serif; | ||
|
|
||
| } | ||
| a.links:visited | ||
| { | ||
| color:white; | ||
|
|
||
| a.links:visited { | ||
| color: white; | ||
| text-decoration: none; | ||
| font-family: 'Orbitron', sans-serif; | ||
| font-size:20px; | ||
| font-size: 20px; | ||
| font-weight: bold; | ||
|
|
||
| } | ||
| a.links:hover | ||
| { | ||
|
|
||
| a.links:hover { | ||
| color: white; | ||
| text-decoration: none; | ||
| font-family: 'Orbitron', sans-serif; | ||
| font-size:20px; | ||
| font-size: 20px; | ||
| font-weight: bold; | ||
|
|
||
|
|
||
| } | ||
| a.links:active | ||
| { | ||
|
|
||
| a.links:active { | ||
| color: white; | ||
| text-decoration: none; | ||
| font-family: 'Orbitron', sans-serif; | ||
| font-size:20px; | ||
| font-size: 20px; | ||
| font-weight: bold; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,66 +1,67 @@ | ||
| .topbar{ | ||
| .topbar { | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: space-between; | ||
| align-items: center; | ||
| position: fixed; | ||
| background-color:rgb(31, 10, 45); | ||
| background-color: rgb(31, 10, 45); | ||
| width: 100%; | ||
| } | ||
| .midbox | ||
| { | ||
| display:flex; | ||
|
|
||
| .midbox { | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: space-between; | ||
| align-items: center; | ||
| } | ||
| .bottomTile | ||
| { | ||
| display:flex; | ||
| flex-direction:row; | ||
| justify-content:center; | ||
| align-items:center; | ||
|
|
||
| .bottomTile { | ||
| display: flex; | ||
| flex-direction: row; | ||
| justify-content: center; | ||
| align-items: center; | ||
| } | ||
|
|
||
| .topbarRight{ | ||
| .topbarRight { | ||
| padding-right: 20px; | ||
| } | ||
| .topbarLeft | ||
| { | ||
| padding-left:10px; | ||
|
|
||
| .topbarLeft { | ||
| padding-left: 10px; | ||
| } | ||
| a.links:link{ | ||
|
|
||
| a.links:link { | ||
| color: white; | ||
| text-decoration: none; | ||
| font-size:20px; | ||
| font-size: 20px; | ||
| font-weight: bold; | ||
| font-family: 'Orbitron', sans-serif; | ||
|
|
||
| } | ||
| a.links:visited | ||
| { | ||
| color:white; | ||
|
|
||
| a.links:visited { | ||
| color: white; | ||
| text-decoration: none; | ||
| font-family: 'Orbitron', sans-serif; | ||
| font-size:20px; | ||
| font-size: 20px; | ||
| font-weight: bold; | ||
|
|
||
| } | ||
| a.links:hover | ||
| { | ||
|
|
||
| a.links:hover { | ||
| color: white; | ||
| text-decoration: none; | ||
| font-family: 'Orbitron', sans-serif; | ||
| font-size:20px; | ||
| font-size: 20px; | ||
| font-weight: bold; | ||
|
|
||
|
|
||
| } | ||
| a.links:active | ||
| { | ||
|
|
||
| a.links:active { | ||
| color: white; | ||
| text-decoration: none; | ||
| font-family: 'Orbitron', sans-serif; | ||
| font-size:20px; | ||
| font-size: 20px; | ||
| font-weight: bold; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,53 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
|
|
||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| <title>Autoslug</title> | ||
| <link rel="stylesheet" href="index.css"> | ||
| <link rel="icon" href="assets/logo.png"> | ||
| <link rel="icon" href="/assets/logo.png"> | ||
| <link rel="preconnect" href="https://fonts.googleapis.com"> | ||
| <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> | ||
| <link href="https://fonts.googleapis.com/css2?family=Orbitron:wght@500&family=Sometype+Mono:wght@700&display=swap" rel="stylesheet"> | ||
| <link rel="icon" href="assets/logo.png"> | ||
| <link href="https://fonts.googleapis.com/css2?family=Orbitron:wght@500&family=Sometype+Mono:wght@700&display=swap" | ||
| rel="stylesheet"> | ||
| <link rel="icon" href="/assets/logo.png"> | ||
|
|
||
| </head> | ||
| <body style = "margin: 0px;"> | ||
| <div class = "topTile" style = "background-color:rgb(31, 10, 45); padding: 0px;"> | ||
| <div class = "topbar"> | ||
| <div class = topbarLeft> | ||
| <img src="assets/logo.png" width = "100" height = "100" alt="AutoSlug" style = "padding-left: 10px"> | ||
|
|
||
| <body style="margin: 0px;"> | ||
| <div class="topTile" style="background-color:rgb(31, 10, 45); padding: 0px;"> | ||
| <div class="topbar"> | ||
| <div class=topbarLeft> | ||
| <img src="/assets/logo.png" width="100" height="100" alt="AutoSlug" style="padding-left: 10px"> | ||
| </div> | ||
| <div class = topbarRight> | ||
| <a href="index.html"class = "links" style = "padding-left: 15px; padding-right: 15px; text-decoration:none">HOME</a> | ||
| <a href="about/index.html"class = "links" style = "padding-left: 15px; padding-right: 15px; text-decoration:none">ABOUT</a> | ||
| <a href="projects/index.html" class = "links" style = "padding-left: 15px; padding-right: 15px; text-decoration:none">PROJECTS</a> | ||
| <a href="team/index.html" class = "links"style = "padding-left: 15px; padding-right: 15px; text-decoration:none">TEAM</a> | ||
| <a href="https://secure.ucsc.edu/s/1069/bp18/interior.aspx?sid=1069&gid=1001&pgid=780&cid=1749&dids=1207" class="links" style="padding-left: 15px; padding-right: 15px; text-decoration:none" target="_blank">DONATE</a> | ||
| <div class=topbarRight> | ||
| <a href="/" class="links" style="padding-left: 15px; padding-right: 15px; text-decoration:none">HOME</a> | ||
| <a href="/about" class="links" | ||
| style="padding-left: 15px; padding-right: 15px; text-decoration:none">ABOUT</a> | ||
| <a href="/projects" class="links" | ||
| style="padding-left: 15px; padding-right: 15px; text-decoration:none">PROJECTS</a> | ||
| <a href="/team" class="links" | ||
| style="padding-left: 15px; padding-right: 15px; text-decoration:none">TEAM</a> | ||
| <a href="https://secure.ucsc.edu/s/1069/bp18/interior.aspx?sid=1069&gid=1001&pgid=780&cid=1749&dids=1207" | ||
| class="links" style="padding-left: 15px; padding-right: 15px; text-decoration:none" | ||
| target="_blank">DONATE</a> | ||
| </div> | ||
| </div> | ||
| <img src = "assets/giving_day_banner2.png" style = "max-width:100%; height:auto; padding-top: 50px;"> | ||
| <div style = "font-family: 'Orbitron', sans-serif;font-size:20px; color:white; padding-top: 80px; text-align: center; font-size: 50px;"> WELCOME TO AUTOSLUG</div> | ||
| <div style = "font-family: 'Orbitron', sans-serif;font-family: 'Sometype Mono', monospace;font-size:20px; color:white; padding-top: 80px; text-align: center; padding-left: 20px; padding-right: 20px; padding-bottom: 60px;">Autoslug is an organization affiliated with the Baskin School of Engineering that specializes in implementing AI, machine learning, and computer vision in practical applications. Our goal is to provide students with opportunities to gain hands-on experience and move beyond the theoretical aspects of these advanced concepts in order to apply them. This would lead to delving into their intersections with humans, data, and various hardware environments.</div> | ||
| <img src="assets/giving_day_banner2.png" style="max-width:100%; height:auto; padding-top: 50px;"> | ||
| <div | ||
| style="font-family: 'Orbitron', sans-serif;font-size:20px; color:white; padding-top: 80px; text-align: center; font-size: 50px;"> | ||
| WELCOME TO AUTOSLUG</div> | ||
| <div | ||
| style="font-family: 'Orbitron', sans-serif;font-family: 'Sometype Mono', monospace;font-size:20px; color:white; padding-top: 80px; text-align: center; padding-left: 20px; padding-right: 20px; padding-bottom: 60px;"> | ||
| Autoslug is an organization affiliated with the Baskin School of Engineering that specializes in | ||
| implementing AI, machine learning, and computer vision in practical applications. Our goal is to provide | ||
| students with opportunities to gain hands-on experience and move beyond the theoretical aspects of these | ||
| advanced concepts in order to apply them. This would lead to delving into their intersections with humans, | ||
| data, and various hardware environments.</div> | ||
| </div> | ||
| <div class = "bottomTile" style = "background-color:rgb(36, 16, 50); padding-top: 30px; padding-bottom: 30px;"></div> | ||
| <div class="bottomTile" style="background-color:rgb(36, 16, 50); padding-top: 30px; padding-bottom: 30px;"></div> | ||
| </body> | ||
|
|
||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.