From 22221d55b232064b63d789040ffe547dbfd3896e Mon Sep 17 00:00:00 2001 From: AlexandraKoz Date: Sat, 23 Jun 2018 01:44:50 +0300 Subject: [PATCH 01/10] Fixed html file and styles. --- index.html | 88 +++++++++---------- .../fontawesome-all.css | 0 .../advertising.css | 20 ++--- {styles => styles for layout}/footer.css | 10 +-- {styles => styles for layout}/header.css | 10 +-- {styles => styles for layout}/navigation.css | 6 +- .../news.css | 13 +-- styles for layout/send-message-form.css | 54 ++++++++++++ {styles => styles for layout}/style.css | 2 +- styles for layout/team.css | 40 +++++++++ styles/send-message-form.css | 54 ------------ styles/team.css | 39 -------- 12 files changed, 169 insertions(+), 167 deletions(-) rename fontawesome-all.css => styles for icons/fontawesome-all.css (100%) rename styles/news.css => styles for layout/advertising.css (57%) rename {styles => styles for layout}/footer.css (64%) rename {styles => styles for layout}/header.css (75%) rename {styles => styles for layout}/navigation.css (69%) rename styles/news-text-article.css => styles for layout/news.css (59%) create mode 100644 styles for layout/send-message-form.css rename {styles => styles for layout}/style.css (85%) create mode 100644 styles for layout/team.css delete mode 100644 styles/send-message-form.css delete mode 100644 styles/team.css diff --git a/index.html b/index.html index d8da0f4..a6d5f45 100644 --- a/index.html +++ b/index.html @@ -4,15 +4,15 @@ - - - - - - - - - + + + + + + + + + Animals @@ -26,88 +26,88 @@

-
-
DO YOU LIKE RABBITS?
-
DO YOU LIKE ORANGES?
+
+
DO YOU LIKE RABBITS?
+
DO YOU LIKE ORANGES?
-
-
+
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-

read more...

+

read more...

-
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-

read more...

+

read more...

-
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-

read more...

+

read more...

-
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-

read more...

+

read more...

-

Meet the team

+

Meet the team

-

Hoof - - Lead Designer +

Hoof + - Lead Designer

- horse + our team

Hoof is our most talantad designer. However he is not the talkative type and I would advise not getting on the wrong side of him.

-

Nibs - - CEO/Director +

Nibs + - CEO/Director

- rabbit + our team

Nibs is our go to woman. She is the ceo/director of orange rabbit and runs fast when she has too.

-

Squawk - - Developer +

Squawk + - Developer

- ostrich + our team

Squawk is no social bunny. But when it comes to programming he stands out from the crowd.

-

Send us a message...

+

Send us a message...

