Commit 7c839308 authored by Julien Fastré's avatar Julien Fastré

Merge branch '1.0'

Conflicts:
	Gruntfile.js
	README.md
	src/less/chill_buttons.less
	src/less/chill_misc.less
	website/index.html
parents aab65ac6 7808a4b7
......@@ -56,6 +56,7 @@ Things to know :
- the task `grunt` will minify js and bootlint-check htm files.
### less files
The bootstrap framework is used, but unused parts are removed, and some are overriden.
......
......@@ -2,4 +2,5 @@
.popover-chill.btn {
margin-top: 1em;
}
\ No newline at end of file
}
img.head-image {
max-width: 80vw;
}
......@@ -54,3 +55,4 @@ p.next_meeting {
max-width: 40vw;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment