mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-11 09:53:32 +03:00
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:
commit
4ad3c19e4b
@ -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
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
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
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
BIN
core/client/assets/fonts/icons.woff
Normal file → Executable file
Binary file not shown.
@ -62,4 +62,4 @@
|
||||
@import "layouts/errors";
|
||||
@import "layouts/settings";
|
||||
@import "layouts/setup";
|
||||
@import "layouts/users";
|
||||
@import "layouts/users";
|
||||
|
BIN
core/client/docs/dist/fonts/icons.eot
vendored
BIN
core/client/docs/dist/fonts/icons.eot
vendored
Binary file not shown.
350
core/client/docs/dist/fonts/icons.svg
vendored
350
core/client/docs/dist/fonts/icons.svg
vendored
File diff suppressed because one or more lines are too long
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 51 KiB |
BIN
core/client/docs/dist/fonts/icons.ttf
vendored
BIN
core/client/docs/dist/fonts/icons.ttf
vendored
Binary file not shown.
BIN
core/client/docs/dist/fonts/icons.woff
vendored
BIN
core/client/docs/dist/fonts/icons.woff
vendored
Binary file not shown.
Loading…
Reference in New Issue
Block a user