diff --git a/README.md b/README.md index 8c6cbcf19f..70c7c4d1e2 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ 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!). +- [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!). - [ ] Create a new branch: git checkout -b ``. - [ ] Implement the project on your newly created `` branch, committing changes regularly. - [ ] Push commits: git push origin ``. diff --git a/less/index.less b/less/index.less index c113ca2c46..08a6f38686 100644 --- a/less/index.less +++ b/less/index.less @@ -1 +1,15 @@ // Follow the order in the readme +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +@import 'variables.less'; +@import 'mixins.less'; +@import 'reset.less'; +@import 'global.less'; +@import 'navigation.less'; +@import 'footer.less'; +@import 'home-page.less'; + + diff --git a/less/mixins.less b/less/mixins.less index 2d5c603558..a3cb684b3a 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -1 +1,27 @@ -// Mixins in here \ No newline at end of file +// Mixins in here +.testborder { + border: 1px solid red; +} +// button +.sign-me-up(@bcolor: rgb(35, 134, 105), @fcolor: white){ + border: 1px solid black; + background-color: @bcolor; + color: @fcolor; + padding: 3%; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 1.6rem; + margin: 1%; + border-radius: 10%; +// hover + &:hover { + background-color:@fcolor; + color: @bcolor; + } + +//media 500px + @media @mobile (max-width:500px) { + padding: 3% 20%; + } +} \ No newline at end of file