diff --git a/README.md b/README.md index 54d4bf3604..e308e58157 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,33 @@ # Preprocessing II: Fun Bus Website -Fun Bus is a travel agency looking for some help on their website. They want a new navigation, new header, and new buttons on the home page. They also want a mobile version of their site styled. Use your preprocessing knowledge to accomplish their tasks. +Fun Bus is a travel agency looking for some help on their website. They want a new navigation, new header, and new buttons on the home page. They also want a mobile version of their site styled. Use your preprocessing knowledge to accomplish their tasks. ## Task 1: Set Up The Project With Git -- [ ] Create a forked copy of this project. -- [ ] Add your project manager as collaborator on Github. -- [ ] Clone your OWN version of the repository (Not Lambda's by mistake!). -- [ ] Create a new branch: git checkout -b ``. -- [ ] Implement the project on your newly created `` branch, committing changes regularly. -- [ ] Push commits: git push origin ``. - +- [*] Create a forked copy of this project. +- [*] Add your project manager as collaborator on Github. +- [*] Clone your OWN version of the repository (Not Lambda's by mistake!). +- [*] Create a new branch: git checkout -b ``. +- [*] Implement the project on your newly created `` branch, committing changes regularly. +- [*] Push commits: git push origin ``. + Follow these steps for completing your project. -- [ ] Submit a Pull-Request to merge Branch into master (student's Repo). **Please don't merge your own pull request** -- [ ] Add your project manager as a reviewer on the pull-request -- [ ] Your project manager will count the project as complete by merging the branch back into master. +- [*] Submit a Pull-Request to merge Branch into master (student's Repo). **Please don't merge your own pull request** +- [*] Add your project manager as a reviewer on the pull-request +- [*] Your project manager will count the project as complete by merging the branch back into master. ## Task 2: Set up your preprocessor -* [ ] Verify that you have LESS installed correctly by running `lessc -v` in your terminal, if you don't get a version message back, reach out to your project manager for help. -* [ ] Open your terminal and navigate to your preprocessing project by using the `cd` command -* [ ] Once in your project's root folder, run the following command `less-watch-compiler less css index.less` -* [ ] Verify your compiler is working correctly by changing the `background-color` on the `html` selector to `red` in your `index.less` file. -* [ ] Once you see the red screen, you can delete that style and you're ready to start on the next task + +- [*] Verify that you have LESS installed correctly by running `lessc -v` in your terminal, if you don't get a version message back, reach out to your project manager for help. +- [*] Open your terminal and navigate to your preprocessing project by using the `cd` command +- [*] Once in your project's root folder, run the following command `less-watch-compiler less css index.less` +- [*] Verify your compiler is working correctly by changing the `background-color` on the `html` selector to `red` in your `index.less` file. +- [*] Once you see the red screen, you can delete that style and you're ready to start on the next task ## Task 3: Import LESS Files -* [ ] Navigate to your `index.less` file. Notice the file is blank. In order for you to see the styles for this project you must import them in a certain order. That order is as follows: +- [*] Navigate to your `index.less` file. Notice the file is blank. In order for you to see the styles for this project you must import them in a certain order. That order is as follows: 1. `variables.less` 2. `mixins.less` @@ -36,23 +37,21 @@ Follow these steps for completing your project. 6. `footer.less` 7. `home-page.less` - ## Task 4: Desktop Updates Needed -* [ ] Review the [desktop design file](design-files/fun-bus-desktop.png). Notice the navigation, header, and buttons at the bottom of the page are missing. -* [ ] Navigation: Use the `navigation.less` file for all your navigation styling -* [ ] Main Header: Use the `home-page.less` file for the header styling. -* [ ] Buttons: Create a parametric mixin that can create the missing buttons in the design file. Use the `mixins.less` file to create your mixin. +- [ ] Review the [desktop design file](design-files/fun-bus-desktop.png). Notice the navigation, header, and buttons at the bottom of the page are missing. +- [*] Navigation: Use the `navigation.less` file for all your navigation styling +- [*] Main Header: Use the `home-page.less` file for the header styling. +- [*] Buttons: Create a parametric mixin that can create the missing buttons in the design file. Use the `mixins.less` file to create your mixin. ## Task 5: Mobile Updates Needed -* [ ] Use escaping to create a variable named `@mobile` that contains this value: `(max-width: 500px)`. Use the `variables.less` file to house your styling. -* [ ] Review the [mobile design file](design-files/fun-bus-mobile.png). You will see several design updates that need updating. -* [ ] Match the design file at `500px` as well as you can - -## Stretch Goals: -* [ ] Create an animation mixin using parametric mixins -* [ ] Introduce a form with inputs allowing users to select a vacation package and a submit button at the bottom of the page. Introduce inputs for name, email, phone number, and an area for them to leave special instructions. -* [ ] Style the site to look good at all sizes, not just desktop and phone +- [ ] Use escaping to create a variable named `@mobile` that contains this value: `(max-width: 500px)`. Use the `variables.less` file to house your styling. +- [ ] Review the [mobile design file](design-files/fun-bus-mobile.png). You will see several design updates that need updating. +- [ ] Match the design file at `500px` as well as you can +## Stretch Goals: +- [ ] Create an animation mixin using parametric mixins +- [ ] Introduce a form with inputs allowing users to select a vacation package and a submit button at the bottom of the page. Introduce inputs for name, email, phone number, and an area for them to leave special instructions. +- [ ] Style the site to look good at all sizes, not just desktop and phone diff --git a/css/index.css b/css/index.css index e764f2b01f..9263987cb5 100644 --- a/css/index.css +++ b/css/index.css @@ -1 +1,260 @@ -/* LESS needs to be processed */ \ No newline at end of file +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ +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; +} +blockquote:before, +blockquote:after, +q:before, +q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} +* { + box-sizing: border-box; +} +html { + font-size: 62.5%; +} +html, +body { + font-family: 'Roboto', sans-serif; +} +h1, +h2, +h3, +h4, +h5 { + font-family: 'Indie Flower', cursive; +} +h1 { + font-size: 4rem; +} +h2 { + font-size: 3.2rem; + padding-bottom: 10px; +} +h4 { + font-size: 2.5rem; + padding-bottom: 10px; +} +p { + line-height: 1.5; + font-size: 1.6rem; + padding-bottom: 10px; +} +img { + max-width: 100%; + height: auto; +} +.container { + max-width: 800px; + width: 100%; + margin: 0 auto; +} +nav { + display: flex; + justify-content: space-evenly; +} +nav a { + text-decoration: none; + color: black; + font-size: 2rem; +} +.footer { + width: 100%; + border-top: 2px dashed silver; + background: #FFEBCD; +} +.footer p { + text-align: center; + color: #212529; + font-size: 1.6rem; + padding: 20px; +} +header { + display: flex; + justify-content: space-evenly; + align-items: center; + width: 100%; + margin-top: 30px; + border-bottom: 2px dashed lightgrey; +} +header h1 { + padding-bottom: 30px; +} +.home .content-section { + margin: 30px 0; + display: flex; + flex-wrap: wrap; + justify-content: space-between; +} +.home .content-section .text-content { + width: 48%; + padding-right: 1%; +} +.home .content-section .img-content { + width: 48%; + padding-left: 1%; +} +.home .content-section .img-content img { + border-radius: 10px; +} +.home .inverse-content { + padding-bottom: 30px; + border-bottom: 2px dashed #C0C0C0; +} +.home .inverse-content .text-content { + padding-left: 1%; + padding-right: 0; +} +.home .inverse-content .img-content { + padding-right: 1%; + padding-left: 0; +} +.home .content-destination { + width: 75%; + margin: 0 auto 30px; +} +.home .content-destination img { + border-radius: 10px; +} +.home .content-pick { + padding-top: 30px; + border-top: 2px dashed #C0C0C0; + display: flex; + justify-content: space-between; +} +.home .content-pick .destination { + width: 30%; + margin-bottom: 30px; +} +.home .content-pick .destination .btn { + background-color: teal; + margin: 20px auto; + cursor: pointer; + height: 45px; + font-size: 2rem; + border-radius: 10px; + color: #fff; +} +.home .content-pick .destination .btn:hover { + background-color: #fff; + color: teal; +} diff --git a/index.html b/index.html index bb8663b768..195d4ddbb7 100644 --- a/index.html +++ b/index.html @@ -1,74 +1,116 @@ - + - - + + - Fun Bus Travel Agency - Solution + Fun Bus Travel Agency - Solution - - + + - - + + - + +
+

