From 1107785e2569abd496557706a4b6392f80435400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98sgvolkov=E2=80=99?= Date: Tue, 13 Sep 2016 13:36:32 -0700 Subject: [PATCH 1/9] "updating my files for hw 2" --- Labs/Lab 4 - Responsive Design/index.html | 2 +- Labs/Lab 4 - Responsive Design/main.css | 38 ++++++++++++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/Labs/Lab 4 - Responsive Design/index.html b/Labs/Lab 4 - Responsive Design/index.html index a46bb7c..ed25de5 100644 --- a/Labs/Lab 4 - Responsive Design/index.html +++ b/Labs/Lab 4 - Responsive Design/index.html @@ -16,7 +16,7 @@
-

Disney gone Kareoke

+

Disney gone Karaoke

- +

+ Pikachu + + + + \ No newline at end of file diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css new file mode 100644 index 0000000..3c0853e --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css @@ -0,0 +1,188 @@ +/*----------------- CSS RESET ------------------*/ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font-family: Futura, "Trebuchet MS", Arial, sans-serif; + vertical-align: baseline; + + } + +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} + +header{ + margin: 0; +} +.pikachu{ + float: left; + padding: 40px; + width: 100%; +} + +.pikachu_deets{ + display: inline-block; +} +.No-1-Pikachu{ + display: inline-block; +} + +table{ + border: 1px solid black; + color: black; + font-size: 18px; + background-color: white; + width: 70%; + margin: 40px; + float: right; +} + +td{ + padding: 7px; +} + +th{ + border: 1px solid black; + font-size: 25px; + padding: 10px; + color: white; + background-color: steelblue; + text-align: left; +} + +tbody{ + text-indent: 40px; +} + +.Content-Box{ + border: 6px solid lightcoral; + border-radius: 12px; + width: 90%; + display: inline-block; + text-align: center; + background-color: white; + padding: 25px; + font-size: 120% +} + +#pokedex{ + width: 100%; + display: inline-block; + +} + +.pokedex-images img{ + border: 3px solid darkgrey; + max-width: 15%; + margin: 0px; + width: 100%; +} + +button{ + display: block; + color: darkgrey; + border-radius: 12px; + border: 1px solid; + font-size: 1em; + padding: 5px 7px; + margin: 10px; + background-color:ghostwhite; + width: 100px; + height: 35px; + padding-top:3px; + padding-bottom: 3px; + position: relative; +} + +a{ + text-decoration: none; +} + +.navigation{ + width: 100%; + border: 1px solid #333; + background-color: lightcoral; + +} + + +.nagivation img[src="assets/icons/pokeball_icon.png"] { + float: right; + max-width: 25%; +} + +.No-1-Pikachu img[src="assets/images/pickahu.png"] { + max-width: 15%; + float: left; +} + + +#site-title{ + font-family: verdana; + font-size: 200%; + color: white; + text-align: center; +} + +#search{ + width:100%; + height:40px; + background:white; + border: 1px solid darkgrey; + font-size: 125%; + color: darkgrey; + vertical-align: bottom; +} + + +body { + line-height: 1; + margin: 3%; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} + +table { + border-collapse: collapse; + border-spacing: 0; +} + +#footer{ + width: 100%; + height: 100px; + border: 2px solid darkgrey; + background-color: cornflowerblue; + font-size: 110%; + display: inline-block; + +} + +/*----------------- CSS RESET ------------------*/ + +/*Your main CSS should go here*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/map.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/map.html new file mode 100644 index 0000000..6c50336 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/map.html @@ -0,0 +1,26 @@ + + + + + + + THIS IS A MAP (BUT THERE'S NO MAP HERE) + + + +
+

THIS IS A MAP (BUT THERE'S NO MAP HERE)

+ +
+ +
+
+ Homepage! + Area + + Pikachu +
+
+ + From 1909243687984cc24516ebdd34d65ede43615b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98sgvolkov=E2=80=99?= Date: Tue, 13 Sep 2016 18:53:40 -0700 Subject: [PATCH 6/9] hate --- .../Sasha-Pokedex .html | 16 +-- .../main.css | 106 ++++++++++++------ Labs/Lab 4 - Responsive Design/medium.css | 82 ++++++++++++++ Labs/Lab_5-Javascript_Basics/js-basics.js | 33 ++++++ 4 files changed, 194 insertions(+), 43 deletions(-) diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/Sasha-Pokedex .html b/Assignment/Homework_2 - CSS_ResponsiveDesign/Sasha-Pokedex .html index 1c8c087..3222864 100644 --- a/Assignment/Homework_2 - CSS_ResponsiveDesign/Sasha-Pokedex .html +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/Sasha-Pokedex .html @@ -3,10 +3,10 @@ - + + - Pokedex @@ -14,11 +14,11 @@

Pokedex

- Pokeball +
Pokeball
- +