From 0325fba5e82b21a9911a0f8f6f7b98fe917b5610 Mon Sep 17 00:00:00 2001 From: mukund-23 Date: Thu, 28 May 2020 22:07:04 +0530 Subject: [PATCH 1/3] 1.5.2 --- .idea/.gitignore | 5 +++ .idea/css_layout_exercises_starter_files.iml | 12 +++++++ .idea/misc.xml | 6 ++++ .idea/modules.xml | 8 +++++ .idea/vcs.xml | 6 ++++ display-exercise.html | 9 ++++- styles/display-page.css | 38 ++++++++++++++++++++ 7 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/css_layout_exercises_starter_files.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..b58b603f --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,5 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/css_layout_exercises_starter_files.iml b/.idea/css_layout_exercises_starter_files.iml new file mode 100644 index 00000000..24643cc3 --- /dev/null +++ b/.idea/css_layout_exercises_starter_files.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..28a804d8 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..3ad01f0f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/display-exercise.html b/display-exercise.html index 433b6cba..7cb901f8 100644 --- a/display-exercise.html +++ b/display-exercise.html @@ -17,6 +17,13 @@ -

Placeholder!

+
+
+
+
+
+
+ +
\ No newline at end of file diff --git a/styles/display-page.css b/styles/display-page.css index e69de29b..50e42155 100644 --- a/styles/display-page.css +++ b/styles/display-page.css @@ -0,0 +1,38 @@ + +.parent-box{ + width: 800px; + height: 500px; + margin-left: auto; + margin-right: auto; + font-size: 0; +} +.inner1{ + font-size: 0; + width: 50%; + height: 40%; + display: inline-block; + border: 1px solid black; +} +.green{ + background-color: green; + +} +.blue{ + background-color: blue; +} +.inner2{ + font-size: 0; + width: 33.3%; + height: 300px; + display: inline-block; + border: 1px solid black; +} +.black{ + background-color: black; +} +.grey{ + background-color: grey; +} +.yellow{ + background-color: yellow; +} \ No newline at end of file From 865397791f2ab1d3b4cb22faa8a3e37c1632edcb Mon Sep 17 00:00:00 2001 From: mukund-23 Date: Fri, 29 May 2020 15:46:09 +0530 Subject: [PATCH 2/3] 1.5.3 --- position-exercise.html | 9 +++++-- styles/position-page.css | 57 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/position-exercise.html b/position-exercise.html index 8b60d474..777bb6db 100644 --- a/position-exercise.html +++ b/position-exercise.html @@ -18,8 +18,8 @@ -