From 645cc3824c8b2286090afb3eeaec8b7e01b76b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Felipe=20Burbano?= Date: Sat, 15 Aug 2020 15:07:50 -0500 Subject: [PATCH 01/14] Create a folder structure --- .gitignore | 1 + css/style.css | 3 +++ js/platzi_game.js | 1 + platzi_game.html | 15 +++++++++++++++ 4 files changed, 20 insertions(+) create mode 100644 .gitignore create mode 100644 css/style.css create mode 100644 js/platzi_game.js create mode 100644 platzi_game.html diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..10b4dbd --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +others_docs_challenge_prework_forntend/ \ No newline at end of file diff --git a/css/style.css b/css/style.css new file mode 100644 index 0000000..88cb00c --- /dev/null +++ b/css/style.css @@ -0,0 +1,3 @@ +body { + background-color: red; +} \ No newline at end of file diff --git a/js/platzi_game.js b/js/platzi_game.js new file mode 100644 index 0000000..4226829 --- /dev/null +++ b/js/platzi_game.js @@ -0,0 +1 @@ +alert('It is connected to platzi_game.js') \ No newline at end of file diff --git a/platzi_game.html b/platzi_game.html new file mode 100644 index 0000000..745d337 --- /dev/null +++ b/platzi_game.html @@ -0,0 +1,15 @@ + + + + + + Platzi Game + + + + +

Te amo Sara!!!

+ + + + \ No newline at end of file From 9f77453858dc8096825ee37f3cdf03e5dc8aaa16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Felipe=20Burbano?= Date: Sat, 15 Aug 2020 15:35:04 -0500 Subject: [PATCH 02/14] Add normalize file --- css/normalize.css | 349 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 349 insertions(+) create mode 100644 css/normalize.css diff --git a/css/normalize.css b/css/normalize.css new file mode 100644 index 0000000..b6eb821 --- /dev/null +++ b/css/normalize.css @@ -0,0 +1,349 @@ +/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in iOS. + */ + + html { + line-height: 1.15; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers. + */ + +body { + margin: 0; +} + +/** + * Render the `main` element consistently in IE. + */ + +main { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Remove the gray background on active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * 1. Remove the bottom border in Chrome 57- + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove the border on images inside links in IE 10. + */ + +img { + border-style: none; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers. + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * Correct the inability to style clickable types in iOS and Safari. + */ + +button, +[type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + vertical-align: baseline; +} + +/** + * Remove the default vertical scrollbar in IE 10+. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10. + * 2. Remove the padding in IE 10. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in Edge, IE 10+, and Firefox. + */ + +details { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Misc + ========================================================================== */ + +/** + * Add the correct display in IE 10+. + */ + +template { + display: none; +} + +/** + * Add the correct display in IE 10. + */ + +[hidden] { + display: none; +} \ No newline at end of file From a1e12ca706762221363af3e5cd420d86dbe60638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Felipe=20Burbano?= Date: Sat, 15 Aug 2020 16:45:26 -0500 Subject: [PATCH 03/14] Add html layout --- platzi_game.html | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/platzi_game.html b/platzi_game.html index 745d337..e1a8e2b 100644 --- a/platzi_game.html +++ b/platzi_game.html @@ -5,10 +5,42 @@ Platzi Game + -

Te amo Sara!!!

+
+
+

Platzi Game

+
+
+
+

Player 1

+
+
50%
+
+
+
+
+ +
+
+

Player 2

+
+
20%
+
+
+
+
+ +
+
+
+
+ Made by @Pipe12 +
+
+
From c3c2249cc62a8007aff6ff1575d67b61a10610e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Felipe=20Burbano?= Date: Sat, 15 Aug 2020 18:43:28 -0500 Subject: [PATCH 04/14] Style header and part of players section --- css/style.css | 93 ++++++++++++++++++++++++++++++++++++++++++++++-- platzi_game.html | 38 ++++++++++++-------- 2 files changed, 115 insertions(+), 16 deletions(-) diff --git a/css/style.css b/css/style.css index 88cb00c..ff83b2d 100644 --- a/css/style.css +++ b/css/style.css @@ -1,3 +1,92 @@ +@import url('https://fonts.googleapis.com/css2?family=Poppins:wght@600&display=swap'); + +:root { + --blue: #1A46E5; + --green: #43D8C9; + --yellow: #FFBD11; + --pink: #FF89BB; +} + body { - background-color: red; -} \ No newline at end of file + border: 1px solid green; + font-family: 'Poppins', sans-serif; +} + +.shelf { + border: 1px solid magenta; + box-sizing: border-box; + + max-width: 1440px; + max-height: 1024px; + margin: auto; + + padding: 60px; +} + +.header { + border: 1px solid greenyellow; + text-align: center; +} + +.header h1 { + font-size: 3.75em; +} + +#players { + border: 1px solid rebeccapurple; + + display: flex; + justify-content: space-around; +} + +.player_card { + border: 3px solid black; + border-radius: 20px; + + width: 467px; + height: 582px; + + color: white; + text-align: center; +} + +.player_card:first-child { + background-color: var(--green); +} + +.player_card:last-child { + background-color: var(--yellow); +} + +.player_card__title { + border: 1px solid aquamarine; + font-size: 2.25em; +} + +.player_card__info { + border: 1px solid orchid; +} + +.player_card__life { + border: 1px solid maroon; +} + +.player_card__life_percentage { + font-size: 1.875em; +} + +.button { + background-color: var(--blue); + color: white; + width: 120px; + height: 120px; + border: 3px solid black; + box-shadow: 2px 6px black; + border-radius: 50%; + font-size: 2.25em; +} + +footer { + border: 1px solid orangered; +} + diff --git a/platzi_game.html b/platzi_game.html index e1a8e2b..489c048 100644 --- a/platzi_game.html +++ b/platzi_game.html @@ -14,25 +14,35 @@

Platzi Game

-
-

Player 1

-
-
50%
-
-
+
+

Player 1

+
+
+
50%
+
+
+
+ +
+
+
-
-
-

Player 2

-
-
20%
-
-
+
+

Player 2

+
+
+
20%
+
+
+
+ +
+
+
-