Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
53 changes: 25 additions & 28 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@ Fun Bus is a travel agency looking for some help on their website. They want a

## Task 1: Set Up The Project With Git

- [ ] Create a forked copy of this project.
- [ ] Add your team lead as collaborator on Github.
- [ ] Clone your OWN version of the repository (Not Lambda's by mistake!).
- [ ] Create a new branch: git checkout -b `<firstName-lastName>`.
- [ ] Implement the project on your newly created `<firstName-lastName>` branch, committing changes regularly.
- [ ] Push commits: git push origin `<firstName-lastName>`.
- [X] Create a forked copy of this project.
- [X] Add your team lead as collaborator on Github.
- [X] Clone your OWN version of the repository (Not Lambda's by mistake!).
- [X] Create a new branch: git checkout -b `<firstName-lastName>`.
- [X] Implement the project on your newly created `<firstName-lastName>` branch, committing changes regularly.
- [X] Push commits: git push origin `<firstName-lastName>`.

Follow these steps for completing your project.

- [ ] Submit a Pull-Request to merge <firstName-lastName> Branch into master (student's Repo). **Please don't merge your own pull request**
- [ ] Add your team lead as a reviewer on the pull-request
- [ ] Your team lead will count the project as complete by merging the branch back into master.
- [X] Submit a Pull-Request to merge <firstName-lastName> Branch into master (student's Repo). **Please don't merge your own pull request**
- [X] Add your team lead as a reviewer on the pull-request
- [X] Your team lead 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 team lead 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
* [X] 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 team lead for help.
* [X] Open your terminal and navigate to your preprocessing project by using the `cd` command
* [X] Once in your project's root folder, run the following command `less-watch-compiler less css index.less`
* [X] Verify your compiler is working correctly by changing the `background-color` on the `html` selector to `red` in your `index.less` file.
* [X] 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:
* [X] 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`
Expand All @@ -38,21 +38,18 @@ Follow these steps for completing your project.


## 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.
* [X] 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.
* [X] Navigation: Use the `navigation.less` file for all your navigation styling
* [X] Main Header: Use the `home-page.less` file for the header styling.
* [X] 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 variables.
* [ ] 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
* [X] Use escaping to create a variable named `@mobile` that contains this value: `(max-width: 500px)`. Use the `variables.less` file to house your variables.
* [X] Review the [mobile design file](design-files/fun-bus-mobile.png). You will see several design updates that need updating.
* [X] Match the design file at `500px` as well as you can

## Stretch Goals:
## 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.
* [ ] 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



318 changes: 317 additions & 1 deletion css/index.css
Original file line number Diff line number Diff line change
@@ -1 +1,317 @@
/* LESS needs to be processed */
.font-class {
color: white;
font-size: 16px;
font-weight: bold;
}
.button-class {
background-color: teal;
padding: 10px;
border-radius: 10px;
text-align: center;
width: 75%;
}
.btn {
color: white;
font-size: 16px;
font-weight: bold;
background-color: teal;
padding: 10px;
border-radius: 10px;
text-align: center;
width: 75%;
}
/* 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;
}
a {
text-decoration: none;
color: black;
padding-left: 12px;
padding-right: 12px;
font-size: 14px;
}
.footer {
width: 100%;
border-top: 2px dashed silver;
background: #FFEBCD;
}
.footer p {
text-align: center;
color: #212529;
font-size: 1.6rem;
padding: 20px;
}
.home section.navigation-area {
padding-top: 10px;
}
.home div.navigation-area {
display: flex;
flex-direction: row;
justify-content: space-between;
padding-bottom: 10px;
border-bottom: 2px dashed #C0C0C0;
}
.home div.navigation-items {
margin-top: 15px;
margin-bottom: 15px;
}
.home h2.navigation-area {
padding-top: 20px;
}
.home p.navigation-area {
padding-bottom: 15px;
border-bottom: 2px dashed #C0C0C0;
}
.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;
}
@media (max-width: 500px) {
.home .navigation-area {
margin: 10px;
flex-wrap: wrap;
flex-direction: column;
}
.home .navigation-items {
margin-left: 80px;
}
.home h1 {
margin-left: 150px;
margin-right: 40px;
}
.home img {
width: 95%;
}
.home .content-destination {
width: 95%;
}
.home .content-section {
flex-direction: column;
flex-wrap: wrap;
margin-left: 20px;
width: 200%;
}
.home .inverse-content {
flex-direction: column-reverse;
}
.home .content-pick {
margin: 10px;
flex-direction: column;
width: 200%;
}
.home .destination {
margin-left: 100px;
}
.home .btn {
width: 300px;
}
}
Binary file modified design-files/fun-bus-desktop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading