Skip to content

Lab9 branch #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
muditk wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Lab9 branch #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af0d753
updating master
muditk Sep 8, 2016
046c36c
Add files via upload
muditk Oct 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added Assignment/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added Assignment/Homework_1 - HTML/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added Labs/.DS_Store
View file
Open in desktop
Binary file not shown.
Binary file added Labs/Lab3 - CSS/.DS_Store
View file
Open in desktop
Binary file not shown.
12 changes: 6 additions & 6 deletions Labs/Lab3 - CSS/CSS-in-class-grid-layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,27 +33,27 @@ <h3>In Other News</h3>

<div class="main-container">
<h3>Our Finest Felines</h3>
<div class="ib-grid-item-1">
<div class="ib-grid-item">
<img alt="Steve" src="https://pbs.twimg.com/profile_images/424484505915621376/EOwsjaMZ_400x400.png" alt="Felix the cat">
<p>Steve</p>
</div>
<div class="ib-grid-item-2">
<div class="ib-grid-item">
<img alt="Dr. Franklin" src="https://pbs.twimg.com/profile_images/447460759329460224/mt2UmwGG_400x400.jpeg">
<p>Dr. Franklin</p>
</div>
<div class="ib-grid-item-1">
<div class="ib-grid-item">
<img alt="Mr. Lickums" src="http://2.bp.blogspot.com/_ckBlasgNSzg/SkV9fcHlE6I/AAAAAAAAM6s/qoUNISk_YpQ/s400/Cat+Bowling.jpg">
<p>Mr. Lickums</p>
</div>
<div class="ib-grid-item-2">
<div class="ib-grid-item">
<img alt="Roxanne" src="http://www.our-happy-cat.com/images/cat-drinking-from-tap.jpg">
<p>Roxanne</p>
</div>
<div class="ib-grid-item-1">
<div class="ib-grid-item">
<img alt="Felix" src="http://www.portraits-online.com/uploads/1/3/5/2/13522906/2607694_orig.jpg">
<p>Felix</p>
</div>
<div class="ib-grid-item-2" id="last-cat">
<div class="ib-grid-item" id="last-cat">
<img alt="Bubbles" src="https://pbs.twimg.com/profile_images/616542814319415296/McCTpH_E.jpg">
<p>Bubbles</p>
</div>
Expand Down
31 changes: 29 additions & 2 deletions Labs/Lab3 - CSS/grid-style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ header, footer {

header {
display: inline-block;
background: LightCoral;
position: fixed;
top: 0px;
}

footer {
Expand All @@ -83,16 +86,26 @@ img {

h2 {
font-size: 1.5em;
font-family: "Calibri";
}

h3 {
font-size: 1.33em;
font-weight: bold;
font-weight: 500;
color: GoldenRod;
font-family: "Cambria";
padding: 20px;
}

a {
text-decoration: none;
text-decoration: underline;
font-family: "Helvetica";
}

p {
font-family: "Garamond";
font-size: 1.5em;
font-weight: 200;
}

#site-title {
Expand Down Expand Up @@ -124,21 +137,35 @@ a.nav-button:visited {
/*START HERE*/

.other-news-container {
padding-top: 50px;
float: left;
width: 25%;

}

.main-container {
padding-top: 50px;
float: left;
width: 75%;

}

.ib-grid-item {
display: inline-block;
width: 33%;
margin-bottom: 5%;

}

.ib-grid-item img {
max-width: 66.67%;
max-height: 66.67%

}

.other-news-item {
box-sizing: border-box;
padding: 0 10%;
margin-bottom: 10%;

}
Binary file added Labs/lab1/.DS_Store
View file
Open in desktop
Binary file not shown.
14 changes: 14 additions & 0 deletions Labs/lab1/area.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!DOCTYPE html>

<html>
<head>
<meta charset="UTF-8">
<title>Pokedex</title>
</head>

<body>
<img src = "/Users/satishkakkar/Downloads/assets/images/extra_credit/shrooms.jpg">
<a class="nav-button" href="/Users/satishkakkar/IOlab/IOLab/Labs/lab1/pokedex.html"> <button> BACK TO POKEDEX </button> </a>
<a class="nav-button" href="/Users/satishkakkar/IOlab/IOLab/Labs/lab1/map.html"> <button> MAP </button> </a>
</body>
</html>
17 changes: 17 additions & 0 deletions Labs/lab1/map.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>

<html>
<head>
<meta charset="UTF-8">
<title>Pokedex</title>
</head>

<body>
<img src = "/Users/satishkakkar/Downloads/assets/images/extra_credit/pallet_town.png">
<a class="nav-button" href="/Users/satishkakkar/IOlab/IOLab/Labs/lab1/pokedex.html"> <button> BACK TO POKEDEX </button> </a>
<a class="nav-button" href="/Users/satishkakkar/IOlab/IOLab/Labs/lab1/area.html"> <button> AREA </button> </a>
</body>
</html>



71 changes: 71 additions & 0 deletions Labs/lab1/pokedex.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<!DOCTYPE html>

<html>
<head>
<meta charset="UTF-8">
<title>Pokedex</title>
</head>

<body>
<header>
<nav id="navigation">
<a class="nav-button"> <button> Dropdown </button> </a>
<a class="nav-button"> <b> Pokedex </b> </a>
<img src = "/Users/satishkakkar/Downloads/assets/icons/pokeball_icon.png">
</nav>
</header>

<span>
<textarea rows="4" cols="50"> Search pokemon </textarea>
</span>

<div class = "pikachu" id = "i-choose-you">
<img src = "/Users/satishkakkar/Downloads/assets/images/pickahu.png" align = "left">
<h3> No. 001 Pikachu </h3>
<ul>
<li>Electric type</li>
<li>Gentle temperament</li>
<li>Grasslands</li>
</ul>
<section>
<p> Pikachu can be seen napping in bright sunglight. <br>
It has two red dots on its cheeks.<br>
By practicing HTML and CSS, Pikachu can learn confusion.<br>
Pikachu likes to steal computer chargers from sleeping college students.
</p>
</section>
</div>

<div class = "grid" id = "pokemon-master">
<article>
<table>
<tr>
<td><img src = "/Users/satishkakkar/Downloads/assets/images/abra.png"></td>
<td><img src = "/Users/satishkakkar/Downloads/assets/images/charmander.png"></td>
<td><img src = "/Users/satishkakkar/Downloads/assets/images/charmeleon.png"></td>
<td><img src = "/Users/satishkakkar/Downloads/assets/images/clafary.png"></td>
<td><img src = "/Users/satishkakkar/Downloads/assets/images/firething.png"></td>
<td><img src = "/Users/satishkakkar/Downloads/assets/images/horsea.png"></td>
</tr>
<tr>
<td><img src = "/Users/satishkakkar/Downloads/assets/images/jigglyppuff.png"></td>
<td><img src = "/Users/satishkakkar/Downloads/assets/images/nidorino.png"></td>
<td><img src = "/Users/satishkakkar/Downloads/assets/images/pidgey.png"></td>
<td><img src = "/Users/satishkakkar/Downloads/assets/images/vulpix.png"></td>
<td><img src = "/Users/satishkakkar/Downloads/assets/images/wartortle.png"></td>
<td><img src = "/Users/satishkakkar/Downloads/assets/images/whatisthat.png"></td>
</tr>
</table>
</article>
</div>

<footer>
<a class="nav-button" href="#i-choose-you"> <button> BACK </button> </a>
<a class="nav-button" href="/Users/satishkakkar/IOlab/IOLab/Labs/lab1/map.html"> <button> MAP </button> </a>
<a class="nav-button" href="/Users/satishkakkar/IOlab/IOLab/Labs/lab1/area.html"> <button> AREA </button> </a>
<a class="nav-button" href="#pokemon-master"> <button> NEXT </button> </a>
<span><br> <center>&copy; Pokedex 2016. All pokemon reserved.</center></span>
</footer>

</body>
</html>
Binary file added flaskLab2submission.zip
View file
Open in desktop
Binary file not shown.