From 8b75a0b743184f5dc762a9482ac5367979455fd7 Mon Sep 17 00:00:00 2001 From: sberthely Date: Tue, 13 Sep 2016 13:40:38 -0700 Subject: [PATCH 01/11] Changes submitted-Changes not staged for commit --- .../Homework_1 - HTML/myFirstPage_V1.html | 108 +++++++++ .../main.css | 131 +++++++++++ .../medium.css | 1 + .../myFirstPage-Good.html | 208 ++++++++++++++++++ .../myFirstPage.html | 86 ++++++++ .../small.css | 1 + .../~$structions HW2 Responsive_Design.docx | Bin 162 -> 0 bytes 7 files changed, 535 insertions(+) create mode 100755 Assignment/Homework_1 - HTML/myFirstPage_V1.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/main.css create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/small.css delete mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx diff --git a/Assignment/Homework_1 - HTML/myFirstPage_V1.html b/Assignment/Homework_1 - HTML/myFirstPage_V1.html new file mode 100755 index 0000000..0dd2455 --- /dev/null +++ b/Assignment/Homework_1 - HTML/myFirstPage_V1.html @@ -0,0 +1,108 @@ + + + + My First Page + + + +
+

+

Pokedex

+

+
+ + +
+ +
+ +
+ +
+

No. 001 Pickahu

+
    +

    Electric type

    +

    Gentle Temperment

    +

    Grasslands

    +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots + on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + +
