Skip to content

Commit

Permalink
sanity commit??
Browse files Browse the repository at this point in the history
  • Loading branch information
kathleenhua committed Feb 23, 2024
2 parents 38ce0d3 + 5ac95a5 commit 2b56700
Show file tree
Hide file tree
Showing 59 changed files with 1,624 additions and 8 deletions.
Binary file modified .DS_Store
Binary file not shown.
Binary file modified assignments/.DS_Store
Binary file not shown.
Binary file modified assignments/hw3/.DS_Store
Binary file not shown.
8 changes: 8 additions & 0 deletions assignments/hw3/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@
<!-- ASSIGNMENT NAME -->
<div id="header-title">Homework 3</div>
<!-- DUE DATE -->
<<<<<<< HEAD
<div id="header-due">February 22</div>
=======
<div id="header-due">February 23</div>
>>>>>>> 8ddef0f26f4f2b704b8fda638ba2d503f4d57212
<div class="clear"></div>
</div>
</div>
Expand Down Expand Up @@ -128,7 +132,11 @@
<li>git commit -m 'finished hw3'</li>
<li>git push</li>
</ul>
<<<<<<< HEAD
<p>This assignment is due <strong>Thursday, February 22nd</strong> at <strong>6:30PM PST</strong>.</p>
=======
<p>This assignment is due <strong>Thursday, February 23rd</strong> at <strong>6:30PM PST</strong>.</p>
>>>>>>> 8ddef0f26f4f2b704b8fda638ba2d503f4d57212
</div>
</div>
</div>
Expand Down
Binary file added assignments/hw4/.DS_Store
Binary file not shown.
Binary file added assignments/hw4/assets/.DS_Store
Binary file not shown.
Binary file added assignments/hw4/assets/css/.DS_Store
Binary file not shown.
159 changes: 159 additions & 0 deletions assignments/hw4/assets/css/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
body {
margin: 0px;
font-family: 'Karla';
background: #f7f5f2;
padding: 60px;
-webkit-font-smoothing: antialiased;
font-smoothing: antialiased;
}

a {
color: inherit;
text-decoration: none;
}

.img-scaled {
width: 100%;
}

.img-scaled-wh {
width: 100%;
height: 100%:
}

.clear {
clear: both;
}

* {
outline: none;
}

#data {
display: none;
}

#container {
width: 720px;
margin: 0px auto;
background: white;
box-shadow: 0px 0px 5px #edeae5;
border-radius: 2px;
position: relative;
padding: 30px 0px;
}
#header {
background: #78c272;
padding: 15px;
color: white;
width: 270px;
}
#header-caption-logo {
width: 20px;
float: left;
}
#header-caption-name {
float: left;
margin-left: 5px;
font-size: 12px;
font-weight: 700;
line-height: 15px;
}
#header-caption {
margin-bottom: 6px;
opacity: 0.6;
}
#header-title {
font-size: 18px;
font-weight: 300;
float: left;
}
#header-due {
float: left;
font-size: 18px;
font-weight: 300;
margin-left: 10px;
padding-left: 10px;
border-left: 2px solid rgba(255, 255, 255, 0.15);
}
.section {
margin: 30px 0px;
padding: 0px 30px;
}
#submission-header, .info-title {
text-align: left;
color: #78c272;
font-size: 24px;
font-weight: 700;
margin-bottom: 15px;
}
#submission-content, .info-content {
padding: 15px;
background: rgba(120, 194, 114, 0.1);
border-radius: 2px;
color: #4c5765;
}
.info-required {
font-size: 13px;
font-weight: 700;
opacity: 0.75;
margin-bottom: 10px;
}
.info-intro {
line-height: 24px;
font-size: 16px;
opacity: 0.75;
}
.info {
margin-bottom: 30px;
}
.body-header {
font-size: 24px;
font-weight: 700;
color: #78c272;
}
.body p {
line-height: 24px;
}
.body img {
width: 100%;
}
.body a {
color: #78c272;
}
.body li {
line-height: 24px;
padding-left: 15px;
padding-bottom: 5px;
}
.body {
color: #4c5765;
}
.body .caption {
opacity: 0.6;
}
#submission {
padding: 0px 30px;
}
#submission-content p, #submission-content li {
line-height: 24px;
opacity: 0.75;
}
.download {
background: #78c272;
color: white;
width: 240px;
text-align: center;
padding: 15px 0px;
border-radius: 2px;
font-size: 13px;
font-weight: 700;
margin: 30px auto;
cursor: pointer;
}