Fun Bus

+ +
+
+ + +
+
+

Let's Go!

+

+ Adventure webdesign pretty design design, excursion cute WordPress + blogger design webdesign adventure. Pretty simple traveling fun + WordPress wanderlust darn simple organized. +

+

+ Expedition colorful design simple excursion blogger blogger design + WordPress design, design organized website theme. +

+
+
+ Let's go on an adventure! +
+
+
+
+ Lets have fun! +
+
+

Adventure Awaits

+

+ Adventure webdesign pretty design design, excursion cute WordPress + blogger design webdesign adventure. Pretty simple traveling fun + WordPress wanderlust darn simple organized. +

+

+ Expedition colorful design simple excursion blogger blogger design + WordPress design, design organized website theme. +

+
+
+
+

Pick Your Destination

+

+ Expedition excursion design darn excursion fun, clean simple organized + WordPress Travel colorful webdesign. Traveler blogger website design + expedition clean excursion traveling. +

+ Second slide +
+
+
+

Fun In The Sun

+

+ Expedition excursion design excursion fun, clean simple organized + WordPress Travel colorful webdesign. Traveler blogger website design + expedition clean excursion traveling. +

+
Sign Me Up!
+
+
+

Mountain Excursion

+

+ Expedition excursion design excursion fun, clean simple organized + WordPress Travel colorful webdesign. Traveler blogger website design + expedition clean excursion traveling. +

