yeet

met18001 · Mar 21, 2020 · ae9f5ff · ae9f5ff
1 parent 55a3f0b
commit ae9f5ff
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 5 deletions.
diff --git a/animation.html b/animation.html
@@ -5,11 +5,15 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>CSS Animation</title>
     <link rel="stylesheet" href="css/animation.css">
+    <link rel="shortcut icon" href="img/logo16.png">
     <link href="https://fonts.googleapis.com/css?family=Abril+Fatface|Julius+Sans+One|Raleway:300,400&display=swap" rel="stylesheet">
 </head>
 <body>
     <div class="flex">
-        <a href= "index.html" class="leftbutton">Home</a>
+        <div class="buttonwrapper">
+            <a href= "index.html" class="leftbutton">Home</a>
+            <a href= "https://github.uconn.edu/pages/met18001/web-design-II/css_showcase/" class="leftbutton">Website</a>
+        </div>
         <div class="right">
             <h1>CSS Animation Project</h1>
             <p>This project was a midterm for my Web II course where we were instructed to study a part of CSS that we did not know much about. I chose CSS animations and transitions.</p>

diff --git a/css/animation.css b/css/animation.css
@@ -21,9 +21,16 @@
             -webkit-box-orient: horizontal;
             -webkit-box-direction: normal;
                     flex-direction: row;
-            padding: 70px;
+            margin-top: 90px;
+            margin-bottom: 50px;
 }
 }
+@media(min-width:1024px){
+    .flex{
+        margin-left: 175px;
+        margin-right: 175px;
+    }
+}
 p{
     font-family: 'Raleway', sans-serif;
     font-weight: 300;
@@ -61,6 +68,7 @@ display: flex;
 -webkit-box-direction: normal;
         flex-direction: column;
         margin: 30px;
+
 
 }
 .gif{
@@ -92,13 +100,33 @@ display: flex;
                         flex-direction: row; 
     }
     .right{
-        padding-left: 4em;
-        margin: 0px;
+       margin-left: 4em;
+
     }
 }
 @media(max-width:650px){
     .gif{
         max-width: 250px;
         max-height: 150px;
     }
-}
+    a{
+        font-size: 15px !important;
+    }
+    h1{
+        font-size: 20px;
+    }
+    p{
+        font-size: 15px;
+    }
+}
+
+.buttonwrapper{
+    display: -webkit-box;
+    display: flex;
+    -webkit-box-pack: justify;
+            justify-content: space-between;
+}
+
+.leftbutton{
+    margin-left: 20px;
+}
diff --git a/nutmeg.html b/nutmeg.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Nutmeg Magazine</title>
+</head>
+<body>
+
+</body>
+</html>