code {
background: rgba(27,31,35,.05);
border-radius: 3px;
padding: .2em .4em;
}
199 changes: 199 additions & 0 deletions assignments/hw4/assets/css/wdd.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,199 @@
body {
margin: 0px;
font-family: 'Karla';
background: #f7f5f2;
padding: 60px;
}

a {
color: inherit;
text-decoration: none;
}

p:first-child {
font-style: italic;
}

p:nth-child(2) {
opacity: 0.8;
}

.img-scaled {
width: 100%;
}

.img-scaled-wh {
width: 100%;
height: 100%:
}

.clear {
clear: both;
}

* {
outline: none;
}

#data {
display: none;
}

.tag {
color: #6392c0;
}

.element {
color: #de6868;
}

#container {
width: 720px;
margin: 0px auto;
background: white;
box-shadow: 0px 0px 5px #edeae5;
border-radius: 2px;
position: relative;
padding: 30px 0px;
}
#header {
background: #78c272;
padding: 15px;
color: white;
width: 270px;
}
#header-caption-logo {
width: 20px;
float: left;
}
#header-caption-name {
float: left;
margin-left: 5px;
font-size: 12px;
font-weight: 700;
line-height: 15px;
}
#header-caption {
margin-bottom: 6px;
opacity: 0.6;
}
#header-title {
font-size: 18px;
font-weight: 300;
float: left;
}
#header-due {
float: left;
font-size: 18px;
font-weight: 300;
margin-left: 10px;
padding-left: 10px;
border-left: 2px solid rgba(255, 255, 255, 0.15);
}
.section {
margin: 30px 0px;
padding: 0px 30px;
}
#submission-header, .info-title {
text-align: left;
color: #78c272;
font-size: 24px;
font-weight: 700;
margin-bottom: 15px;
}
#submission-content, .info-content {
padding: 15px;
background: rgba(120, 194, 114, 0.1);
border-radius: 2px;
color: #4c5765;
}
.info-required {
font-size: 13px;
font-weight: 700;
opacity: 0.75;
margin-bottom: 10px;
}
.info-intro {
line-height: 24px;
font-size: 16px;
opacity: 0.75;
}
.info {
margin-bottom: 30px;
}
.info a {
font-weight: 700;
color: black;
opacity: 0.9;
}
.body-header {
font-size: 24px;
font-weight: 700;
color: #78c272;
margin-top: 36px;
}
.body p {
line-height: 24px;
}
.body img {
width: 100%;
}
.body a {
color: #78c272;
}
.body li {
line-height: 24px;
}
.body {
color: #4c5765;
}
.body .caption {
opacity: 0.6;
}
#submission {
padding: 0px 30px;
}
#submission-content p, #submission-content li {
line-height: 24px;
opacity: 0.75;
}

#announcement-heading {
text-align: right;
color: #de6868;
font-weight: 700;
font-size: 24px;
margin-bottom: 15px;
}
#announcement-content {
padding: 15px;
background: rgba(222, 104, 104, 0.1);
color: #4c5765;
font-size: 12px;
line-height: 24px;
border-radius: 2px;
}
.download {
background: #78c272;
color: white;
width: 240px;
text-align: center;
padding: 15px 0px;
border-radius: 2px;
font-size: 13px;
font-weight: 700;
margin: 30px auto;
cursor: pointer;
}
#announcement .link {
background: #de6868;
width: 320px;
font-size: 13px;
font-weight: 700;
color: white;
text-align: center;
padding: 15px 0px;
margin: 30px auto;
border-radius: 2px;
cursor: pointer;
}
Binary file added assignments/hw4/assets/hw4-starter.zip
Binary file not shown.
Binary file added assignments/hw4/assets/img/.DS_Store
Binary file not shown.
Binary file added assignments/hw4/assets/img/aligncontent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assignments/hw4/assets/img/almostdone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assignments/hw4/assets/img/bergere.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assignments/hw4/assets/img/cardtext.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assignments/hw4/assets/img/covered.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assignments/hw4/assets/img/gfonts1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assignments/hw4/assets/img/gfonts2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assignments/hw4/assets/img/gfonts3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assignments/hw4/assets/img/hovereffect.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assignments/hw4/assets/img/initial.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assignments/hw4/assets/img/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assignments/hw4/assets/img/origscreen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assignments/hw4/assets/img/positiondiagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assignments/hw4/assets/img/textpositioning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2b56700

Please sign in to comment.