+
Sign Me Up!
+
+
+

Island Getaway

+

+ Expedition excursion design excursion fun, clean simple organized + WordPress Travel colorful webdesign. Traveler blogger website design + expedition clean excursion traveling. +

+
Sign Me Up!
+
+
+
+ - - -
- -
-
-

Let's Go!

-

Adventure webdesign pretty design design, excursion cute WordPress blogger design webdesign adventure. Pretty simple traveling fun WordPress wanderlust darn simple organized.

-

Expedition colorful design simple excursion blogger blogger design WordPress design, design organized website theme.

-
-
- Let's go on an adventure! -
-
-
-
- Lets have fun! -
-
-

Adventure Awaits

-

Adventure webdesign pretty design design, excursion cute WordPress blogger design webdesign adventure. Pretty simple traveling fun WordPress wanderlust darn simple organized.

-

Expedition colorful design simple excursion blogger blogger design WordPress design, design organized website theme.

-
- -
-
-

Pick Your Destination

-

Expedition excursion design darn excursion fun, clean simple organized WordPress Travel colorful webdesign. Traveler blogger website design expedition clean excursion traveling.

- Second slide -
-
- -
-

Fun In The Sun

-

Expedition excursion design excursion fun, clean simple organized WordPress Travel colorful webdesign. Traveler blogger website design expedition clean excursion traveling.

-
Sign Me Up!
-
-
-

Mountain Excursion

-

Expedition excursion design excursion fun, clean simple organized WordPress Travel colorful webdesign. Traveler blogger website design expedition clean excursion traveling.

-
Sign Me Up!
-
-
-

Island Getaway

-

Expedition excursion design excursion fun, clean simple organized WordPress Travel colorful webdesign. Traveler blogger website design expedition clean excursion traveling.

-
Sign Me Up!
-
-
-
- -
-

Copyright Fun Bus 2018

-
- - - \ No newline at end of file + + + diff --git a/less/home-page.less b/less/home-page.less index 5528d8a7a5..7c5d40110f 100644 --- a/less/home-page.less +++ b/less/home-page.less @@ -1,4 +1,13 @@ +header { + display: flex; + justify-content: space-evenly; + align-items: center; + width: 100%; + margin-top: 30px; + border-bottom: 2px dashed lightgrey; + .home { + .content-section { margin: 30px 0; @@ -6,8 +15,6 @@ flex-wrap: wrap; justify-content: space-between; - - .text-content { width: 48%; padding-right: 1%; @@ -56,6 +63,12 @@ .destination { width: 30%; margin-bottom: 30px; + .btn{ + .buttons(); + } } } -}// home \ No newline at end of file + + +} +// home \ No newline at end of file diff --git a/less/index.less b/less/index.less index c113ca2c46..40d1251639 100644 --- a/less/index.less +++ b/less/index.less @@ -1 +1,8 @@ // Follow the order in the readme +@import "variables"; +@import "mixins"; +@import "reset"; +@import "global"; +@import "navigation"; +@import "footer"; +@import "home-page"; diff --git a/less/mixins.less b/less/mixins.less index 2d5c603558..6463f67cb3 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -1 +1,31 @@ -// Mixins in here \ No newline at end of file +// Mixins in here + +.buttons (@bg-color:teal, @font:#fff) { + background-color: @bg-color; + margin: 20px auto; + cursor: pointer; + height: 45px; + font-size: 2rem; + border-radius: 10px; + color: @font; + + &:hover { + background-color: @font; + color: @bg-color; + } + + // @media @phone { + // .buttons { + // width: 90%; + // height: 50px; + // font-size: 2.5rem; + // } + // } + + // @media( max-width: 400px ) { + // . { + // background: green; + // color: white; + // } + // } +} diff --git a/less/navigation.less b/less/navigation.less index f89120a0f1..6f3308f962 100644 --- a/less/navigation.less +++ b/less/navigation.less @@ -1 +1,13 @@ -// Navigation Styles here \ No newline at end of file +// Navigation Styles here + +nav { + display: flex; + justify-content: space-between; + width: 100%; + + a { + text-decoration: none; + color: black; + font-size: 2rem; + } +}