Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
week 9
  • Loading branch information
Alex Mueller committed Mar 30, 2020
1 parent a4497ab commit 0cab4a8
Show file tree
Hide file tree
Showing 31 changed files with 229 additions and 254 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
189 changes: 34 additions & 155 deletions week-4/css/main.css → midterm/css/main.css
Expand Up @@ -12,12 +12,12 @@
========================================================================== */

html {
color: black;
background: white;
color: white;
background: #131516;
font-size: 1em;
line-height: 1.4;
font-family: 'Open Sans', sans-serif;
font-weight: bold;
font-family: input-sans,sans-serif;
font-weight: 500;
}

/*
Expand Down Expand Up @@ -266,181 +266,60 @@ textarea {
}
}

.mw-960 {
max-width: 1100px;
margin: 0 auto;
padding: 12px;

.m-hidden {
display: none;
}

.flex {
nav.show {
flex-shrink: 0;
display: flex;
flex-direction: column;
flex: 0 100%;
}

header {
background-color: #000;
}

#header-flex {
display: flex;
justify-content: space-between;
align-items: center;
height: 70px;
padding: 0 12px;
}

header .logo img{
height: 27px;
}

nav {
display: none;
}
nav a {
color: #bbb;
text-decoration: none;
font-size: 12px;
font-weight: bold;
}

main {
background: linear-gradient(90deg, rgba(0,0,0,0.4) 0%, rgba(0,0,0,0.4) 100%), url(../img/u2_state0.jpg);
background-size: cover;
background-position: center;
color: white;
padding: 110px 24px;
}

.left {
font-family: Raleway;
font-weight: normal;
margin-bottom: 24px;
}

.left .logo img {
height: 60px;
}

.left h1 {
font-weight: normal;
text-transform: uppercase;
font-size: 32px;
}

.left p{
font-weight: 200;
font-size: 12px;
padding: 30px 0;
}

.left hr {
border-top: 2px solid white;
width: 64px;
padding: 24px 12px;
flex-wrap: wrap;
}

.white-outline {
background: none;
border: 2px solid #fff;
color: white;
font-family: Open Sans;
padding: 15px 31px;
width: 100%;
}
form {
display: flex;
flex-direction: column;
text-align: center;
background: #fff;
color: #000;
border-radius: 4px;
}

input {
border: none;
border-bottom: 1px solid rgba(0,0,0,.16);
height: 31px;
margin: 36px 45px;
header .iconify {
height: 24px;
width: 24px;
}

button[type="submit"] {
background-color: #ff8b38;
a, a:visited {
color: white;
border: none;
height: 54px;
font-weight: bolder;
}

.desc h3 {
margin-bottom: 3px;
}

.desc p{
margin-top: 0;
font-weight: normal;
color: #86878b;
font-size: 12px;
}

.socials .icons {
display: flex;
justify-content: space-between;
font-size: 24px;
color: #ccc;
}

footer {
background-color: #000;
color: white;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
height: 99px;
header a {
text-decoration: none;
}

footer .icons {
display: flex;
justify-content: space-between;
width: 100%;
main {
padding: 12px;
}

footer p{
font-weight: normal;
opacity: 50%;
font-size: 12px;
}

@media only screen and (min-width: 768px) {
nav {
display: flex;
justify-content: space-between;
width: 40%;
}
footer .icons {
width: 40%
}
.content {
display: flex;
flex-direction: row;
justify-content: space-between;
@media screen and (min-width: 768px) {
.mobile {
display: none;
}
.left {
margin-right: 24px;
.m-hidden {
display: initial;
}
.right {
flex: 0 60%;
.mw-824 {
display: initial;
}
.white-outline {
width: auto;
header nav a:after {
content:' |';
}
.socials {
display: flex;
}
.socials .desc {
flex: 0 30%;
}
.socials .icons {
font-size: 40px;
flex: 1;
align-items: center;
justify-content: space-around;

header nav a:first-child:before {
content: '| '
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
63 changes: 63 additions & 0 deletions midterm/index.html
@@ -0,0 +1,63 @@
<!doctype html>
<html class="no-js" lang="">

<head>
<meta charset="utf-8">
<title>CSS Grid Showcase</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">

<link rel="manifest" href="site.webmanifest">
<link rel="apple-touch-icon" href="icon.png">
<!-- Place favicon.ico in the root directory -->

<link rel="stylesheet" href="css/normalize.css">
<link rel="stylesheet" href="css/main.css">

<meta name="theme-color" content="#fafafa">
<link rel="stylesheet" href="https://use.typekit.net/tkh5wgd.css">
<script src="https://code.iconify.design/1/1.0.4/iconify.min.js"></script>
</head>

<body>
<!--[if IE]>
<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="https://browsehappy.com/">upgrade your browser</a> to improve your experience and security.</p>
<![endif]-->

<!-- Add your site or application content here -->
<header>
<a href="javascript:void(0);" id="nav-menu" class="mobile"><span class="iconify mobile" data-icon="mdi:menu" data-inline="false"></span></a>
<div class="header-title">
<span class="title">CSS Grid Showcase</span>
</div>
<nav class="m-hidden" id="nav-links">
<a href="#history">History</a>
<a href="#gc-props">Containers</a>
<a href="#gi-props">Items</a>
<a href="#generator">Generator</a>
</nav>
</header>
<main>
<div id="history">
<h1>The History of CSS Grid</h1>
</div>
<div id="gc-props">
<h1>Grid Container Properties</h1>
</div>
<div id="gi-props">
<h1>Grid Item Properties</h1>
</div>
<div id="generator">
<h1>Grid Generator</h1>
</div>
</main>
<footer>
<span class="iconify" data-icon="mdi:github" data-inline="false"></span>
<div class="footer-text">Made by Alex Mueller</div>
</footer>
<script src="js/main.js"></script>
<script src="js/vendor/modernizr-3.8.0.min.js"></script>
<script src="https://code.jquery.com/jquery-3.4.1.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
</body>

</html>
14 changes: 14 additions & 0 deletions midterm/js/main.js
@@ -0,0 +1,14 @@
let menuButton = document.querySelector('#nav-menu')
menuButton.addEventListener('click', toggleMenu)

let navLinks = document.querySelector('#nav-links')
let navTitle = document.querySelector('.title')
function toggleMenu() {
if (navLinks.className == 'm-hidden') {
navLinks.className = 'show';
// navTitle.className = 'hidden';
} else {
// navTitle.className = 'show';
navLinks.className = 'm-hidden';
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
1 change: 1 addition & 0 deletions picture-element-master/.gitignore
@@ -0,0 +1 @@
.DS_Store
66 changes: 66 additions & 0 deletions picture-element-master/css/main.css
@@ -0,0 +1,66 @@
body {
font-family: Arial, Helvetica, sans-serif;
margin: 1em;
background-color: azure
}
h1,h2, h3, h4, h5, h6 {
font-family: Cambria, Cochin, Georgia, Times, 'Times New Roman', serif
}

a:link {
color: rgb(101, 101, 206);
}
a:hover{
color:rgb(61, 61, 126);
}
a:visited {
color:rgb(107, 107, 121)
}


figure.quote {
color: #698b9c;
margin: 2em 1em;
background-color: white;
font-size: 1.25em;
border-left: 1px dotted rgb(139, 139, 207);
padding: 0 1em;
}
figcaption::before {
content: "— ";
}
figcaption {
line-height: 1.5em;
}
blockquote {
margin: 0;
padding: 0;
}

code {
background-color: rgb(234, 234, 234);
}

li {
margin-bottom: 1em;
}

hr {
border: 1px dotted rgb(139, 139, 207);
margin: 2em;
}



@media (min-width: 945px ) {
main {
display: flex;
}
main > article, main > aside {
width: 50%;
}
img {
float: right;
max-width: 100%
}
}
Binary file added picture-element-master/images/art-large.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added picture-element-master/images/art-medium.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added picture-element-master/images/extralarge.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added picture-element-master/images/udacity.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0cab4a8

Please sign in to comment.