- -
- -
- -
+ +
+ +
+ +
- +
diff --git a/fontawesome-all.css b/styles for icons/fontawesome-all.css similarity index 100% rename from fontawesome-all.css rename to styles for icons/fontawesome-all.css diff --git a/styles/news.css b/styles for layout/advertising.css similarity index 57% rename from styles/news.css rename to styles for layout/advertising.css index 1b75717..a1b4a4c 100644 --- a/styles/news.css +++ b/styles for layout/advertising.css @@ -1,7 +1,7 @@ -.news { +.advertising { background-image: url("../image/slice-orange.png"); - border-bottom: 2px orange solid; - border-top: 2px orange solid; + border-bottom: 2px rgb(255, 165, 0) solid; + border-top: 2px rgb(255, 165, 0) solid; height: 400px; font-family: Helvetica, sans-serif; font-weight: bold; @@ -11,23 +11,23 @@ position: relative; font-size: 35px; } -.news__do-you-like-rabbits-text { +.advertising__first-transparent-text { position: absolute; top: 130px; left: 155px; letter-spacing: 1px; - background-color: black; - opacity: 0.8; - color: orange; + background-color: rgb(0, 0, 0); + opacity: 0.6; + color: rgb(255, 165, 0); padding: 5px; } -.news__do-you-like-oranges-text { +.advertising__second-transparent-text { position: absolute; top: 225px; left: 150px; letter-spacing: 1px; - background-color: orange; + background-color: rgb(255, 165, 0); opacity: 0.8; - color: grey; + color: rgb(128, 128, 128); padding: 10px; } \ No newline at end of file diff --git a/styles/footer.css b/styles for layout/footer.css similarity index 64% rename from styles/footer.css rename to styles for layout/footer.css index e1d8c3c..0be9a88 100644 --- a/styles/footer.css +++ b/styles for layout/footer.css @@ -1,19 +1,19 @@ .footer { position: relative; max-width: 1400px; - background-color: orange; + background-color: rgb(255, 165, 0); text-align: center; height: 70px; - margin-top: 30px; + margin: 30px 0 0 0; } .footer-wrapper { - margin-left: 75px; + margin: 0 0 0 75px; max-width: 1200px; padding: 18px; } .footer__copyright { text-transform: uppercase; font-family: Helvetica, sans-serif; - font-size: 25px; - color: white; + font-size: 20px; + color: rgb(255, 255, 255); } \ No newline at end of file diff --git a/styles/header.css b/styles for layout/header.css similarity index 75% rename from styles/header.css rename to styles for layout/header.css index d4090aa..2862186 100644 --- a/styles/header.css +++ b/styles for layout/header.css @@ -1,25 +1,25 @@ header { height: 70px; - background-color: white; + background-color: rgb(255, 255, 255); max-width: 1200px; margin: 0 auto; font-family: Helvetica, sans-serif; } .logo { width: 15%; - padding-left: 60px; + padding: 0 0 0 60px; display: inline-block; } .logo__orange-text { - color: orange; + color: rgb(255, 165, 0); font-family: Helvetica, sans-serif; letter-spacing: 3px; font-size: 20px; position: relative; - margin-left: 80px; + margin: 0 0 0 80px; } .logo__rabbit-text { - color: grey; + color: rgb(128, 128, 128); font-family: Helvetica, sans-serif; letter-spacing: 2px; display: block; diff --git a/styles/navigation.css b/styles for layout/navigation.css similarity index 69% rename from styles/navigation.css rename to styles for layout/navigation.css index 69dd11d..1125edc 100644 --- a/styles/navigation.css +++ b/styles for layout/navigation.css @@ -1,13 +1,13 @@ .navigation { - padding-left: 390px; + padding : 0 0 0 390px; display: inline-block; max-width: 1200px; margin: 0 auto; } -.navigation__button { +.navigation__item { display: block; float: right; padding: 22px 25px 5px 25px; - color: gray; + color: rgb(128, 128, 128); font-size: 20px; } \ No newline at end of file diff --git a/styles/news-text-article.css b/styles for layout/news.css similarity index 59% rename from styles/news-text-article.css rename to styles for layout/news.css index e27a8ff..aa660a3 100644 --- a/styles/news-text-article.css +++ b/styles for layout/news.css @@ -1,17 +1,18 @@ -.news-text-article { +.news { max-width: 1200px; margin: 0 auto; - padding-left: 85px; + padding: 0 0 0 85px; } -.news-text-article__item { +.news__item { width: 17.5em; display: inline-block; padding: 22px 22px 23px 20px; font-size: 13px; } -.news-text-article__more { - color: orange; +.news__more a { + color: rgb(255, 165, 0); font-family: Helvetica, sans-serif; - text-align: right; + padding: 0 0 0 150px; font-size: 13px; + font-style: italic; } \ No newline at end of file diff --git a/styles for layout/send-message-form.css b/styles for layout/send-message-form.css new file mode 100644 index 0000000..88a76d8 --- /dev/null +++ b/styles for layout/send-message-form.css @@ -0,0 +1,54 @@ +.send-message { + max-width: 1200px; + padding: 37px 0 76px 0; + margin: 0 auto; +} +.send-message__text { + margin: 0 0 50px 0; + font-family: Helvetica, sans-serif; + text-decoration: underline; + font-size: 30px; + letter-spacing: 3px; + text-align: center; + color: rgb(255, 165, 0); +} +.send-message__form { + font-family: Helvetica, sans-serif; + color: rgb(255, 165, 0); + font-size: 25px; + margin: 0 0 0 30px; +} +.send-message__enter { + margin: 0 30px 0 0; + width: 1000px; + float: right; + border: none; + background-color: rgb(242, 242, 242); + box-shadow: inset 45px 44px 1px -40px rgb(179, 179, 179); +} +.send-message__button { + float: right; + background-color: rgb(255, 165, 0); + color: rgb(255, 255, 255); + font-family: Helvetica, sans-serif; + font-size: 25px; + padding: 5px 40px; + border: 1px solid rgb(255, 165, 0); + margin: 20px 80px 0 0; + box-shadow: 0px 2px 1px 0px rgb(255, 140, 0); + cursor: pointer; +} +.send-message__name, .send-message__email { + margin: 0 30px 0 0; + width: 1000px; + float: right; + border: none; + background-color: rgb(242, 242, 242); + box-shadow: inset 45px 44px 1px -40px rgb(179, 179, 179); + margin: 0 32px 25px 0; + height: 30px; +} +.send-message__label { + display: inline-block; + margin: 0 0 30px 0; +} \ No newline at end of file diff --git a/styles/style.css b/styles for layout/style.css similarity index 85% rename from styles/style.css rename to styles for layout/style.css index 0de598c..5c8e80b 100644 --- a/styles/style.css +++ b/styles for layout/style.css @@ -10,5 +10,5 @@ a, p, h1, ul, li, fieldset { border-width: 0px; } a { - color: gray; + color: rgb(128, 128, 128); } \ No newline at end of file diff --git a/styles for layout/team.css b/styles for layout/team.css new file mode 100644 index 0000000..12edc55 --- /dev/null +++ b/styles for layout/team.css @@ -0,0 +1,40 @@ +.team { + max-width: 1200px; + display: grid; + grid-template-columns: 33.333% 33.333% 33.333%; + grid-template-rows: 33.333% 33.333% 33.333%; + margin: 0 0 0 40px; +} +.team__meet-text { + color: rgb(255, 165, 0); + text-align: center; + font-size: 30px; + font-family: Helvetica, sans-serif; + margin: 20px 0 36px 0; + text-decoration: underline; +} +.team-member { + justify-self: center; + margin: 0 0 0 90px; +} +.team-member__person-name { + text-align: center; + font-family: Helvetica, sans-serif; + margin: 0 0 25px 0; + color: rgb(128, 128, 128); +} +.team-member__person-post { + text-align: center; + font-family: Helvetica, sans-serif; + margin: 0 0 25px 0; + color: rgb(255, 165, 0); +} +.team-member__image { + border-radius: 50%; + border: 5px rgb(255, 165, 0) solid; +} +.team-member__description { + margin: 30px 0 0 0; + font-family: Helvetica, sans-serif; + font-size: 15px; +} \ No newline at end of file diff --git a/styles/send-message-form.css b/styles/send-message-form.css deleted file mode 100644 index 054b040..0000000 --- a/styles/send-message-form.css +++ /dev/null @@ -1,54 +0,0 @@ -.send-message { - max-width: 1200px; - padding: 37px 0 76px 0; - margin: 0 auto; -} -.send-message__text { - margin-bottom: 50px; - font-family: Helvetica, sans-serif; - font-size: 30px; - letter-spacing: 3px; - text-align: center; - color: orange; -} -.send-message__form { - font-family: Helvetica, sans-serif; - color: orange; - font-size: 25px; - margin-left: 30px; -} -fieldset input, fieldset textarea{ - margin-right: 30px; - width: 1000px; - float: right; - border: none; - background-color: #f2f2f2; - box-shadow: inset 45px 44px 1px -40px #b3b3b3; -} -[type="submit"]{ - float: right; - background-color: orange; - color: white; - font-family: Helvetica, sans-serif; - font-size: 25px; - padding: 5px 40px; - border: 1px solid orange; - margin-top: 20px; - margin-right: 80px; - box-shadow: 0px 2px 1px 0px darkorange; - cursor: pointer; -} -input[type="text"], input[type="email"] { - margin-bottom: 25px; - height: 30px; -} -/*label[for="name"], label[for="email"], label[for="message"] { - padding: 10px; -} -.send-message-form__full { - margin: 15px; -}*/ -label { - display: inline-block; - margin-bottom: 30px; -} \ No newline at end of file diff --git a/styles/team.css b/styles/team.css deleted file mode 100644 index 3cbae58..0000000 --- a/styles/team.css +++ /dev/null @@ -1,39 +0,0 @@ -.team { - max-width: 1200px; - display: grid; - grid-template-columns: 33.3% 33.3% 33.3%; - grid-template-rows: 33.3% 33.3% 33.3%; - margin-left: 40px; -} -.team__meet-text { - color: orange; - text-align: center; - font-size: 30px; - font-family: Helvetica, sans-serif; - margin-top: 20px; - margin-bottom: 36px; -} -.team-member { - justify-self: center; - margin-left: 90px; -} -.team-member__name { - text-align: center; - font-family: Helvetica, sans-serif; - margin-bottom: 25px; -} -.team-member__name-person { - color: grey; -} -.team-member__name-post { - color: orange; -} -.team-member__image { - border-radius: 50%; - border: 5px orange solid; -} -.team-member__description { - margin-top: 30px; - font-family: Helvetica, sans-serif; - font-size: 15px; -} \ No newline at end of file From 92c6c60e96ede4bf0d0094ae726bd7a4c0895da0 Mon Sep 17 00:00:00 2001 From: AlexandraKoz Date: Sat, 23 Jun 2018 16:02:25 +0300 Subject: [PATCH 02/10] Fixed all problems. --- index.html | 8 ++- styles for layout/advertising.css | 49 +++++++++------ styles for layout/footer.css | 24 +++++--- styles for layout/header.css | 43 ++++++++----- styles for layout/navigation.css | 14 +++-- styles for layout/news.css | 23 ++++--- styles for layout/{style.css => reset.css} | 22 +++++-- styles for layout/send-message-form.css | 72 ++++++++++++++-------- styles for layout/team.css | 54 +++++++++++----- 9 files changed, 206 insertions(+), 103 deletions(-) rename styles for layout/{style.css => reset.css} (70%) diff --git a/index.html b/index.html index a6d5f45..b68aafa 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ - + @@ -66,8 +66,9 @@

-

Meet the team

-
+
+

Meet the team

+

Hoof - Lead Designer @@ -95,6 +96,7 @@

Squawk is no social bunny. But when it comes to programming he stands out from the crowd.

+

Send us a message...

diff --git a/styles for layout/advertising.css b/styles for layout/advertising.css index a1b4a4c..aa0f9d3 100644 --- a/styles for layout/advertising.css +++ b/styles for layout/advertising.css @@ -1,33 +1,46 @@ -.advertising { - background-image: url("../image/slice-orange.png"); - border-bottom: 2px rgb(255, 165, 0) solid; - border-top: 2px rgb(255, 165, 0) solid; - height: 400px; +.advertising +{ font-family: Helvetica, sans-serif; + font-size: 35px; font-weight: bold; - margin: 0 auto; - overflow: hidden; - clear: both; + position: relative; - font-size: 35px; + + clear: both; + overflow: hidden; + + height: 400px; + margin: 0 auto; + + border-top: 2px rgb(255, 165, 0) solid; + border-bottom: 2px rgb(255, 165, 0) solid; + background-image: url('../image/slice-orange.png'); } -.advertising__first-transparent-text { +.advertising__first-transparent-text +{ position: absolute; top: 130px; left: 155px; + + padding: 5px; + letter-spacing: 1px; - background-color: rgb(0, 0, 0); - opacity: 0.6; + + opacity: .6; color: rgb(255, 165, 0); - padding: 5px; + background-color: rgb(0, 0, 0); } -.advertising__second-transparent-text { +.advertising__second-transparent-text +{ position: absolute; top: 225px; left: 150px; + + padding: 10px; + letter-spacing: 1px; - background-color: rgb(255, 165, 0); - opacity: 0.8; + + opacity: .8; color: rgb(128, 128, 128); - padding: 10px; -} \ No newline at end of file + background-color: rgb(255, 165, 0); +} diff --git a/styles for layout/footer.css b/styles for layout/footer.css index 0be9a88..d39747e 100644 --- a/styles for layout/footer.css +++ b/styles for layout/footer.css @@ -1,19 +1,27 @@ -.footer { +.footer +{ position: relative; + max-width: 1400px; - background-color: rgb(255, 165, 0); - text-align: center; height: 70px; margin: 30px 0 0 0; + + text-align: center; + + background-color: rgb(255, 165, 0); } -.footer-wrapper { - margin: 0 0 0 75px; +.footer-wrapper +{ max-width: 1200px; + margin: 0 0 0 75px; padding: 18px; } -.footer__copyright { - text-transform: uppercase; +.footer__copyright +{ font-family: Helvetica, sans-serif; font-size: 20px; + + text-transform: uppercase; + color: rgb(255, 255, 255); -} \ No newline at end of file +} diff --git a/styles for layout/header.css b/styles for layout/header.css index 2862186..84ce314 100644 --- a/styles for layout/header.css +++ b/styles for layout/header.css @@ -1,30 +1,45 @@ -header { - height: 70px; - background-color: rgb(255, 255, 255); +header +{ + font-family: Helvetica, sans-serif; + max-width: 1200px; + height: 70px; margin: 0 auto; - font-family: Helvetica, sans-serif; + + background-color: rgb(255, 255, 255); } -.logo { +.logo +{ + display: inline-block; + width: 15%; padding: 0 0 0 60px; - display: inline-block; } -.logo__orange-text { - color: rgb(255, 165, 0); +.logo__orange-text +{ font-family: Helvetica, sans-serif; - letter-spacing: 3px; font-size: 20px; + position: relative; + margin: 0 0 0 80px; + + letter-spacing: 3px; + + color: rgb(255, 165, 0); } -.logo__rabbit-text { - color: rgb(128, 128, 128); +.logo__rabbit-text +{ font-family: Helvetica, sans-serif; - letter-spacing: 2px; - display: block; font-size: 25px; + + display: block; + + letter-spacing: 2px; + + color: rgb(128, 128, 128); } -.logo__image { +.logo__image +{ float: left; } \ No newline at end of file diff --git a/styles for layout/navigation.css b/styles for layout/navigation.css index 1125edc..192e4b9 100644 --- a/styles for layout/navigation.css +++ b/styles for layout/navigation.css @@ -1,13 +1,19 @@ -.navigation { - padding : 0 0 0 390px; +.navigation +{ display: inline-block; + max-width: 1200px; margin: 0 auto; + padding: 0 0 0 390px; } -.navigation__item { +.navigation__item +{ + font-size: 20px; + display: block; float: right; + padding: 22px 25px 5px 25px; + color: rgb(128, 128, 128); - font-size: 20px; } \ No newline at end of file diff --git a/styles for layout/news.css b/styles for layout/news.css index aa660a3..addde9c 100644 --- a/styles for layout/news.css +++ b/styles for layout/news.css @@ -1,18 +1,25 @@ -.news { +.news +{ max-width: 1200px; margin: 0 auto; padding: 0 0 0 85px; } -.news__item { - width: 17.5em; +.news__item +{ + font-size: 13px; + display: inline-block; + + width: 17.5em; padding: 22px 22px 23px 20px; - font-size: 13px; } -.news__more a { - color: rgb(255, 165, 0); +.news__more a +{ font-family: Helvetica, sans-serif; - padding: 0 0 0 150px; font-size: 13px; font-style: italic; -} \ No newline at end of file + + padding: 0 0 0 150px; + + color: rgb(255, 165, 0); +} diff --git a/styles for layout/style.css b/styles for layout/reset.css similarity index 70% rename from styles for layout/style.css rename to styles for layout/reset.css index 5c8e80b..a0caed9 100644 --- a/styles for layout/style.css +++ b/styles for layout/reset.css @@ -1,14 +1,24 @@ -body { +body +{ + max-width: 1400px; margin: 0 auto; padding: 0; - max-width: 1400px; } -a, p, h1, ul, li, fieldset { +a, +p, +h1, +ul, +li, +fieldset +{ margin: 0; padding: 0; + text-decoration: none; - border-width: 0px; + + border-width: 0; } -a { +a +{ color: rgb(128, 128, 128); -} \ No newline at end of file +} diff --git a/styles for layout/send-message-form.css b/styles for layout/send-message-form.css index 88a76d8..5894d79 100644 --- a/styles for layout/send-message-form.css +++ b/styles for layout/send-message-form.css @@ -1,54 +1,76 @@ -.send-message { +.send-message +{ max-width: 1200px; - padding: 37px 0 76px 0; margin: 0 auto; + padding: 37px 0 76px 0; } -.send-message__text { - margin: 0 0 50px 0; +.send-message__text +{ font-family: Helvetica, sans-serif; - text-decoration: underline; font-size: 30px; - letter-spacing: 3px; + + margin: 0 0 50px 0; + text-align: center; + text-decoration: underline; + letter-spacing: 3px; + color: rgb(255, 165, 0); } -.send-message__form { +.send-message__form +{ font-family: Helvetica, sans-serif; - color: rgb(255, 165, 0); font-size: 25px; + margin: 0 0 0 30px; + + color: rgb(255, 165, 0); } -.send-message__enter { - margin: 0 30px 0 0; - width: 1000px; +.send-message__enter +{ float: right; + + width: 1000px; + margin: 0 30px 0 0; + border: none; background-color: rgb(242, 242, 242); box-shadow: inset 45px 44px 1px -40px rgb(179, 179, 179); } -.send-message__button { - float: right; - background-color: rgb(255, 165, 0); - color: rgb(255, 255, 255); +.send-message__button +{ font-family: Helvetica, sans-serif; font-size: 25px; - padding: 5px 40px; - border: 1px solid rgb(255, 165, 0); + + float: right; + margin: 20px 80px 0 0; - box-shadow: 0px 2px 1px 0px rgb(255, 140, 0); + padding: 5px 40px; + cursor: pointer; + + color: rgb(255, 255, 255); + border: 1px solid rgb(255, 165, 0); + background-color: rgb(255, 165, 0); + box-shadow: 0 2px 1px 0 rgb(255, 140, 0); } -.send-message__name, .send-message__email { - margin: 0 30px 0 0; - width: 1000px; +.send-message__name, +.send-message__email +{ float: right; + + width: 1000px; + height: 30px; + margin: 0 30px 0 0; + margin: 0 32px 25px 0; + border: none; background-color: rgb(242, 242, 242); box-shadow: inset 45px 44px 1px -40px rgb(179, 179, 179); - margin: 0 32px 25px 0; - height: 30px; } -.send-message__label { +.send-message__label +{ display: inline-block; + margin: 0 0 30px 0; -} \ No newline at end of file +} diff --git a/styles for layout/team.css b/styles for layout/team.css index 12edc55..eb65539 100644 --- a/styles for layout/team.css +++ b/styles for layout/team.css @@ -1,40 +1,60 @@ -.team { - max-width: 1200px; +.team__all-members +{ display: grid; + + max-width: 1200px; + margin: 0 0 0 40px; + grid-template-columns: 33.333% 33.333% 33.333%; grid-template-rows: 33.333% 33.333% 33.333%; - margin: 0 0 0 40px; } -.team__meet-text { - color: rgb(255, 165, 0); - text-align: center; - font-size: 30px; +.team__meet-text +{ font-family: Helvetica, sans-serif; + font-size: 30px; + margin: 20px 0 36px 0; + + text-align: center; text-decoration: underline; + + color: rgb(255, 165, 0); } -.team-member { - justify-self: center; +.team-member +{ margin: 0 0 0 90px; + + justify-self: center; } -.team-member__person-name { - text-align: center; +.team-member__person-name +{ font-family: Helvetica, sans-serif; + margin: 0 0 25px 0; + + text-align: center; + color: rgb(128, 128, 128); } -.team-member__person-post { - text-align: center; +.team-member__person-post +{ font-family: Helvetica, sans-serif; + margin: 0 0 25px 0; + + text-align: center; + color: rgb(255, 165, 0); } -.team-member__image { - border-radius: 50%; +.team-member__image +{ border: 5px rgb(255, 165, 0) solid; + border-radius: 50%; } -.team-member__description { - margin: 30px 0 0 0; +.team-member__description +{ font-family: Helvetica, sans-serif; font-size: 15px; + + margin: 30px 0 0 0; } \ No newline at end of file From a57163c1ffa5f3138c336b7de0d709251e042cdd Mon Sep 17 00:00:00 2001 From: AlexandraKoz Date: Mon, 25 Jun 2018 22:25:51 +0300 Subject: [PATCH 03/10] Fixed file folders, header, advertising and add new style file. --- index.html | 51 ++++++++++++------- {styles for layout => styles}/advertising.css | 6 ++- {styles for layout => styles}/footer.css | 0 .../for icons}/fontawesome-all.css | 0 styles/header.css | 10 ++++ .../header.css => styles/logo.css | 13 +---- {styles for layout => styles}/navigation.css | 0 {styles for layout => styles}/news.css | 0 {styles for layout => styles}/reset.css | 0 .../send-message-form.css | 0 {styles for layout => styles}/team.css | 0 11 files changed, 48 insertions(+), 32 deletions(-) rename {styles for layout => styles}/advertising.css (87%) rename {styles for layout => styles}/footer.css (100%) rename {styles for icons => styles/for icons}/fontawesome-all.css (100%) create mode 100644 styles/header.css rename styles for layout/header.css => styles/logo.css (71%) rename {styles for layout => styles}/navigation.css (100%) rename {styles for layout => styles}/news.css (100%) rename {styles for layout => styles}/reset.css (100%) rename {styles for layout => styles}/send-message-form.css (100%) rename {styles for layout => styles}/team.css (100%) diff --git a/index.html b/index.html index b68aafa..d632919 100644 --- a/index.html +++ b/index.html @@ -4,39 +4,52 @@ - - - - - - - - - + + + + + + + + + + Animals
-
DO YOU LIKE RABBITS?
-
DO YOU LIKE ORANGES?
+
do you like rabbits?
+
do you like oranges?
diff --git a/styles for layout/advertising.css b/styles/advertising.css similarity index 87% rename from styles for layout/advertising.css rename to styles/advertising.css index aa0f9d3..95cb669 100644 --- a/styles for layout/advertising.css +++ b/styles/advertising.css @@ -16,13 +16,14 @@ border-bottom: 2px rgb(255, 165, 0) solid; background-image: url('../image/slice-orange.png'); } -.advertising__first-transparent-text +.advertising__title { position: absolute; top: 130px; left: 155px; padding: 5px; + text-transform: uppercase; letter-spacing: 1px; @@ -30,13 +31,14 @@ color: rgb(255, 165, 0); background-color: rgb(0, 0, 0); } -.advertising__second-transparent-text +.advertising__inscription { position: absolute; top: 225px; left: 150px; padding: 10px; + text-transform: uppercase; letter-spacing: 1px; diff --git a/styles for layout/footer.css b/styles/footer.css similarity index 100% rename from styles for layout/footer.css rename to styles/footer.css diff --git a/styles for icons/fontawesome-all.css b/styles/for icons/fontawesome-all.css similarity index 100% rename from styles for icons/fontawesome-all.css rename to styles/for icons/fontawesome-all.css diff --git a/styles/header.css b/styles/header.css new file mode 100644 index 0000000..977cb36 --- /dev/null +++ b/styles/header.css @@ -0,0 +1,10 @@ +.header +{ + font-family: Helvetica, sans-serif; + + max-width: 1200px; + height: 70px; + margin: 0 auto; + + background-color: rgb(255, 255, 255); +} \ No newline at end of file diff --git a/styles for layout/header.css b/styles/logo.css similarity index 71% rename from styles for layout/header.css rename to styles/logo.css index 84ce314..9580460 100644 --- a/styles for layout/header.css +++ b/styles/logo.css @@ -1,13 +1,3 @@ -header -{ - font-family: Helvetica, sans-serif; - - max-width: 1200px; - height: 70px; - margin: 0 auto; - - background-color: rgb(255, 255, 255); -} .logo { display: inline-block; @@ -15,7 +5,7 @@ header width: 15%; padding: 0 0 0 60px; } -.logo__orange-text +.logo__color-text { font-family: Helvetica, sans-serif; font-size: 20px; @@ -34,6 +24,7 @@ header font-size: 25px; display: block; + text-transform: uppercase; letter-spacing: 2px; diff --git a/styles for layout/navigation.css b/styles/navigation.css similarity index 100% rename from styles for layout/navigation.css rename to styles/navigation.css diff --git a/styles for layout/news.css b/styles/news.css similarity index 100% rename from styles for layout/news.css rename to styles/news.css diff --git a/styles for layout/reset.css b/styles/reset.css similarity index 100% rename from styles for layout/reset.css rename to styles/reset.css diff --git a/styles for layout/send-message-form.css b/styles/send-message-form.css similarity index 100% rename from styles for layout/send-message-form.css rename to styles/send-message-form.css diff --git a/styles for layout/team.css b/styles/team.css similarity index 100% rename from styles for layout/team.css rename to styles/team.css From e395a0aef6b5e235643d30105e2ec02c66c81273 Mon Sep 17 00:00:00 2001 From: AlexandraKoz Date: Wed, 27 Jun 2018 23:19:06 +0300 Subject: [PATCH 04/10] Fixed send message form. --- index.html | 43 ++++++------ styles/news.css | 6 ++ styles/reset.css | 66 +++++++++++++------ ...send-message-form.css => send-message.css} | 10 +-- styles/team.css | 4 +- 5 files changed, 80 insertions(+), 49 deletions(-) rename styles/{send-message-form.css => send-message.css} (92%) diff --git a/index.html b/index.html index d632919..8b0037a 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,7 @@ - + Animals @@ -57,7 +57,9 @@

tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-

read more...

+

+ read more... +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod @@ -78,34 +80,33 @@

read more...

-
-
-

Meet the team

+
+

Meet the team

-

Hoof +

Hoof - Lead Designer -

- our team +

+ member of our team

Hoof is our most talantad designer. However he is not the talkative type and I would advise not getting on the wrong side of him.

-

Nibs +

Nibs - CEO/Director -

- our team +

+ member of our team

Nibs is our go to woman. She is the ceo/director of orange rabbit and runs fast when she has too.

-

Squawk +

Squawk - Developer -

- our team +

+ member of our team

Squawk is no social bunny. But when it comes to programming he stands out from the crowd.

@@ -115,14 +116,14 @@

Send us a message...

- -
- -
- -
+ +
+ +
+ +
- +

diff --git a/styles/news.css b/styles/news.css index addde9c..860c704 100644 --- a/styles/news.css +++ b/styles/news.css @@ -23,3 +23,9 @@ color: rgb(255, 165, 0); } +.news__line { + background-image: linear-gradient(black, black); + background-size: 100% 1px; + background-position: left bottom; + background-repeat: no-repeat; +} \ No newline at end of file diff --git a/styles/reset.css b/styles/reset.css index a0caed9..af94440 100644 --- a/styles/reset.css +++ b/styles/reset.css @@ -1,24 +1,48 @@ -body -{ - max-width: 1400px; - margin: 0 auto; - padding: 0; -} -a, -p, -h1, -ul, -li, -fieldset -{ - margin: 0; - padding: 0; - - text-decoration: none; +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ - border-width: 0; +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; } -a -{ - color: rgb(128, 128, 128); +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; } +table { + border-collapse: collapse; + border-spacing: 0; +} \ No newline at end of file diff --git a/styles/send-message-form.css b/styles/send-message.css similarity index 92% rename from styles/send-message-form.css rename to styles/send-message.css index 5894d79..623ee26 100644 --- a/styles/send-message-form.css +++ b/styles/send-message.css @@ -26,7 +26,7 @@ color: rgb(255, 165, 0); } -.send-message__enter +.form__enter { float: right; @@ -37,7 +37,7 @@ background-color: rgb(242, 242, 242); box-shadow: inset 45px 44px 1px -40px rgb(179, 179, 179); } -.send-message__button +.form__button { font-family: Helvetica, sans-serif; font-size: 25px; @@ -54,8 +54,8 @@ background-color: rgb(255, 165, 0); box-shadow: 0 2px 1px 0 rgb(255, 140, 0); } -.send-message__name, -.send-message__email +.form__name, +.form__email { float: right; @@ -68,7 +68,7 @@ background-color: rgb(242, 242, 242); box-shadow: inset 45px 44px 1px -40px rgb(179, 179, 179); } -.send-message__label +.form__label { display: inline-block; diff --git a/styles/team.css b/styles/team.css index eb65539..0cafd07 100644 --- a/styles/team.css +++ b/styles/team.css @@ -11,10 +11,10 @@ .team__meet-text { font-family: Helvetica, sans-serif; - font-size: 30px; + font-size: 40px; margin: 20px 0 36px 0; - + border-top: 1px solid gray; text-align: center; text-decoration: underline; From d463c8cfea443a3604ded98f531719036dbeab7f Mon Sep 17 00:00:00 2001 From: AlexandraKoz Date: Wed, 27 Jun 2018 23:42:12 +0300 Subject: [PATCH 05/10] Fixed colors. --- styles/advertising.css | 12 ++++++------ styles/footer.css | 4 ++-- styles/header.css | 2 +- styles/logo.css | 5 ++--- styles/navigation.css | 2 +- styles/news.css | 8 +------- styles/reset.css | 1 + styles/send-message.css | 20 ++++++++++---------- styles/team.css | 10 +++++----- 9 files changed, 29 insertions(+), 35 deletions(-) diff --git a/styles/advertising.css b/styles/advertising.css index 95cb669..6947c02 100644 --- a/styles/advertising.css +++ b/styles/advertising.css @@ -12,8 +12,8 @@ height: 400px; margin: 0 auto; - border-top: 2px rgb(255, 165, 0) solid; - border-bottom: 2px rgb(255, 165, 0) solid; + border-top: 2px solid #ffa500; + border-bottom: 2px solid #ffa500; background-image: url('../image/slice-orange.png'); } .advertising__title @@ -28,8 +28,8 @@ letter-spacing: 1px; opacity: .6; - color: rgb(255, 165, 0); - background-color: rgb(0, 0, 0); + color: #ffa500; + background-color: #000000; } .advertising__inscription { @@ -43,6 +43,6 @@ letter-spacing: 1px; opacity: .8; - color: rgb(128, 128, 128); - background-color: rgb(255, 165, 0); + color: #808080; + background-color: #ffa500; } diff --git a/styles/footer.css b/styles/footer.css index d39747e..65c315d 100644 --- a/styles/footer.css +++ b/styles/footer.css @@ -8,7 +8,7 @@ text-align: center; - background-color: rgb(255, 165, 0); + background-color: #ffa500; } .footer-wrapper { @@ -23,5 +23,5 @@ text-transform: uppercase; - color: rgb(255, 255, 255); + color: #808080; } diff --git a/styles/header.css b/styles/header.css index 977cb36..26a1a08 100644 --- a/styles/header.css +++ b/styles/header.css @@ -6,5 +6,5 @@ height: 70px; margin: 0 auto; - background-color: rgb(255, 255, 255); + background-color: #ffffff; } \ No newline at end of file diff --git a/styles/logo.css b/styles/logo.css index 9580460..edf9038 100644 --- a/styles/logo.css +++ b/styles/logo.css @@ -2,7 +2,6 @@ { display: inline-block; - width: 15%; padding: 0 0 0 60px; } .logo__color-text @@ -16,7 +15,7 @@ letter-spacing: 3px; - color: rgb(255, 165, 0); + color: #ffa500; } .logo__rabbit-text { @@ -28,7 +27,7 @@ letter-spacing: 2px; - color: rgb(128, 128, 128); + color: #808080; } .logo__image { diff --git a/styles/navigation.css b/styles/navigation.css index 192e4b9..7d9e34d 100644 --- a/styles/navigation.css +++ b/styles/navigation.css @@ -15,5 +15,5 @@ padding: 22px 25px 5px 25px; - color: rgb(128, 128, 128); + color: #808080; } \ No newline at end of file diff --git a/styles/news.css b/styles/news.css index 860c704..e7c8014 100644 --- a/styles/news.css +++ b/styles/news.css @@ -21,11 +21,5 @@ padding: 0 0 0 150px; - color: rgb(255, 165, 0); -} -.news__line { - background-image: linear-gradient(black, black); - background-size: 100% 1px; - background-position: left bottom; - background-repeat: no-repeat; + color: #ffa500; } \ No newline at end of file diff --git a/styles/reset.css b/styles/reset.css index af94440..70e4555 100644 --- a/styles/reset.css +++ b/styles/reset.css @@ -22,6 +22,7 @@ time, mark, audio, video { font-size: 100%; font: inherit; vertical-align: baseline; + text-decoration: none; } /* HTML5 display-role reset for older browsers */ article, aside, details, figcaption, figure, diff --git a/styles/send-message.css b/styles/send-message.css index 623ee26..67a1628 100644 --- a/styles/send-message.css +++ b/styles/send-message.css @@ -15,7 +15,7 @@ text-decoration: underline; letter-spacing: 3px; - color: rgb(255, 165, 0); + color: #ffa500; } .send-message__form { @@ -24,7 +24,7 @@ margin: 0 0 0 30px; - color: rgb(255, 165, 0); + color: #ffa500; } .form__enter { @@ -34,8 +34,8 @@ margin: 0 30px 0 0; border: none; - background-color: rgb(242, 242, 242); - box-shadow: inset 45px 44px 1px -40px rgb(179, 179, 179); + background-color: #f2f2f2; + box-shadow: inset 45px 44px 1px -40px #b3b3b3; } .form__button { @@ -49,10 +49,10 @@ cursor: pointer; - color: rgb(255, 255, 255); - border: 1px solid rgb(255, 165, 0); - background-color: rgb(255, 165, 0); - box-shadow: 0 2px 1px 0 rgb(255, 140, 0); + color: #ffffff; + border: 1px solid #ffa500; + background-color: #ffa500; + box-shadow: 0 2px 1px 0 #ff8c00; } .form__name, .form__email @@ -65,8 +65,8 @@ margin: 0 32px 25px 0; border: none; - background-color: rgb(242, 242, 242); - box-shadow: inset 45px 44px 1px -40px rgb(179, 179, 179); + background-color: #f2f2f2; + box-shadow: inset 45px 44px 1px -40px #b3b3b3; } .form__label { diff --git a/styles/team.css b/styles/team.css index 0cafd07..603b84d 100644 --- a/styles/team.css +++ b/styles/team.css @@ -14,11 +14,11 @@ font-size: 40px; margin: 20px 0 36px 0; - border-top: 1px solid gray; + border-top: 1px solid #808080; text-align: center; text-decoration: underline; - color: rgb(255, 165, 0); + color: #ffa500; } .team-member { @@ -34,7 +34,7 @@ text-align: center; - color: rgb(128, 128, 128); + color: #808080; } .team-member__person-post { @@ -44,11 +44,11 @@ text-align: center; - color: rgb(255, 165, 0); + color: #ffa500; } .team-member__image { - border: 5px rgb(255, 165, 0) solid; + border: 5px solid #ffa500; border-radius: 50%; } .team-member__description From d20c8d5792c8956f9d0de9369fce18a24fd6ab1c Mon Sep 17 00:00:00 2001 From: AlexandraKoz Date: Thu, 28 Jun 2018 00:14:15 +0300 Subject: [PATCH 06/10] Fixed grid. --- index.html | 4 ++-- styles/footer.css | 3 +-- styles/header.css | 1 - styles/logo.css | 2 +- styles/navigation.css | 2 -- styles/news.css | 3 +-- styles/{ => reset}/reset.css | 0 styles/send-message.css | 1 - styles/team.css | 10 ++++------ 9 files changed, 9 insertions(+), 17 deletions(-) rename styles/{ => reset}/reset.css (100%) diff --git a/index.html b/index.html index 8b0037a..aa28722 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ - + @@ -81,7 +81,7 @@

-

Meet the team

+

Meet the team

Hoof diff --git a/styles/footer.css b/styles/footer.css index 65c315d..bd7dd17 100644 --- a/styles/footer.css +++ b/styles/footer.css @@ -12,7 +12,6 @@ } .footer-wrapper { - max-width: 1200px; margin: 0 0 0 75px; padding: 18px; } @@ -23,5 +22,5 @@ text-transform: uppercase; - color: #808080; + color: #ffffff; } diff --git a/styles/header.css b/styles/header.css index 26a1a08..d4b9e34 100644 --- a/styles/header.css +++ b/styles/header.css @@ -2,7 +2,6 @@ { font-family: Helvetica, sans-serif; - max-width: 1200px; height: 70px; margin: 0 auto; diff --git a/styles/logo.css b/styles/logo.css index edf9038..024ef22 100644 --- a/styles/logo.css +++ b/styles/logo.css @@ -2,7 +2,7 @@ { display: inline-block; - padding: 0 0 0 60px; + padding: 0 0 0 130px; } .logo__color-text { diff --git a/styles/navigation.css b/styles/navigation.css index 7d9e34d..87802fd 100644 --- a/styles/navigation.css +++ b/styles/navigation.css @@ -2,7 +2,6 @@ { display: inline-block; - max-width: 1200px; margin: 0 auto; padding: 0 0 0 390px; } @@ -10,7 +9,6 @@ { font-size: 20px; - display: block; float: right; padding: 22px 25px 5px 25px; diff --git a/styles/news.css b/styles/news.css index e7c8014..05c3e9d 100644 --- a/styles/news.css +++ b/styles/news.css @@ -1,8 +1,7 @@ .news { - max-width: 1200px; margin: 0 auto; - padding: 0 0 0 85px; + padding: 0 0 0 130px; } .news__item { diff --git a/styles/reset.css b/styles/reset/reset.css similarity index 100% rename from styles/reset.css rename to styles/reset/reset.css diff --git a/styles/send-message.css b/styles/send-message.css index 67a1628..3254435 100644 --- a/styles/send-message.css +++ b/styles/send-message.css @@ -1,6 +1,5 @@ .send-message { - max-width: 1200px; margin: 0 auto; padding: 37px 0 76px 0; } diff --git a/styles/team.css b/styles/team.css index 603b84d..5cbf7a8 100644 --- a/styles/team.css +++ b/styles/team.css @@ -1,14 +1,12 @@ .team__all-members { display: grid; - - max-width: 1200px; - margin: 0 0 0 40px; + justify-content: center; grid-template-columns: 33.333% 33.333% 33.333%; grid-template-rows: 33.333% 33.333% 33.333%; } -.team__meet-text +.team__meet-the-team-text { font-family: Helvetica, sans-serif; font-size: 40px; @@ -22,9 +20,9 @@ } .team-member { - margin: 0 0 0 90px; + margin: 0 0 0 70px; - justify-self: center; + justify-content: center; } .team-member__person-name { From 2b15254a0a5dfd67ffb9fdfafbfef11776beecb2 Mon Sep 17 00:00:00 2001 From: AlexandraKoz Date: Thu, 28 Jun 2018 00:36:58 +0300 Subject: [PATCH 07/10] Fixed footer. --- index.html | 35 ++++++++++++++++++++--------------- styles/advertising.css | 8 +++++--- styles/reset/reset.css | 3 +++ styles/send-message.css | 15 +++++++-------- 4 files changed, 35 insertions(+), 26 deletions(-) diff --git a/index.html b/index.html index aa28722..ed73cc7 100644 --- a/index.html +++ b/index.html @@ -48,8 +48,10 @@

-
do you like rabbits?
-
do you like oranges?
+
+
do you like rabbits?
+
do you like oranges?
+
@@ -65,20 +67,20 @@

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-

read more...

-

- +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-

read more...

-
- +

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-

read more...

-
+

read more...

+

Meet the team

@@ -90,7 +92,8 @@

Hoof member of our team

Hoof is our most talantad designer. However he is not the talkative type and I would advise not getting - on the wrong side of him.

+ on the wrong side of him. +

Nibs @@ -98,8 +101,8 @@

Nibs

member of our team

Nibs is our go to woman. - She is the ceo/director of orange rabbit and runs fast - when she has too. + She is the ceo/director of orange rabbit and runs fast + when she has too.

@@ -108,7 +111,8 @@

Squawk

member of our team

Squawk is no social bunny. - But when it comes to programming he stands out from the crowd.

+ But when it comes to programming he stands out from the crowd. +

@@ -121,7 +125,8 @@

Squawk
-
+ +
diff --git a/styles/advertising.css b/styles/advertising.css index 6947c02..c136f57 100644 --- a/styles/advertising.css +++ b/styles/advertising.css @@ -6,7 +6,6 @@ position: relative; - clear: both; overflow: hidden; height: 400px; @@ -16,7 +15,10 @@ border-bottom: 2px solid #ffa500; background-image: url('../image/slice-orange.png'); } -.advertising__title +.advertising__util { + clear: both; +} +.util__title { position: absolute; top: 130px; @@ -31,7 +33,7 @@ color: #ffa500; background-color: #000000; } -.advertising__inscription +.util__inscription { position: absolute; top: 225px; diff --git a/styles/reset/reset.css b/styles/reset/reset.css index 70e4555..ee1a91f 100644 --- a/styles/reset/reset.css +++ b/styles/reset/reset.css @@ -46,4 +46,7 @@ q:before, q:after { table { border-collapse: collapse; border-spacing: 0; +} +a { + color: #808080; } \ No newline at end of file diff --git a/styles/send-message.css b/styles/send-message.css index 3254435..d0e1228 100644 --- a/styles/send-message.css +++ b/styles/send-message.css @@ -29,7 +29,7 @@ { float: right; - width: 1000px; + width: 1100px; margin: 0 30px 0 0; border: none; @@ -58,10 +58,10 @@ { float: right; - width: 1000px; - height: 30px; - margin: 0 30px 0 0; - margin: 0 32px 25px 0; + width: 1100px; + height: 35px; + + margin: 0 32px 0px 0; border: none; background-color: #f2f2f2; @@ -70,6 +70,5 @@ .form__label { display: inline-block; - - margin: 0 0 30px 0; -} + padding: 15px; +} \ No newline at end of file From fa076df57168840c3a327358c9ae2e25dab7c0c0 Mon Sep 17 00:00:00 2001 From: AlexandraKoz Date: Thu, 28 Jun 2018 00:50:36 +0300 Subject: [PATCH 08/10] Fixed articles and sections. --- index.html | 66 +++++++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/index.html b/index.html index ed73cc7..c286d30 100644 --- a/index.html +++ b/index.html @@ -47,14 +47,14 @@

-
+
do you like rabbits?
do you like oranges?
-
-
-
+
+
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. @@ -62,40 +62,46 @@

read more...

-

-
+
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-

read more...

- -
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-

read more...

- -
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

-

read more...

- -
-
+

+ read more... +

+
+ +

Meet the team

-
-

Hoof +
+

Hoof - Lead Designer -

- member of our team -

Hoof is our most talantad designer. - However he is not the talkative type and I would advise not getting - on the wrong side of him. -

-
-
+

+ member of our team +

Hoof is our most talantad designer. + However he is not the talkative type and I would advise not getting + on the wrong side of him. +

+
+

Nibs - CEO/Director

@@ -104,8 +110,8 @@

Nibs She is the ceo/director of orange rabbit and runs fast when she has too.

-

-
+
+

Squawk - Developer

@@ -113,9 +119,9 @@

Squawk

Squawk is no social bunny. But when it comes to programming he stands out from the crowd.

+

-

-
+

Send us a message...

From bf06c349033f5a460d01b24c5d27713d5aa80746 Mon Sep 17 00:00:00 2001 From: AlexandraKoz Date: Thu, 28 Jun 2018 00:57:08 +0300 Subject: [PATCH 09/10] Add css comb. --- .csscomb.json | 329 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 329 insertions(+) create mode 100644 .csscomb.json diff --git a/.csscomb.json b/.csscomb.json new file mode 100644 index 0000000..0060095 --- /dev/null +++ b/.csscomb.json @@ -0,0 +1,329 @@ +{ + "always-semicolon": true, + "color-case": "lower", + "block-indent": "\t", + "color-shorthand": true, + "element-case": "lower", + "eof-newline": false, + "leading-zero": false, + "quotes": "double", + "sort-order-fallback": "abc", + "space-before-colon": "", + "space-after-colon": " ", + "space-before-combinator": " ", + "space-after-combinator": " ", + "space-between-declarations": "\n", + "space-before-opening-brace": "", + "space-after-opening-brace": "\n", + "space-after-selector-delimiter": "\n", + "space-before-selector-delimiter": "", + "space-before-closing-brace": "\n", + "strip-spaces": true, + "tab-size": true, + "unitless-zero": true, + "vendor-prefix-align": true, + "sort-order": [ + [ + "$extend", + "$include" + ], + [ + "font", + "font-family", + "font-size", + "font-weight", + "font-style", + "font-variant", + "font-size-adjust", + "font-stretch", + "font-effect", + "font-emphasize", + "font-emphasize-position", + "font-emphasize-style", + "font-smooth", + "line-height" + ], + [ + "position", + "z-index", + "top", + "right", + "bottom", + "left" + ], + [ + "display", + "visibility", + "float", + "clear", + "overflow", + "overflow-x", + "overflow-y", + "-ms-overflow-x", + "-ms-overflow-y", + "clip", + "zoom", + "flex-direction", + "flex-order", + "flex-pack", + "flex-align" + ], + [ + "-webkit-box-sizing", + "-moz-box-sizing", + "box-sizing", + "width", + "min-width", + "max-width", + "height", + "min-height", + "max-height", + "margin", + "margin-top", + "margin-right", + "margin-bottom", + "margin-left", + "padding", + "padding-top", + "padding-right", + "padding-bottom", + "padding-left" + ], + [ + "table-layout", + "empty-cells", + "caption-side", + "border-spacing", + "border-collapse", + "list-style", + "list-style-position", + "list-style-type", + "list-style-image" + ], + [ + "content", + "quotes", + "counter-reset", + "counter-increment", + "resize", + "cursor", + "-webkit-user-select", + "-moz-user-select", + "-ms-user-select", + "user-select", + "nav-index", + "nav-up", + "nav-right", + "nav-down", + "nav-left", + "-webkit-transition", + "-moz-transition", + "-ms-transition", + "-o-transition", + "transition", + "-webkit-transition-delay", + "-moz-transition-delay", + "-ms-transition-delay", + "-o-transition-delay", + "transition-delay", + "-webkit-transition-timing-function", + "-moz-transition-timing-function", + "-ms-transition-timing-function", + "-o-transition-timing-function", + "transition-timing-function", + "-webkit-transition-duration", + "-moz-transition-duration", + "-ms-transition-duration", + "-o-transition-duration", + "transition-duration", + "-webkit-transition-property", + "-moz-transition-property", + "-ms-transition-property", + "-o-transition-property", + "transition-property", + "-webkit-transform", + "-moz-transform", + "-ms-transform", + "-o-transform", + "transform", + "-webkit-transform-origin", + "-moz-transform-origin", + "-ms-transform-origin", + "-o-transform-origin", + "transform-origin", + "-webkit-animation", + "-moz-animation", + "-ms-animation", + "-o-animation", + "animation", + "-webkit-animation-name", + "-moz-animation-name", + "-ms-animation-name", + "-o-animation-name", + "animation-name", + "-webkit-animation-duration", + "-moz-animation-duration", + "-ms-animation-duration", + "-o-animation-duration", + "animation-duration", + "-webkit-animation-play-state", + "-moz-animation-play-state", + "-ms-animation-play-state", + "-o-animation-play-state", + "animation-play-state", + "-webkit-animation-timing-function", + "-moz-animation-timing-function", + "-ms-animation-timing-function", + "-o-animation-timing-function", + "animation-timing-function", + "-webkit-animation-delay", + "-moz-animation-delay", + "-ms-animation-delay", + "-o-animation-delay", + "animation-delay", + "-webkit-animation-iteration-count", + "-moz-animation-iteration-count", + "-ms-animation-iteration-count", + "-o-animation-iteration-count", + "animation-iteration-count", + "-webkit-animation-direction", + "-moz-animation-direction", + "-ms-animation-direction", + "-o-animation-direction", + "animation-direction", + "text-align", + "-webkit-text-align-last", + "-moz-text-align-last", + "-ms-text-align-last", + "text-align-last", + "vertical-align", + "white-space", + "text-decoration", + "text-emphasis", + "text-emphasis-color", + "text-emphasis-style", + "text-emphasis-position", + "text-indent", + "-ms-text-justify", + "text-justify", + "letter-spacing", + "word-spacing", + "-ms-writing-mode", + "text-outline", + "text-transform", + "text-wrap", + "text-overflow", + "-ms-text-overflow", + "text-overflow-ellipsis", + "text-overflow-mode", + "-ms-word-wrap", + "word-wrap", + "word-break", + "-ms-word-break", + "-moz-tab-size", + "-o-tab-size", + "tab-size", + "-webkit-hyphens", + "-moz-hyphens", + "hyphens", + "pointer-events" + ], + [ + "opacity", + "filter:progid:DXImageTransform.Microsoft.Alpha(Opacity", + "-ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha", + "-ms-interpolation-mode", + "color", + "border", + "border-width", + "border-style", + "border-color", + "border-top", + "border-top-width", + "border-top-style", + "border-top-color", + "border-right", + "border-right-width", + "border-right-style", + "border-right-color", + "border-bottom", + "border-bottom-width", + "border-bottom-style", + "border-bottom-color", + "border-left", + "border-left-width", + "border-left-style", + "border-left-color", + "-webkit-border-radius", + "-moz-border-radius", + "border-radius", + "-webkit-border-top-left-radius", + "-moz-border-radius-topleft", + "border-top-left-radius", + "-webkit-border-top-right-radius", + "-moz-border-radius-topright", + "border-top-right-radius", + "-webkit-border-bottom-right-radius", + "-moz-border-radius-bottomright", + "border-bottom-right-radius", + "-webkit-border-bottom-left-radius", + "-moz-border-radius-bottomleft", + "border-bottom-left-radius", + "-webkit-border-image", + "-moz-border-image", + "-o-border-image", + "border-image", + "-webkit-border-image-source", + "-moz-border-image-source", + "-o-border-image-source", + "border-image-source", + "-webkit-border-image-slice", + "-moz-border-image-slice", + "-o-border-image-slice", + "border-image-slice", + "-webkit-border-image-width", + "-moz-border-image-width", + "-o-border-image-width", + "border-image-width", + "-webkit-border-image-outset", + "-moz-border-image-outset", + "-o-border-image-outset", + "border-image-outset", + "-webkit-border-image-repeat", + "-moz-border-image-repeat", + "-o-border-image-repeat", + "border-image-repeat", + "outline", + "outline-width", + "outline-style", + "outline-color", + "outline-offset", + "background", + "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader", + "background-color", + "background-image", + "background-repeat", + "background-attachment", + "background-position", + "background-position-x", + "-ms-background-position-x", + "background-position-y", + "-ms-background-position-y", + "-webkit-background-clip", + "-moz-background-clip", + "background-clip", + "background-origin", + "-webkit-background-size", + "-moz-background-size", + "-o-background-size", + "background-size", + "box-decoration-break", + "-webkit-box-shadow", + "-moz-box-shadow", + "box-shadow", + "filter:progid:DXImageTransform.Microsoft.gradient", + "-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient", + "text-shadow" + ] + ] +} \ No newline at end of file From 4fb21a3134dd20894e082cd2a7ae3b26c1988fc3 Mon Sep 17 00:00:00 2001 From: AlexandraKoz Date: Thu, 28 Jun 2018 01:03:10 +0300 Subject: [PATCH 10/10] Fixed HTML file. --- index.html | 9 ++++++--- styles/footer.css | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index c286d30..38b2272 100644 --- a/index.html +++ b/index.html @@ -66,7 +66,8 @@

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, - quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

+ quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. +

read more...

@@ -74,7 +75,8 @@

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, - quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

+ quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. +

read more...

@@ -82,7 +84,8 @@

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, - quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

+ quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. +

read more...

diff --git a/styles/footer.css b/styles/footer.css index bd7dd17..f72e72e 100644 --- a/styles/footer.css +++ b/styles/footer.css @@ -2,7 +2,7 @@ { position: relative; - max-width: 1400px; + height: 70px; margin: 30px 0 0 0;