From d8f75cf436ffc9449e1731d808783dc3a367b4e5 Mon Sep 17 00:00:00 2001 From: aditya2000 <33257003+aditya2000@users.noreply.github.com> Date: Sat, 3 Mar 2018 08:10:15 +0530 Subject: [PATCH 1/5] Add files via upload --- display-exercise.html | 10 ++++++++-- display-page.css | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 display-page.css diff --git a/display-exercise.html b/display-exercise.html index 433b6cba..5e375400 100644 --- a/display-exercise.html +++ b/display-exercise.html @@ -17,6 +17,12 @@ -

Placeholder!

+
+
+
+
+
+
+
- \ No newline at end of file + diff --git a/display-page.css b/display-page.css new file mode 100644 index 00000000..60ac8a2f --- /dev/null +++ b/display-page.css @@ -0,0 +1,34 @@ +main { + padding: 30px; + font-size: 0; +} +.inner-1{ + height: 200px; + width: 50%; + font-size:0; + display: inline-block; + border: 1px solid black; + +} +.inner-2{ + height: 300px; + width: 33.3%; + font-size: 0; + display: inline-block; + border: 1px solid black; +} +.inner-col-1{ + background-color: green; +} +.inner-col-2{ + background-color: blue; +} +.inner-col-3{ + background-color: grey; +} +.inner-col-4{ + background-color: black; +} +.inner-col-5{ + background-color: orange; +} From fe3d8e4559b901f8f63cd0a77388b91b6f7276bd Mon Sep 17 00:00:00 2001 From: "bw99214@gmail.com" Date: Wed, 7 Mar 2018 12:11:31 +0530 Subject: [PATCH 2/5] New Changes --- position-exercise.html | 16 +++++++------ styles/position-page.css | 52 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 8 deletions(-) diff --git a/position-exercise.html b/position-exercise.html index 8b60d474..f01699b5 100644 --- a/position-exercise.html +++ b/position-exercise.html @@ -19,16 +19,18 @@ - -
- +
+
+ + +
diff --git a/styles/position-page.css b/styles/position-page.css index 8b137891..c5f05591 100644 --- a/styles/position-page.css +++ b/styles/position-page.css @@ -1 +1,51 @@ - +nav { + position: fixed; + padding-top: 10px; + padding-left: 60px; + padding-right: 60px; + background-color: grey; + text-align: right; + display: inline-flex; + width: 100%; + height: 70px; +} +body{ + background: url(/home/khalsa/Documents/css_layout_exercises_starter_files/images/outerspace_landscape.jpeg); + background-size: cover; +} +ul { + list-style: none; +} +li { + display: inline-flex; + border-right: 2px solid black; +} +.logo { + border-radius: 50%; + border: 1px solid black; + width: 50px; + height: 50px; +} +.box { + position: relative; + border: 10px dotted green; + top: 300px; + left: 300px; + width: 600px; + height: 300px; +} +img { + border: 1px solid blue; + width: 200px; + height: 200px; +} +.img-cat{ + position: absolute; + top: -90px; + left: -90px; +} +.img-dog{ + position: absolute; + bottom: -120px; + right: -60px; +} From 55924d36f3d50fc4f670f697b30b0767b6f0d5e4 Mon Sep 17 00:00:00 2001 From: "bw99214@gmail.com" Date: Wed, 7 Mar 2018 15:01:58 +0530 Subject: [PATCH 3/5] New Change --- styles/display-page.css | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/styles/display-page.css b/styles/display-page.css index e69de29b..60ac8a2f 100644 --- a/styles/display-page.css +++ b/styles/display-page.css @@ -0,0 +1,34 @@ +main { + padding: 30px; + font-size: 0; +} +.inner-1{ + height: 200px; + width: 50%; + font-size:0; + display: inline-block; + border: 1px solid black; + +} +.inner-2{ + height: 300px; + width: 33.3%; + font-size: 0; + display: inline-block; + border: 1px solid black; +} +.inner-col-1{ + background-color: green; +} +.inner-col-2{ + background-color: blue; +} +.inner-col-3{ + background-color: grey; +} +.inner-col-4{ + background-color: black; +} +.inner-col-5{ + background-color: orange; +} From 00e8a77ca62513449754ec1094de372e8302ba77 Mon Sep 17 00:00:00 2001 From: "bw99214@gmail.com" Date: Wed, 7 Mar 2018 15:13:19 +0530 Subject: [PATCH 4/5] New changes commited --- position-exercise.html | 2 ++ styles/position-page.css | 1 + 2 files changed, 3 insertions(+) diff --git a/position-exercise.html b/position-exercise.html index f01699b5..91bc88ac 100644 --- a/position-exercise.html +++ b/position-exercise.html @@ -26,6 +26,8 @@
  • float
    • + +
    diff --git a/styles/position-page.css b/styles/position-page.css index c5f05591..60458a1a 100644 --- a/styles/position-page.css +++ b/styles/position-page.css @@ -39,6 +39,7 @@ img { width: 200px; height: 200px; } + .img-cat{ position: absolute; top: -90px; From a4e1221cc1564475539942b96d6aa756617dff37 Mon Sep 17 00:00:00 2001 From: "bw99214@gmail.com" Date: Fri, 9 Mar 2018 17:13:12 +0530 Subject: [PATCH 5/5] New Changes --- display-page.css | 34 ---------------------------------- float-exercise.html | 4 ++-- styles/float-page.css | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 36 deletions(-) delete mode 100644 display-page.css diff --git a/display-page.css b/display-page.css deleted file mode 100644 index 60ac8a2f..00000000 --- a/display-page.css +++ /dev/null @@ -1,34 +0,0 @@ -main { - padding: 30px; - font-size: 0; -} -.inner-1{ - height: 200px; - width: 50%; - font-size:0; - display: inline-block; - border: 1px solid black; - -} -.inner-2{ - height: 300px; - width: 33.3%; - font-size: 0; - display: inline-block; - border: 1px solid black; -} -.inner-col-1{ - background-color: green; -} -.inner-col-2{ - background-color: blue; -} -.inner-col-3{ - background-color: grey; -} -.inner-col-4{ - background-color: black; -} -.inner-col-5{ - background-color: orange; -} diff --git a/float-exercise.html b/float-exercise.html index 975755a0..4a60e587 100644 --- a/float-exercise.html +++ b/float-exercise.html @@ -22,9 +22,9 @@

    Nebulas

    Are they really that nebulous?

    -

    Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat. Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute.

    +

    Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat. Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute.

    Nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat. Lorem ipsum Id et non est non in occaecat nostrud fugiat in proident consequat aliquip veniam pariatur pariatur labore laboris aliqua eu et in dolore dolore dolor eu voluptate ea irure dolore nisi in sint adipisicing aliqua ad magna consequat adipisicing mollit in ad ad qui voluptate dolore et Duis proident aliquip Duis Excepteur quis eu officia proident sit aute nisi sed cillum officia velit dolore eiusmod in aute quis enim ad minim id labore aliquip elit ea elit in tempor dolor amet exercitation in laborum sint irure commodo laborum deserunt commodo ad minim officia deserunt Excepteur aute laboris qui elit laboris id in et esse laboris culpa ut nostrud Duis nulla et laborum ullamco quis deserunt elit dolor sed proident velit sed ad in in in laborum ut incididunt dolor reprehenderit sed ullamco fugiat minim Duis consequat magna cupidatat.

    - \ No newline at end of file + diff --git a/styles/float-page.css b/styles/float-page.css index 7bf3ead4..d2046ddd 100644 --- a/styles/float-page.css +++ b/styles/float-page.css @@ -10,3 +10,17 @@ main { margin-left: auto; margin-right: auto; } +.left{ + width: 350px; + height: 350px; + float: left; + padding-right: 15px; + padding-top: 15px; +} +.right{ + width: 350px; + height: 350px; + float: right; + padding-left: 15px; + padding-top: 15px; +}