Merge branch 'master' into 0.8

Conflicts:
	dist/css/ghost-ui.css
	dist/css/ghost-ui.min.css
	docs/dist/css/ghost-ui.min.css
	sass/layouts/settings.scss
	sass/layouts/setup.scss
	sass/modules/forms.scss
	sass/modules/global.scss
	sass/modules/icons.scss
	sass/modules/notifications.scss
	sass/screen.scss
This commit is contained in:
Paul Adam Davis 2014-06-24 21:15:54 +01:00
commit 4ad3c19e4b
10 changed files with 138 additions and 566 deletions

View File

@ -140,7 +140,7 @@ Keep track of development and community news.
## Versioning
`NB: Pre-1.0 we're play pretty fast and loose with Semver`
`NB: Pre-1.0 we're playing it pretty fast and loose with Semver`
For transparency into our release cycle and in striving to maintain backward compatibility, Ghost-UI is maintained under the Semantic Versioning guidelines.

BIN
core/client/assets/fonts/icons.eot Normal file → Executable file

Binary file not shown.

350
core/client/assets/fonts/icons.svg Normal file → Executable file

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 54 KiB

BIN
core/client/assets/fonts/icons.ttf Normal file → Executable file

Binary file not shown.

BIN
core/client/assets/fonts/icons.woff Normal file → Executable file

Binary file not shown.

View File

@ -62,4 +62,4 @@
@import "layouts/errors";
@import "layouts/settings";
@import "layouts/setup";
@import "layouts/users";
@import "layouts/users";

Binary file not shown.

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Binary file not shown.