+ + + +
+ + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css new file mode 100644 index 0000000..1caae53 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css @@ -0,0 +1,131 @@ +/*----------------- CSS RESET ------------------*/ +body{ + width: 900px; + height: 1200px; + margin: 0 auto; + background-image: url("assets/backgrounds/background_home.png"); + background-repeat: no-repeat; + background-size:900px; + background-position: center +} + +div.container { + width: 100%; + border: 1px solid gray; +} + +/* +a.button { + -webkit-appearance: button; + -moz-appearance: button; + appearance: button; + text-decoration: none; + color: initial; + display: inline-block; + height: 50%; + border: 3px solid black; + box-sizing: content-box; +} + */ +button { + display: inline-block; + height: 30px; + width: 100px; +/* border: 2px solid black; */ +/* box-sizing: content-box; */ + border-radius: 10px; +} + +header { + color: white; + background-color: #BE5959; + font-family: calibri; + display: flex; + justify-content: space-around; +} + +h2 { + color: white; + background-color: #5C90CC; + margin-top: 0; + text-align: center; +} + +.search_text{ + margin-top: 20px; + margin-left: 20px; + margin-right: 20px; + margin-bottom: 20px; + font-family: calibri; +} + +#inputSearchText{ + width: 100%; + height: 100%; + font-size: 40px; + padding-left: 20px; +} + +ul{ + list-style-type:none; +} + +nav { + background-color: #5C90CC; + width: 100%; + height: 5%; + float: center; +} + +.pok_insights { + margin: auto; + width: 94%; + border: 2px solid #646262; + padding: 0; + text-align: left; + font-family: calibri; + background-color: white; + +} + + +.pok_descript { +/* height: 100px; */ + margin: auto; + width: 90%; + border: 8px solid #BE5959; + border-radius: 20px 20px 20px 20px; + text-align: center; + font-family: calibri; + background-color: white; + +} + +#lblPokedex{ + alignment-adjust:central; +} + +.grid{ + border: 2px solid black; +} + + +ul#main_menu li{ +display: inline-block; +background-color: red; +border: 5px solid; +list-style: none; +padding: 3px; +border-radius: 5px 5px; +} + + +/** flex stuff **/ +.grid-parent{ + display: flex; + flex-wrap: wrap; +} + +.grid{ + width: 16% +} diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css new file mode 100644 index 0000000..e0fe361 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css @@ -0,0 +1 @@ +/*Your tablet targeted CSS should go in this file*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html new file mode 100755 index 0000000..4ac2e12 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html @@ -0,0 +1,208 @@ + + + + My First Page + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+
EmptyEmptyEmptyEmptyEmptyEmpty
EmptyEmptyEmptyEmptyEmptyEmpty
+ + + + + + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html new file mode 100755 index 0000000..41cccee --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html @@ -0,0 +1,86 @@ + + + + + + Pokedex displays + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ + +
+ +
+ + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion.

+

Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + + +
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+ +
+ + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css new file mode 100644 index 0000000..06fa3d9 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css @@ -0,0 +1 @@ +/*Your mobile targeted css should go here*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx b/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx deleted file mode 100644 index 37240c44e0d81bf1d9b2bc8fa4d7f56be2581eba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmd;ePAtmFSMbR!EX_>GXCM;rGB`6NG88f7Fyu2RF!(TJG88hD0?8C09|RmeUT6Vf zkNCg)4c1Jb#-bCs7=$%|a#!B!Fg=L)yT3RyJx|{=uehYBG`S=*Kd)HT$bb=@#Cno>^ From c833adf2db7feeab2024a5f59eb6ddb77526ab0e Mon Sep 17 00:00:00 2001 From: sberthely Date: Tue, 13 Sep 2016 13:40:38 -0700 Subject: [PATCH 02/11] Changes submitted-Changes not staged for commit --- .../Homework_1 - HTML/myFirstPage_V1.html | 108 +++++++++ .../main.css | 131 +++++++++++ .../medium.css | 1 + .../myFirstPage-Good.html | 208 ++++++++++++++++++ .../myFirstPage.html | 86 ++++++++ .../small.css | 1 + .../~$structions HW2 Responsive_Design.docx | Bin 162 -> 0 bytes 7 files changed, 535 insertions(+) create mode 100755 Assignment/Homework_1 - HTML/myFirstPage_V1.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/main.css create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/small.css delete mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx diff --git a/Assignment/Homework_1 - HTML/myFirstPage_V1.html b/Assignment/Homework_1 - HTML/myFirstPage_V1.html new file mode 100755 index 0000000..0dd2455 --- /dev/null +++ b/Assignment/Homework_1 - HTML/myFirstPage_V1.html @@ -0,0 +1,108 @@ + + + + My First Page + + + +
+

+

Pokedex

+

+
+ + +
+ +
+ +
+ +
+

No. 001 Pickahu

+
    +

    Electric type

    +

    Gentle Temperment

    +

    Grasslands

    +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots + on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + +
+ + + +
+ + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css new file mode 100644 index 0000000..1caae53 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css @@ -0,0 +1,131 @@ +/*----------------- CSS RESET ------------------*/ +body{ + width: 900px; + height: 1200px; + margin: 0 auto; + background-image: url("assets/backgrounds/background_home.png"); + background-repeat: no-repeat; + background-size:900px; + background-position: center +} + +div.container { + width: 100%; + border: 1px solid gray; +} + +/* +a.button { + -webkit-appearance: button; + -moz-appearance: button; + appearance: button; + text-decoration: none; + color: initial; + display: inline-block; + height: 50%; + border: 3px solid black; + box-sizing: content-box; +} + */ +button { + display: inline-block; + height: 30px; + width: 100px; +/* border: 2px solid black; */ +/* box-sizing: content-box; */ + border-radius: 10px; +} + +header { + color: white; + background-color: #BE5959; + font-family: calibri; + display: flex; + justify-content: space-around; +} + +h2 { + color: white; + background-color: #5C90CC; + margin-top: 0; + text-align: center; +} + +.search_text{ + margin-top: 20px; + margin-left: 20px; + margin-right: 20px; + margin-bottom: 20px; + font-family: calibri; +} + +#inputSearchText{ + width: 100%; + height: 100%; + font-size: 40px; + padding-left: 20px; +} + +ul{ + list-style-type:none; +} + +nav { + background-color: #5C90CC; + width: 100%; + height: 5%; + float: center; +} + +.pok_insights { + margin: auto; + width: 94%; + border: 2px solid #646262; + padding: 0; + text-align: left; + font-family: calibri; + background-color: white; + +} + + +.pok_descript { +/* height: 100px; */ + margin: auto; + width: 90%; + border: 8px solid #BE5959; + border-radius: 20px 20px 20px 20px; + text-align: center; + font-family: calibri; + background-color: white; + +} + +#lblPokedex{ + alignment-adjust:central; +} + +.grid{ + border: 2px solid black; +} + + +ul#main_menu li{ +display: inline-block; +background-color: red; +border: 5px solid; +list-style: none; +padding: 3px; +border-radius: 5px 5px; +} + + +/** flex stuff **/ +.grid-parent{ + display: flex; + flex-wrap: wrap; +} + +.grid{ + width: 16% +} diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css new file mode 100644 index 0000000..e0fe361 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css @@ -0,0 +1 @@ +/*Your tablet targeted CSS should go in this file*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html new file mode 100755 index 0000000..4ac2e12 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html @@ -0,0 +1,208 @@ + + + + My First Page + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+
EmptyEmptyEmptyEmptyEmptyEmpty
EmptyEmptyEmptyEmptyEmptyEmpty
+ + + + + + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html new file mode 100755 index 0000000..41cccee --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html @@ -0,0 +1,86 @@ + + + + + + Pokedex displays + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ + +
+ +
+ + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion.

+

Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + + +
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+ +
+ + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css new file mode 100644 index 0000000..06fa3d9 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css @@ -0,0 +1 @@ +/*Your mobile targeted css should go here*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx b/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx deleted file mode 100644 index 37240c44e0d81bf1d9b2bc8fa4d7f56be2581eba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmd;ePAtmFSMbR!EX_>GXCM;rGB`6NG88f7Fyu2RF!(TJG88hD0?8C09|RmeUT6Vf zkNCg)4c1Jb#-bCs7=$%|a#!B!Fg=L)yT3RyJx|{=uehYBG`S=*Kd)HT$bb=@#Cno>^ From b58b7cafe7c2dae9c778e93547124d3c6590904c Mon Sep 17 00:00:00 2001 From: sberthely Date: Tue, 13 Sep 2016 13:40:38 -0700 Subject: [PATCH 03/11] Changes submitted-Changes not staged for commit --- .../Homework_1 - HTML/myFirstPage_V1.html | 108 +++++++++ .../main.css | 131 +++++++++++ .../medium.css | 1 + .../myFirstPage-Good.html | 208 ++++++++++++++++++ .../myFirstPage.html | 86 ++++++++ .../small.css | 1 + .../~$structions HW2 Responsive_Design.docx | Bin 162 -> 0 bytes 7 files changed, 535 insertions(+) create mode 100755 Assignment/Homework_1 - HTML/myFirstPage_V1.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/main.css create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/small.css delete mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx diff --git a/Assignment/Homework_1 - HTML/myFirstPage_V1.html b/Assignment/Homework_1 - HTML/myFirstPage_V1.html new file mode 100755 index 0000000..0dd2455 --- /dev/null +++ b/Assignment/Homework_1 - HTML/myFirstPage_V1.html @@ -0,0 +1,108 @@ + + + + My First Page + + + +
+

+

Pokedex

+

+
+ + +
+ +
+ +
+ +
+

No. 001 Pickahu

+
    +

    Electric type

    +

    Gentle Temperment

    +

    Grasslands

    +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots + on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + +
+ + + +
+ + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css new file mode 100644 index 0000000..1caae53 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css @@ -0,0 +1,131 @@ +/*----------------- CSS RESET ------------------*/ +body{ + width: 900px; + height: 1200px; + margin: 0 auto; + background-image: url("assets/backgrounds/background_home.png"); + background-repeat: no-repeat; + background-size:900px; + background-position: center +} + +div.container { + width: 100%; + border: 1px solid gray; +} + +/* +a.button { + -webkit-appearance: button; + -moz-appearance: button; + appearance: button; + text-decoration: none; + color: initial; + display: inline-block; + height: 50%; + border: 3px solid black; + box-sizing: content-box; +} + */ +button { + display: inline-block; + height: 30px; + width: 100px; +/* border: 2px solid black; */ +/* box-sizing: content-box; */ + border-radius: 10px; +} + +header { + color: white; + background-color: #BE5959; + font-family: calibri; + display: flex; + justify-content: space-around; +} + +h2 { + color: white; + background-color: #5C90CC; + margin-top: 0; + text-align: center; +} + +.search_text{ + margin-top: 20px; + margin-left: 20px; + margin-right: 20px; + margin-bottom: 20px; + font-family: calibri; +} + +#inputSearchText{ + width: 100%; + height: 100%; + font-size: 40px; + padding-left: 20px; +} + +ul{ + list-style-type:none; +} + +nav { + background-color: #5C90CC; + width: 100%; + height: 5%; + float: center; +} + +.pok_insights { + margin: auto; + width: 94%; + border: 2px solid #646262; + padding: 0; + text-align: left; + font-family: calibri; + background-color: white; + +} + + +.pok_descript { +/* height: 100px; */ + margin: auto; + width: 90%; + border: 8px solid #BE5959; + border-radius: 20px 20px 20px 20px; + text-align: center; + font-family: calibri; + background-color: white; + +} + +#lblPokedex{ + alignment-adjust:central; +} + +.grid{ + border: 2px solid black; +} + + +ul#main_menu li{ +display: inline-block; +background-color: red; +border: 5px solid; +list-style: none; +padding: 3px; +border-radius: 5px 5px; +} + + +/** flex stuff **/ +.grid-parent{ + display: flex; + flex-wrap: wrap; +} + +.grid{ + width: 16% +} diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css new file mode 100644 index 0000000..e0fe361 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css @@ -0,0 +1 @@ +/*Your tablet targeted CSS should go in this file*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html new file mode 100755 index 0000000..4ac2e12 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html @@ -0,0 +1,208 @@ + + + + My First Page + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+
EmptyEmptyEmptyEmptyEmptyEmpty
EmptyEmptyEmptyEmptyEmptyEmpty
+ + + + + + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html new file mode 100755 index 0000000..41cccee --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html @@ -0,0 +1,86 @@ + + + + + + Pokedex displays + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ + +
+ +
+ + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion.

+

Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + + +
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+ +
+ + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css new file mode 100644 index 0000000..06fa3d9 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css @@ -0,0 +1 @@ +/*Your mobile targeted css should go here*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx b/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx deleted file mode 100644 index 37240c44e0d81bf1d9b2bc8fa4d7f56be2581eba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmd;ePAtmFSMbR!EX_>GXCM;rGB`6NG88f7Fyu2RF!(TJG88hD0?8C09|RmeUT6Vf zkNCg)4c1Jb#-bCs7=$%|a#!B!Fg=L)yT3RyJx|{=uehYBG`S=*Kd)HT$bb=@#Cno>^ From 902e84a00fe3c2c43584453c241edb99ad487a76 Mon Sep 17 00:00:00 2001 From: sberthely Date: Tue, 13 Sep 2016 13:40:38 -0700 Subject: [PATCH 04/11] Changes submitted-Changes not staged for commit --- .../Homework_1 - HTML/myFirstPage_V1.html | 108 +++++++++ .../main.css | 131 +++++++++++ .../medium.css | 1 + .../myFirstPage-Good.html | 208 ++++++++++++++++++ .../myFirstPage.html | 86 ++++++++ .../small.css | 1 + .../~$structions HW2 Responsive_Design.docx | Bin 162 -> 0 bytes 7 files changed, 535 insertions(+) create mode 100755 Assignment/Homework_1 - HTML/myFirstPage_V1.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/main.css create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/small.css delete mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx diff --git a/Assignment/Homework_1 - HTML/myFirstPage_V1.html b/Assignment/Homework_1 - HTML/myFirstPage_V1.html new file mode 100755 index 0000000..0dd2455 --- /dev/null +++ b/Assignment/Homework_1 - HTML/myFirstPage_V1.html @@ -0,0 +1,108 @@ + + + + My First Page + + + +
+

+

Pokedex

+

+
+ + +
+ +
+ +
+ +
+

No. 001 Pickahu

+
    +

    Electric type

    +

    Gentle Temperment

    +

    Grasslands

    +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots + on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + +
+ + + +
+ + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css new file mode 100644 index 0000000..1caae53 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css @@ -0,0 +1,131 @@ +/*----------------- CSS RESET ------------------*/ +body{ + width: 900px; + height: 1200px; + margin: 0 auto; + background-image: url("assets/backgrounds/background_home.png"); + background-repeat: no-repeat; + background-size:900px; + background-position: center +} + +div.container { + width: 100%; + border: 1px solid gray; +} + +/* +a.button { + -webkit-appearance: button; + -moz-appearance: button; + appearance: button; + text-decoration: none; + color: initial; + display: inline-block; + height: 50%; + border: 3px solid black; + box-sizing: content-box; +} + */ +button { + display: inline-block; + height: 30px; + width: 100px; +/* border: 2px solid black; */ +/* box-sizing: content-box; */ + border-radius: 10px; +} + +header { + color: white; + background-color: #BE5959; + font-family: calibri; + display: flex; + justify-content: space-around; +} + +h2 { + color: white; + background-color: #5C90CC; + margin-top: 0; + text-align: center; +} + +.search_text{ + margin-top: 20px; + margin-left: 20px; + margin-right: 20px; + margin-bottom: 20px; + font-family: calibri; +} + +#inputSearchText{ + width: 100%; + height: 100%; + font-size: 40px; + padding-left: 20px; +} + +ul{ + list-style-type:none; +} + +nav { + background-color: #5C90CC; + width: 100%; + height: 5%; + float: center; +} + +.pok_insights { + margin: auto; + width: 94%; + border: 2px solid #646262; + padding: 0; + text-align: left; + font-family: calibri; + background-color: white; + +} + + +.pok_descript { +/* height: 100px; */ + margin: auto; + width: 90%; + border: 8px solid #BE5959; + border-radius: 20px 20px 20px 20px; + text-align: center; + font-family: calibri; + background-color: white; + +} + +#lblPokedex{ + alignment-adjust:central; +} + +.grid{ + border: 2px solid black; +} + + +ul#main_menu li{ +display: inline-block; +background-color: red; +border: 5px solid; +list-style: none; +padding: 3px; +border-radius: 5px 5px; +} + + +/** flex stuff **/ +.grid-parent{ + display: flex; + flex-wrap: wrap; +} + +.grid{ + width: 16% +} diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css new file mode 100644 index 0000000..e0fe361 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css @@ -0,0 +1 @@ +/*Your tablet targeted CSS should go in this file*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html new file mode 100755 index 0000000..4ac2e12 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html @@ -0,0 +1,208 @@ + + + + My First Page + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+
EmptyEmptyEmptyEmptyEmptyEmpty
EmptyEmptyEmptyEmptyEmptyEmpty
+ + + + + + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html new file mode 100755 index 0000000..41cccee --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html @@ -0,0 +1,86 @@ + + + + + + Pokedex displays + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ + +
+ +
+ + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion.

+

Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + + +
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+ +
+ + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css new file mode 100644 index 0000000..06fa3d9 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css @@ -0,0 +1 @@ +/*Your mobile targeted css should go here*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx b/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx deleted file mode 100644 index 37240c44e0d81bf1d9b2bc8fa4d7f56be2581eba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmd;ePAtmFSMbR!EX_>GXCM;rGB`6NG88f7Fyu2RF!(TJG88hD0?8C09|RmeUT6Vf zkNCg)4c1Jb#-bCs7=$%|a#!B!Fg=L)yT3RyJx|{=uehYBG`S=*Kd)HT$bb=@#Cno>^ From 3bdbf45f5afbd30ffdb2134c8b809ff7c30081d1 Mon Sep 17 00:00:00 2001 From: sberthely Date: Tue, 13 Sep 2016 13:40:38 -0700 Subject: [PATCH 05/11] Changes submitted-Changes not staged for commit --- .../Homework_1 - HTML/myFirstPage_V1.html | 108 +++++++++ .../main.css | 131 +++++++++++ .../medium.css | 1 + .../myFirstPage-Good.html | 208 ++++++++++++++++++ .../myFirstPage.html | 86 ++++++++ .../small.css | 1 + .../~$structions HW2 Responsive_Design.docx | Bin 162 -> 0 bytes 7 files changed, 535 insertions(+) create mode 100755 Assignment/Homework_1 - HTML/myFirstPage_V1.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/main.css create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/small.css delete mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx diff --git a/Assignment/Homework_1 - HTML/myFirstPage_V1.html b/Assignment/Homework_1 - HTML/myFirstPage_V1.html new file mode 100755 index 0000000..0dd2455 --- /dev/null +++ b/Assignment/Homework_1 - HTML/myFirstPage_V1.html @@ -0,0 +1,108 @@ + + + + My First Page + + + +
+

+

Pokedex

+

+
+ + +
+ +
+ +
+ +
+

No. 001 Pickahu

+
    +

    Electric type

    +

    Gentle Temperment

    +

    Grasslands

    +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots + on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + +
+ + + +
+ + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css new file mode 100644 index 0000000..1caae53 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css @@ -0,0 +1,131 @@ +/*----------------- CSS RESET ------------------*/ +body{ + width: 900px; + height: 1200px; + margin: 0 auto; + background-image: url("assets/backgrounds/background_home.png"); + background-repeat: no-repeat; + background-size:900px; + background-position: center +} + +div.container { + width: 100%; + border: 1px solid gray; +} + +/* +a.button { + -webkit-appearance: button; + -moz-appearance: button; + appearance: button; + text-decoration: none; + color: initial; + display: inline-block; + height: 50%; + border: 3px solid black; + box-sizing: content-box; +} + */ +button { + display: inline-block; + height: 30px; + width: 100px; +/* border: 2px solid black; */ +/* box-sizing: content-box; */ + border-radius: 10px; +} + +header { + color: white; + background-color: #BE5959; + font-family: calibri; + display: flex; + justify-content: space-around; +} + +h2 { + color: white; + background-color: #5C90CC; + margin-top: 0; + text-align: center; +} + +.search_text{ + margin-top: 20px; + margin-left: 20px; + margin-right: 20px; + margin-bottom: 20px; + font-family: calibri; +} + +#inputSearchText{ + width: 100%; + height: 100%; + font-size: 40px; + padding-left: 20px; +} + +ul{ + list-style-type:none; +} + +nav { + background-color: #5C90CC; + width: 100%; + height: 5%; + float: center; +} + +.pok_insights { + margin: auto; + width: 94%; + border: 2px solid #646262; + padding: 0; + text-align: left; + font-family: calibri; + background-color: white; + +} + + +.pok_descript { +/* height: 100px; */ + margin: auto; + width: 90%; + border: 8px solid #BE5959; + border-radius: 20px 20px 20px 20px; + text-align: center; + font-family: calibri; + background-color: white; + +} + +#lblPokedex{ + alignment-adjust:central; +} + +.grid{ + border: 2px solid black; +} + + +ul#main_menu li{ +display: inline-block; +background-color: red; +border: 5px solid; +list-style: none; +padding: 3px; +border-radius: 5px 5px; +} + + +/** flex stuff **/ +.grid-parent{ + display: flex; + flex-wrap: wrap; +} + +.grid{ + width: 16% +} diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css new file mode 100644 index 0000000..e0fe361 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css @@ -0,0 +1 @@ +/*Your tablet targeted CSS should go in this file*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html new file mode 100755 index 0000000..4ac2e12 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html @@ -0,0 +1,208 @@ + + + + My First Page + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+
EmptyEmptyEmptyEmptyEmptyEmpty
EmptyEmptyEmptyEmptyEmptyEmpty
+ + + + + + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html new file mode 100755 index 0000000..41cccee --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html @@ -0,0 +1,86 @@ + + + + + + Pokedex displays + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ + +
+ +
+ + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion.

+

Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + + +
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+ +
+ + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css new file mode 100644 index 0000000..06fa3d9 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css @@ -0,0 +1 @@ +/*Your mobile targeted css should go here*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx b/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx deleted file mode 100644 index 37240c44e0d81bf1d9b2bc8fa4d7f56be2581eba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmd;ePAtmFSMbR!EX_>GXCM;rGB`6NG88f7Fyu2RF!(TJG88hD0?8C09|RmeUT6Vf zkNCg)4c1Jb#-bCs7=$%|a#!B!Fg=L)yT3RyJx|{=uehYBG`S=*Kd)HT$bb=@#Cno>^ From 9b680ab4e26f643dc198fd2d309e7d1c6a8bd1fb Mon Sep 17 00:00:00 2001 From: sberthely Date: Tue, 13 Sep 2016 13:40:38 -0700 Subject: [PATCH 06/11] Changes submitted-Changes not staged for commit --- .../Homework_1 - HTML/myFirstPage_V1.html | 108 +++++++++ .../main.css | 131 +++++++++++ .../medium.css | 1 + .../myFirstPage-Good.html | 208 ++++++++++++++++++ .../myFirstPage.html | 86 ++++++++ .../small.css | 1 + .../~$structions HW2 Responsive_Design.docx | Bin 162 -> 0 bytes 7 files changed, 535 insertions(+) create mode 100755 Assignment/Homework_1 - HTML/myFirstPage_V1.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/main.css create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/small.css delete mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx diff --git a/Assignment/Homework_1 - HTML/myFirstPage_V1.html b/Assignment/Homework_1 - HTML/myFirstPage_V1.html new file mode 100755 index 0000000..0dd2455 --- /dev/null +++ b/Assignment/Homework_1 - HTML/myFirstPage_V1.html @@ -0,0 +1,108 @@ + + + + My First Page + + + +
+

+

Pokedex

+

+
+ + +
+ +
+ +
+ +
+

No. 001 Pickahu

+
    +

    Electric type

    +

    Gentle Temperment

    +

    Grasslands

    +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots + on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + +
+ + + +
+ + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css new file mode 100644 index 0000000..1caae53 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css @@ -0,0 +1,131 @@ +/*----------------- CSS RESET ------------------*/ +body{ + width: 900px; + height: 1200px; + margin: 0 auto; + background-image: url("assets/backgrounds/background_home.png"); + background-repeat: no-repeat; + background-size:900px; + background-position: center +} + +div.container { + width: 100%; + border: 1px solid gray; +} + +/* +a.button { + -webkit-appearance: button; + -moz-appearance: button; + appearance: button; + text-decoration: none; + color: initial; + display: inline-block; + height: 50%; + border: 3px solid black; + box-sizing: content-box; +} + */ +button { + display: inline-block; + height: 30px; + width: 100px; +/* border: 2px solid black; */ +/* box-sizing: content-box; */ + border-radius: 10px; +} + +header { + color: white; + background-color: #BE5959; + font-family: calibri; + display: flex; + justify-content: space-around; +} + +h2 { + color: white; + background-color: #5C90CC; + margin-top: 0; + text-align: center; +} + +.search_text{ + margin-top: 20px; + margin-left: 20px; + margin-right: 20px; + margin-bottom: 20px; + font-family: calibri; +} + +#inputSearchText{ + width: 100%; + height: 100%; + font-size: 40px; + padding-left: 20px; +} + +ul{ + list-style-type:none; +} + +nav { + background-color: #5C90CC; + width: 100%; + height: 5%; + float: center; +} + +.pok_insights { + margin: auto; + width: 94%; + border: 2px solid #646262; + padding: 0; + text-align: left; + font-family: calibri; + background-color: white; + +} + + +.pok_descript { +/* height: 100px; */ + margin: auto; + width: 90%; + border: 8px solid #BE5959; + border-radius: 20px 20px 20px 20px; + text-align: center; + font-family: calibri; + background-color: white; + +} + +#lblPokedex{ + alignment-adjust:central; +} + +.grid{ + border: 2px solid black; +} + + +ul#main_menu li{ +display: inline-block; +background-color: red; +border: 5px solid; +list-style: none; +padding: 3px; +border-radius: 5px 5px; +} + + +/** flex stuff **/ +.grid-parent{ + display: flex; + flex-wrap: wrap; +} + +.grid{ + width: 16% +} diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css new file mode 100644 index 0000000..e0fe361 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css @@ -0,0 +1 @@ +/*Your tablet targeted CSS should go in this file*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html new file mode 100755 index 0000000..4ac2e12 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html @@ -0,0 +1,208 @@ + + + + My First Page + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+
EmptyEmptyEmptyEmptyEmptyEmpty
EmptyEmptyEmptyEmptyEmptyEmpty
+ + + + + + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html new file mode 100755 index 0000000..41cccee --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html @@ -0,0 +1,86 @@ + + + + + + Pokedex displays + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ + +
+ +
+ + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion.

+

Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + + +
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+ +
+ + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css new file mode 100644 index 0000000..06fa3d9 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css @@ -0,0 +1 @@ +/*Your mobile targeted css should go here*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx b/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx deleted file mode 100644 index 37240c44e0d81bf1d9b2bc8fa4d7f56be2581eba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmd;ePAtmFSMbR!EX_>GXCM;rGB`6NG88f7Fyu2RF!(TJG88hD0?8C09|RmeUT6Vf zkNCg)4c1Jb#-bCs7=$%|a#!B!Fg=L)yT3RyJx|{=uehYBG`S=*Kd)HT$bb=@#Cno>^ From 4ebd3e033e589a4cee76ac8412d53774a9e52937 Mon Sep 17 00:00:00 2001 From: sberthely Date: Tue, 13 Sep 2016 13:40:38 -0700 Subject: [PATCH 07/11] Changes submitted-Changes not staged for commit --- .../Homework_1 - HTML/myFirstPage_V1.html | 108 +++++++++ .../main.css | 131 +++++++++++ .../medium.css | 1 + .../myFirstPage-Good.html | 208 ++++++++++++++++++ .../myFirstPage.html | 86 ++++++++ .../small.css | 1 + .../~$structions HW2 Responsive_Design.docx | Bin 162 -> 0 bytes 7 files changed, 535 insertions(+) create mode 100755 Assignment/Homework_1 - HTML/myFirstPage_V1.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/main.css create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/small.css delete mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx diff --git a/Assignment/Homework_1 - HTML/myFirstPage_V1.html b/Assignment/Homework_1 - HTML/myFirstPage_V1.html new file mode 100755 index 0000000..0dd2455 --- /dev/null +++ b/Assignment/Homework_1 - HTML/myFirstPage_V1.html @@ -0,0 +1,108 @@ + + + + My First Page + + + +
+

+

Pokedex

+

+
+ + +
+ +
+ +
+ +
+

No. 001 Pickahu

+
    +

    Electric type

    +

    Gentle Temperment

    +

    Grasslands

    +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots + on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + +
+ + + +
+ + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css new file mode 100644 index 0000000..1caae53 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css @@ -0,0 +1,131 @@ +/*----------------- CSS RESET ------------------*/ +body{ + width: 900px; + height: 1200px; + margin: 0 auto; + background-image: url("assets/backgrounds/background_home.png"); + background-repeat: no-repeat; + background-size:900px; + background-position: center +} + +div.container { + width: 100%; + border: 1px solid gray; +} + +/* +a.button { + -webkit-appearance: button; + -moz-appearance: button; + appearance: button; + text-decoration: none; + color: initial; + display: inline-block; + height: 50%; + border: 3px solid black; + box-sizing: content-box; +} + */ +button { + display: inline-block; + height: 30px; + width: 100px; +/* border: 2px solid black; */ +/* box-sizing: content-box; */ + border-radius: 10px; +} + +header { + color: white; + background-color: #BE5959; + font-family: calibri; + display: flex; + justify-content: space-around; +} + +h2 { + color: white; + background-color: #5C90CC; + margin-top: 0; + text-align: center; +} + +.search_text{ + margin-top: 20px; + margin-left: 20px; + margin-right: 20px; + margin-bottom: 20px; + font-family: calibri; +} + +#inputSearchText{ + width: 100%; + height: 100%; + font-size: 40px; + padding-left: 20px; +} + +ul{ + list-style-type:none; +} + +nav { + background-color: #5C90CC; + width: 100%; + height: 5%; + float: center; +} + +.pok_insights { + margin: auto; + width: 94%; + border: 2px solid #646262; + padding: 0; + text-align: left; + font-family: calibri; + background-color: white; + +} + + +.pok_descript { +/* height: 100px; */ + margin: auto; + width: 90%; + border: 8px solid #BE5959; + border-radius: 20px 20px 20px 20px; + text-align: center; + font-family: calibri; + background-color: white; + +} + +#lblPokedex{ + alignment-adjust:central; +} + +.grid{ + border: 2px solid black; +} + + +ul#main_menu li{ +display: inline-block; +background-color: red; +border: 5px solid; +list-style: none; +padding: 3px; +border-radius: 5px 5px; +} + + +/** flex stuff **/ +.grid-parent{ + display: flex; + flex-wrap: wrap; +} + +.grid{ + width: 16% +} diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css new file mode 100644 index 0000000..e0fe361 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css @@ -0,0 +1 @@ +/*Your tablet targeted CSS should go in this file*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html new file mode 100755 index 0000000..4ac2e12 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html @@ -0,0 +1,208 @@ + + + + My First Page + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+
EmptyEmptyEmptyEmptyEmptyEmpty
EmptyEmptyEmptyEmptyEmptyEmpty
+ + + + + + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html new file mode 100755 index 0000000..41cccee --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html @@ -0,0 +1,86 @@ + + + + + + Pokedex displays + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ + +
+ +
+ + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion.

+

Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + + +
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+ +
+ + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css new file mode 100644 index 0000000..06fa3d9 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css @@ -0,0 +1 @@ +/*Your mobile targeted css should go here*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx b/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx deleted file mode 100644 index 37240c44e0d81bf1d9b2bc8fa4d7f56be2581eba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmd;ePAtmFSMbR!EX_>GXCM;rGB`6NG88f7Fyu2RF!(TJG88hD0?8C09|RmeUT6Vf zkNCg)4c1Jb#-bCs7=$%|a#!B!Fg=L)yT3RyJx|{=uehYBG`S=*Kd)HT$bb=@#Cno>^ From 78ff2fe21533c705d1c71f05f4b79e2f5547e093 Mon Sep 17 00:00:00 2001 From: sberthely Date: Tue, 13 Sep 2016 13:40:38 -0700 Subject: [PATCH 08/11] Changes submitted-Changes not staged for commit --- .../Homework_1 - HTML/myFirstPage_V1.html | 108 +++++++++ .../main.css | 131 +++++++++++ .../medium.css | 1 + .../myFirstPage-Good.html | 208 ++++++++++++++++++ .../myFirstPage.html | 86 ++++++++ .../small.css | 1 + .../~$structions HW2 Responsive_Design.docx | Bin 162 -> 0 bytes 7 files changed, 535 insertions(+) create mode 100755 Assignment/Homework_1 - HTML/myFirstPage_V1.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/main.css create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/small.css delete mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx diff --git a/Assignment/Homework_1 - HTML/myFirstPage_V1.html b/Assignment/Homework_1 - HTML/myFirstPage_V1.html new file mode 100755 index 0000000..0dd2455 --- /dev/null +++ b/Assignment/Homework_1 - HTML/myFirstPage_V1.html @@ -0,0 +1,108 @@ + + + + My First Page + + + +
+

+

Pokedex

+

+
+ + +
+ +
+ +
+ +
+

No. 001 Pickahu

+
    +

    Electric type

    +

    Gentle Temperment

    +

    Grasslands

    +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots + on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + +
+ + + +
+ + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css new file mode 100644 index 0000000..1caae53 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css @@ -0,0 +1,131 @@ +/*----------------- CSS RESET ------------------*/ +body{ + width: 900px; + height: 1200px; + margin: 0 auto; + background-image: url("assets/backgrounds/background_home.png"); + background-repeat: no-repeat; + background-size:900px; + background-position: center +} + +div.container { + width: 100%; + border: 1px solid gray; +} + +/* +a.button { + -webkit-appearance: button; + -moz-appearance: button; + appearance: button; + text-decoration: none; + color: initial; + display: inline-block; + height: 50%; + border: 3px solid black; + box-sizing: content-box; +} + */ +button { + display: inline-block; + height: 30px; + width: 100px; +/* border: 2px solid black; */ +/* box-sizing: content-box; */ + border-radius: 10px; +} + +header { + color: white; + background-color: #BE5959; + font-family: calibri; + display: flex; + justify-content: space-around; +} + +h2 { + color: white; + background-color: #5C90CC; + margin-top: 0; + text-align: center; +} + +.search_text{ + margin-top: 20px; + margin-left: 20px; + margin-right: 20px; + margin-bottom: 20px; + font-family: calibri; +} + +#inputSearchText{ + width: 100%; + height: 100%; + font-size: 40px; + padding-left: 20px; +} + +ul{ + list-style-type:none; +} + +nav { + background-color: #5C90CC; + width: 100%; + height: 5%; + float: center; +} + +.pok_insights { + margin: auto; + width: 94%; + border: 2px solid #646262; + padding: 0; + text-align: left; + font-family: calibri; + background-color: white; + +} + + +.pok_descript { +/* height: 100px; */ + margin: auto; + width: 90%; + border: 8px solid #BE5959; + border-radius: 20px 20px 20px 20px; + text-align: center; + font-family: calibri; + background-color: white; + +} + +#lblPokedex{ + alignment-adjust:central; +} + +.grid{ + border: 2px solid black; +} + + +ul#main_menu li{ +display: inline-block; +background-color: red; +border: 5px solid; +list-style: none; +padding: 3px; +border-radius: 5px 5px; +} + + +/** flex stuff **/ +.grid-parent{ + display: flex; + flex-wrap: wrap; +} + +.grid{ + width: 16% +} diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css new file mode 100644 index 0000000..e0fe361 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css @@ -0,0 +1 @@ +/*Your tablet targeted CSS should go in this file*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html new file mode 100755 index 0000000..4ac2e12 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html @@ -0,0 +1,208 @@ + + + + My First Page + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+
EmptyEmptyEmptyEmptyEmptyEmpty
EmptyEmptyEmptyEmptyEmptyEmpty
+ + + + + + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html new file mode 100755 index 0000000..41cccee --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html @@ -0,0 +1,86 @@ + + + + + + Pokedex displays + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ + +
+ +
+ + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion.

+

Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + + +
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+ +
+ + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css new file mode 100644 index 0000000..06fa3d9 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css @@ -0,0 +1 @@ +/*Your mobile targeted css should go here*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx b/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx deleted file mode 100644 index 37240c44e0d81bf1d9b2bc8fa4d7f56be2581eba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmd;ePAtmFSMbR!EX_>GXCM;rGB`6NG88f7Fyu2RF!(TJG88hD0?8C09|RmeUT6Vf zkNCg)4c1Jb#-bCs7=$%|a#!B!Fg=L)yT3RyJx|{=uehYBG`S=*Kd)HT$bb=@#Cno>^ From 826b1c5dd78636edaff72d7f73ef86a7833a8cf0 Mon Sep 17 00:00:00 2001 From: sberthely Date: Tue, 13 Sep 2016 13:40:38 -0700 Subject: [PATCH 09/11] Changes submitted-Changes not staged for commit --- .../Homework_1 - HTML/myFirstPage_V1.html | 108 +++++++++ .../main.css | 131 +++++++++++ .../medium.css | 1 + .../myFirstPage-Good.html | 208 ++++++++++++++++++ .../myFirstPage.html | 86 ++++++++ .../small.css | 1 + .../~$structions HW2 Responsive_Design.docx | Bin 162 -> 0 bytes 7 files changed, 535 insertions(+) create mode 100755 Assignment/Homework_1 - HTML/myFirstPage_V1.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/main.css create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/small.css delete mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx diff --git a/Assignment/Homework_1 - HTML/myFirstPage_V1.html b/Assignment/Homework_1 - HTML/myFirstPage_V1.html new file mode 100755 index 0000000..0dd2455 --- /dev/null +++ b/Assignment/Homework_1 - HTML/myFirstPage_V1.html @@ -0,0 +1,108 @@ + + + + My First Page + + + +
+

+

Pokedex

+

+
+ + +
+ +
+ +
+ +
+

No. 001 Pickahu

+
    +

    Electric type

    +

    Gentle Temperment

    +

    Grasslands

    +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots + on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + +
+ + + +
+ + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css new file mode 100644 index 0000000..1caae53 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css @@ -0,0 +1,131 @@ +/*----------------- CSS RESET ------------------*/ +body{ + width: 900px; + height: 1200px; + margin: 0 auto; + background-image: url("assets/backgrounds/background_home.png"); + background-repeat: no-repeat; + background-size:900px; + background-position: center +} + +div.container { + width: 100%; + border: 1px solid gray; +} + +/* +a.button { + -webkit-appearance: button; + -moz-appearance: button; + appearance: button; + text-decoration: none; + color: initial; + display: inline-block; + height: 50%; + border: 3px solid black; + box-sizing: content-box; +} + */ +button { + display: inline-block; + height: 30px; + width: 100px; +/* border: 2px solid black; */ +/* box-sizing: content-box; */ + border-radius: 10px; +} + +header { + color: white; + background-color: #BE5959; + font-family: calibri; + display: flex; + justify-content: space-around; +} + +h2 { + color: white; + background-color: #5C90CC; + margin-top: 0; + text-align: center; +} + +.search_text{ + margin-top: 20px; + margin-left: 20px; + margin-right: 20px; + margin-bottom: 20px; + font-family: calibri; +} + +#inputSearchText{ + width: 100%; + height: 100%; + font-size: 40px; + padding-left: 20px; +} + +ul{ + list-style-type:none; +} + +nav { + background-color: #5C90CC; + width: 100%; + height: 5%; + float: center; +} + +.pok_insights { + margin: auto; + width: 94%; + border: 2px solid #646262; + padding: 0; + text-align: left; + font-family: calibri; + background-color: white; + +} + + +.pok_descript { +/* height: 100px; */ + margin: auto; + width: 90%; + border: 8px solid #BE5959; + border-radius: 20px 20px 20px 20px; + text-align: center; + font-family: calibri; + background-color: white; + +} + +#lblPokedex{ + alignment-adjust:central; +} + +.grid{ + border: 2px solid black; +} + + +ul#main_menu li{ +display: inline-block; +background-color: red; +border: 5px solid; +list-style: none; +padding: 3px; +border-radius: 5px 5px; +} + + +/** flex stuff **/ +.grid-parent{ + display: flex; + flex-wrap: wrap; +} + +.grid{ + width: 16% +} diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css new file mode 100644 index 0000000..e0fe361 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css @@ -0,0 +1 @@ +/*Your tablet targeted CSS should go in this file*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html new file mode 100755 index 0000000..4ac2e12 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html @@ -0,0 +1,208 @@ + + + + My First Page + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+
EmptyEmptyEmptyEmptyEmptyEmpty
EmptyEmptyEmptyEmptyEmptyEmpty
+ + + + + + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html new file mode 100755 index 0000000..41cccee --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html @@ -0,0 +1,86 @@ + + + + + + Pokedex displays + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ + +
+ +
+ + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion.

+

Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + + +
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+ +
+ + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css new file mode 100644 index 0000000..06fa3d9 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css @@ -0,0 +1 @@ +/*Your mobile targeted css should go here*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx b/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx deleted file mode 100644 index 37240c44e0d81bf1d9b2bc8fa4d7f56be2581eba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmd;ePAtmFSMbR!EX_>GXCM;rGB`6NG88f7Fyu2RF!(TJG88hD0?8C09|RmeUT6Vf zkNCg)4c1Jb#-bCs7=$%|a#!B!Fg=L)yT3RyJx|{=uehYBG`S=*Kd)HT$bb=@#Cno>^ From 6d02c6579150e4bceffb486a3ff0299c109d5dd3 Mon Sep 17 00:00:00 2001 From: parvsondhi Date: Tue, 11 Oct 2016 13:37:24 -0700 Subject: [PATCH 10/11] new lab --- Labs/Lab - orm_tutorial/app.db | Bin 0 -> 9216 bytes Labs/Lab - orm_tutorial/app/__init__.py | 8 +++++ Labs/Lab - orm_tutorial/app/__init__.pyc | Bin 0 -> 423 bytes Labs/Lab - orm_tutorial/app/forms.py | 9 +++++ Labs/Lab - orm_tutorial/app/forms.pyc | Bin 0 -> 718 bytes Labs/Lab - orm_tutorial/app/models.py | 3 ++ Labs/Lab - orm_tutorial/app/models.pyc | Bin 0 -> 776 bytes .../app/templates/base.html | 14 ++++++++ .../app/templates/customer.html | 30 +++++++++++++++++ .../app/templates/home.html | 31 ++++++++++++++++++ Labs/Lab - orm_tutorial/app/views.py | 21 ++++++++++++ Labs/Lab - orm_tutorial/app/views.pyc | Bin 0 -> 1413 bytes Labs/Lab - orm_tutorial/config.py | 8 +++++ Labs/Lab - orm_tutorial/config.pyc | Bin 0 -> 491 bytes Labs/Lab - orm_tutorial/readme.md | 21 ++++++++++++ Labs/Lab - orm_tutorial/requirements.txt | 10 ++++++ Labs/Lab - orm_tutorial/run.py | 2 ++ Labs/Lab - orm_tutorial/update_database.py | 3 ++ 18 files changed, 160 insertions(+) create mode 100755 Labs/Lab - orm_tutorial/app.db create mode 100755 Labs/Lab - orm_tutorial/app/__init__.py create mode 100644 Labs/Lab - orm_tutorial/app/__init__.pyc create mode 100755 Labs/Lab - orm_tutorial/app/forms.py create mode 100644 Labs/Lab - orm_tutorial/app/forms.pyc create mode 100755 Labs/Lab - orm_tutorial/app/models.py create mode 100644 Labs/Lab - orm_tutorial/app/models.pyc create mode 100755 Labs/Lab - orm_tutorial/app/templates/base.html create mode 100755 Labs/Lab - orm_tutorial/app/templates/customer.html create mode 100755 Labs/Lab - orm_tutorial/app/templates/home.html create mode 100755 Labs/Lab - orm_tutorial/app/views.py create mode 100644 Labs/Lab - orm_tutorial/app/views.pyc create mode 100755 Labs/Lab - orm_tutorial/config.py create mode 100644 Labs/Lab - orm_tutorial/config.pyc create mode 100755 Labs/Lab - orm_tutorial/readme.md create mode 100755 Labs/Lab - orm_tutorial/requirements.txt create mode 100755 Labs/Lab - orm_tutorial/run.py create mode 100755 Labs/Lab - orm_tutorial/update_database.py diff --git a/Labs/Lab - orm_tutorial/app.db b/Labs/Lab - orm_tutorial/app.db new file mode 100755 index 0000000000000000000000000000000000000000..913aa352662c7be065c41b46a53978c9de0978f9 GIT binary patch literal 9216 zcmeI1L2uJA6oBnGU1?D-ow{n8CK(|_tFqB{7bFB~SF%yjWh`xxc8anlrGcb@CY9KM zL-!B(4TvLufh#`%iOa;1-Z*jHf#<9d-74)eQNeglo}c|}EAM@3>^g4lHSECRU2otT z0pB1pp_EiOCxjG15)+X@-vALhN;E25po?T}ET`BBk?EMQ2kZ+SOCRZb`b}IHjEkDs z34Iuq|5pw4K3_8S(IYvYU0I<=dSDzlmSLI$%l9WLR@0PfOX02RW<%iGW* z{E4#9bG8|F-P+ZZ`nD=;xv61!t|?oJrl>Wg$s>C>D48FnV)5+iDjm6D7*T7af9`5bz>NKVOaRhHt`M z0TBywTAs4O7ERc)3~Xzs{fr72yN2Ht4VPd4PyhcP6ZVrG&m&}f1`LZL?Igr*p)**-kVdy1Bo-R>d>w zgXQL;YpePxUtXLe`1 mq0UrH17a!bwzg76{lW4E7u2*`Ro9dYWgYs!K2D7IQ1C+_K0YBYgK8(LY9lLuj~}_BBYCy zwud;U#+lTiEQ)YUj%`pZBi6y!T5jNp199WCQtT3pwY1Yfy#Bas v?ssxRXTc*HeO$@JJvvyY2fyZPGu-(Z^)N&J!{%2@v>l?7+;i=yF|Lfw>S- z_lLj7Wadq=P^mPJRU_}QNuSu+C8&$^p~eYQW@FYP zGR+B8?-^hQuo-$BxX|l_hs$<$cGXeaE4Pk$oM!EoD{9Q{Jet9RKA@Fn wp{amnwhHxW(G^=_TWq-(?KAQ3M-sIBnaw%tV^jX6xE1ZNmFb9ySVcFSPhfALqyPW_ literal 0 HcmV?d00001 diff --git a/Labs/Lab - orm_tutorial/app/templates/base.html b/Labs/Lab - orm_tutorial/app/templates/base.html new file mode 100755 index 0000000..db51f24 --- /dev/null +++ b/Labs/Lab - orm_tutorial/app/templates/base.html @@ -0,0 +1,14 @@ + + + {% if title %} + {{ title }} - ACME + {% else %} + Welcome to ACME Aircraft Parts + {% endif %} + + + + + {% block content %}{% endblock %} + + diff --git a/Labs/Lab - orm_tutorial/app/templates/customer.html b/Labs/Lab - orm_tutorial/app/templates/customer.html new file mode 100755 index 0000000..d7b457a --- /dev/null +++ b/Labs/Lab - orm_tutorial/app/templates/customer.html @@ -0,0 +1,30 @@ +{% extends "base.html" %} +{% block content %} +
+
+
+ Home +
+

Add Customer to Our Database

+
+ {{ form.hidden_tag() }} +
+
+

+ Company name:
+ {{ form.company(size=120) }}
+

+

+ Customer email:
+ {{ form.email(size=120) }}
+

+
+
+
+ +
+

+
+
+
+{% endblock %} diff --git a/Labs/Lab - orm_tutorial/app/templates/home.html b/Labs/Lab - orm_tutorial/app/templates/home.html new file mode 100755 index 0000000..6b447ec --- /dev/null +++ b/Labs/Lab - orm_tutorial/app/templates/home.html @@ -0,0 +1,31 @@ +{% extends "base.html" %} +{% block content %} +
+
+

Welcome to ACME Aircraft Parts

+
+ Add a Customer +
+
+
+

These are all of our awesome customers:

+ + + + + + + + {% for customer in customers %} + + + + + + {% endfor %} +
CompanyEmail
{{ customer.company }}{{ customer.email }}
+
+
+
+{% endblock %} diff --git a/Labs/Lab - orm_tutorial/app/views.py b/Labs/Lab - orm_tutorial/app/views.py new file mode 100755 index 0000000..dab8eed --- /dev/null +++ b/Labs/Lab - orm_tutorial/app/views.py @@ -0,0 +1,21 @@ +from flask import render_template, redirect, request +from app import app, models, db +from .forms import CustomerForm + + +@app.route('/') +def index(): + return redirect('/create_customer') + +@app.route('/create_customer', methods=['GET', 'POST']) +def create_customer(): + form = CustomerForm() + #Capture form data and send to database + return redirect('/customers') + return render_template('customer.html', form=form) + +@app.route('/customers') +def display_customer(): + #Fetch customer data from database + return render_template('home.html', + customers=customers) diff --git a/Labs/Lab - orm_tutorial/app/views.pyc b/Labs/Lab - orm_tutorial/app/views.pyc new file mode 100644 index 0000000000000000000000000000000000000000..e27a6bdcbd490730bee7effbec3b29388e6a3af3 GIT binary patch literal 1413 zcmbtTO>fgc5S_J?G)a@T>H!ey332d+nje5Fq(Zp`s`@j9(dd;may+QhVl?zO3`C zh>>!9nVT{9O^mu$r!Hpu^HSe?P*Epp}t>!}xq5LN4ke8<* z7nOp_z;OsajTpm35}lQ{$`%bgW3#*vg5#D%=f-etXZz>g7J}sr3Prq?a45eEbD0&n zW&z5@iCdo9+$W4$N~0AvVU;BSJhMasFcXrBGtTAZLO9E`mTEzI9Eep+&`9)7w)hB_ zT$|W^#pRN|Q$Ad0j&V^iP$R`{JJ?ZUHB@&fnz0jS$Z!wQ+!GjR3MuCzBGiDmzzsDU z5k-X%ZWA|vJxA3yZ^vMqG&h~b{@jvzBKS9I(K-|SLLm}@Jcjw3xQzbq ag>uLjc*D!W955v!)1KN>JK>|w)A1iQbs}T{ literal 0 HcmV?d00001 diff --git a/Labs/Lab - orm_tutorial/config.py b/Labs/Lab - orm_tutorial/config.py new file mode 100755 index 0000000..a995426 --- /dev/null +++ b/Labs/Lab - orm_tutorial/config.py @@ -0,0 +1,8 @@ +import os +basedir = os.path.abspath(os.path.dirname(__file__)) + +SQLALCHEMY_DATABASE_URI = 'sqlite:///' + os.path.join(basedir, 'app.db') +SQLALCHEMY_MIGRATE_REPO = os.path.join(basedir, 'db_repository') + +WTF_CSRF_ENABLED = True +SECRET_KEY = 'you-will-never-guess' diff --git a/Labs/Lab - orm_tutorial/config.pyc b/Labs/Lab - orm_tutorial/config.pyc new file mode 100644 index 0000000000000000000000000000000000000000..59af7fd032bca1841f4a4337b62a884ff9163960 GIT binary patch literal 491 zcmZ8dO;5r=5Sle>F@C7MWyOyRv=?R>mFjN#`L>Aj#UXQToW4MG4900HJ2%=N8N04%~r%f#D(;1@3e zl3Rd{4h^rojs8X{K?kn_xC>qtf*tVovIb7GM9st}oq?=o&0j*H@YFO-nK6DGp9CXS z&we!G3C58WDoWP!fRJ^R8m}S@jU}!yF{UX>*{l(vbW)L2*+j9gW~xkvKa#(8Ad;oO zKvf}}^N9$N^E_zeOC&PSoJV4*8WiE&_pDy)n)RP}+j6Z-%VB(IcmH$!?v-u1jN9z) zHZR~NDXM)c@aT4U%dtD04Xn!^YpZNhhqY|x@*DQlBoF?SG{`lF5)*00ezG##D4$gn sn~NyGP#P+w4G2Fp$I)^krYG?_pW}?^G{kd_vh!8ev}659JJd_s7uKI~bpQYW literal 0 HcmV?d00001 diff --git a/Labs/Lab - orm_tutorial/readme.md b/Labs/Lab - orm_tutorial/readme.md new file mode 100755 index 0000000..f5a8d70 --- /dev/null +++ b/Labs/Lab - orm_tutorial/readme.md @@ -0,0 +1,21 @@ +# Models Lab/Homework +The goal for this lab is to get you comfortable translating your database models into actual code. We will be using [ORMs](https://en.wikipedia.org/wiki/Object-relational_mapping) to help us. The particular ORM that we will be using is SQLAlchemy (the flask implementation is called [Flask-SQLAlchemy](http://flask-sqlalchemy.pocoo.org/2.1/)). + +We'll walk through the example together in class which will give you an idea of how this all works together. Your goal for this lab and homework is to create the remaining models, forms, and routes to complete v2 of the exercise from last week. + +This means that you must: +* Create the following tables and the appropriate relationships: + * customer + * address + * order + * Remember to run update_database.py whenever you make changes to any models. + * This will update the database with your changes. However, **it will delete any data in the database**. +* Create the forms, templates, routes, etc necessary to input this data into the database. +* Create a view to showcase the data into your database (see the current implementation of "home.html" for example) + +The following documentation will help answer any questions you may have. + +## Helpful Documentation +- [Flask-SQLAlchemy](http://flask-sqlalchemy.pocoo.org/2.1/) +- [Accessing SQLite3 Command Shell](https://www.sqlite.org/cli.html) +- [Flask-WTF](https://flask-wtf.readthedocs.org/en/latest/) (flask plugin for creating forms easily) diff --git a/Labs/Lab - orm_tutorial/requirements.txt b/Labs/Lab - orm_tutorial/requirements.txt new file mode 100755 index 0000000..bfbaf81 --- /dev/null +++ b/Labs/Lab - orm_tutorial/requirements.txt @@ -0,0 +1,10 @@ +Flask==0.10.1 +Flask-SQLAlchemy==2.1 +Flask-WTF==0.12 +itsdangerous==0.24 +Jinja2==2.8 +MarkupSafe==0.23 +SQLAlchemy==1.0.12 +Werkzeug==0.11.4 +wheel==0.29.0 +WTForms==2.1 diff --git a/Labs/Lab - orm_tutorial/run.py b/Labs/Lab - orm_tutorial/run.py new file mode 100755 index 0000000..5d2f714 --- /dev/null +++ b/Labs/Lab - orm_tutorial/run.py @@ -0,0 +1,2 @@ +from app import app +app.run(debug=True, host="0.0.0.0", port=8081) diff --git a/Labs/Lab - orm_tutorial/update_database.py b/Labs/Lab - orm_tutorial/update_database.py new file mode 100755 index 0000000..b15e4da --- /dev/null +++ b/Labs/Lab - orm_tutorial/update_database.py @@ -0,0 +1,3 @@ +from app import db +db.drop_all() +db.create_all() From 3adbfea1d42d083279012b37d2ca7c9a09aeef02 Mon Sep 17 00:00:00 2001 From: sberthely Date: Tue, 13 Sep 2016 13:40:38 -0700 Subject: [PATCH 11/11] Changes submitted-Changes not staged for commit --- .../Homework_1 - HTML/myFirstPage_V1.html | 108 +++++++++ .../main.css | 131 +++++++++++ .../medium.css | 1 + .../myFirstPage-Good.html | 208 ++++++++++++++++++ .../myFirstPage.html | 86 ++++++++ .../small.css | 1 + .../~$structions HW2 Responsive_Design.docx | Bin 162 -> 0 bytes 7 files changed, 535 insertions(+) create mode 100755 Assignment/Homework_1 - HTML/myFirstPage_V1.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/main.css create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html create mode 100755 Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html create mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/small.css delete mode 100644 Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx diff --git a/Assignment/Homework_1 - HTML/myFirstPage_V1.html b/Assignment/Homework_1 - HTML/myFirstPage_V1.html new file mode 100755 index 0000000..0dd2455 --- /dev/null +++ b/Assignment/Homework_1 - HTML/myFirstPage_V1.html @@ -0,0 +1,108 @@ + + + + My First Page + + + +
+

+

Pokedex

+

+
+ + +
+ +
+ +
+ +
+

No. 001 Pickahu

+
    +

    Electric type

    +

    Gentle Temperment

    +

    Grasslands

    +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots + on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + +
+ + + +
+ + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css new file mode 100644 index 0000000..1caae53 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/main.css @@ -0,0 +1,131 @@ +/*----------------- CSS RESET ------------------*/ +body{ + width: 900px; + height: 1200px; + margin: 0 auto; + background-image: url("assets/backgrounds/background_home.png"); + background-repeat: no-repeat; + background-size:900px; + background-position: center +} + +div.container { + width: 100%; + border: 1px solid gray; +} + +/* +a.button { + -webkit-appearance: button; + -moz-appearance: button; + appearance: button; + text-decoration: none; + color: initial; + display: inline-block; + height: 50%; + border: 3px solid black; + box-sizing: content-box; +} + */ +button { + display: inline-block; + height: 30px; + width: 100px; +/* border: 2px solid black; */ +/* box-sizing: content-box; */ + border-radius: 10px; +} + +header { + color: white; + background-color: #BE5959; + font-family: calibri; + display: flex; + justify-content: space-around; +} + +h2 { + color: white; + background-color: #5C90CC; + margin-top: 0; + text-align: center; +} + +.search_text{ + margin-top: 20px; + margin-left: 20px; + margin-right: 20px; + margin-bottom: 20px; + font-family: calibri; +} + +#inputSearchText{ + width: 100%; + height: 100%; + font-size: 40px; + padding-left: 20px; +} + +ul{ + list-style-type:none; +} + +nav { + background-color: #5C90CC; + width: 100%; + height: 5%; + float: center; +} + +.pok_insights { + margin: auto; + width: 94%; + border: 2px solid #646262; + padding: 0; + text-align: left; + font-family: calibri; + background-color: white; + +} + + +.pok_descript { +/* height: 100px; */ + margin: auto; + width: 90%; + border: 8px solid #BE5959; + border-radius: 20px 20px 20px 20px; + text-align: center; + font-family: calibri; + background-color: white; + +} + +#lblPokedex{ + alignment-adjust:central; +} + +.grid{ + border: 2px solid black; +} + + +ul#main_menu li{ +display: inline-block; +background-color: red; +border: 5px solid; +list-style: none; +padding: 3px; +border-radius: 5px 5px; +} + + +/** flex stuff **/ +.grid-parent{ + display: flex; + flex-wrap: wrap; +} + +.grid{ + width: 16% +} diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css new file mode 100644 index 0000000..e0fe361 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/medium.css @@ -0,0 +1 @@ +/*Your tablet targeted CSS should go in this file*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html new file mode 100755 index 0000000..4ac2e12 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage-Good.html @@ -0,0 +1,208 @@ + + + + My First Page + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion. + Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+
EmptyEmptyEmptyEmptyEmptyEmpty
EmptyEmptyEmptyEmptyEmptyEmpty
+ + + + + + + + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html new file mode 100755 index 0000000..41cccee --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/myFirstPage.html @@ -0,0 +1,86 @@ + + + + + + Pokedex displays + + + + + + + +
+ + + + + + +

Pokedex

Empty
+
+ + +
+ +
+ + + + + + +
+ Empty + +
+

No. 001 Pickahu

+
    +
  • - Electric type
    • +
  • - Gentle Temperment
    • +
  • - Grasslands
    • +
+
+
+ +
+
+

Pickahu can be seen napping in a bright sunlight. It has two + red dots on its cheeks. By practicing html and css Pickahu can learn confusion.

+

Pickahu likes to steal computer chargers from sleeping college students. +

+
+
+ + + +
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+
Empty
+ +
+ + + + + diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css new file mode 100644 index 0000000..06fa3d9 --- /dev/null +++ b/Assignment/Homework_2 - CSS_ResponsiveDesign/small.css @@ -0,0 +1 @@ +/*Your mobile targeted css should go here*/ diff --git a/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx b/Assignment/Homework_2 - CSS_ResponsiveDesign/~$structions HW2 Responsive_Design.docx deleted file mode 100644 index 37240c44e0d81bf1d9b2bc8fa4d7f56be2581eba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmd;ePAtmFSMbR!EX_>GXCM;rGB`6NG88f7Fyu2RF!(TJG88hD0?8C09|RmeUT6Vf zkNCg)4c1Jb#-bCs7=$%|a#!B!Fg=L)yT3RyJx|{=uehYBG`S=*Kd)HT$bb=@#Cno>^