Skip to content
This repository has been archived by the owner on Oct 22, 2020. It is now read-only.

Commit

Permalink
Merge pull request #982 from elifesciences/913_assets_styleguide
Browse files Browse the repository at this point in the history
styleguide fix issue with static content
  • Loading branch information
hem-brahmbhatt committed Nov 8, 2018
2 parents e718482 + d85b247 commit 0636ed1
Show file tree
Hide file tree
Showing 17 changed files with 1,168 additions and 793 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
@@ -1,4 +1,4 @@
_build
coverage
node_modules
static
assets
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -35,7 +35,7 @@ COPY \
COPY app app
COPY config config
COPY scripts scripts
COPY static static
COPY assets assets
COPY styleguide styleguide
COPY test test
COPY webpack webpack
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-development
Expand Up @@ -3,7 +3,7 @@ FROM xpub/xpub:base
WORKDIR ${HOME}

COPY package.json yarn.lock app.js .babelrc .eslintignore .eslintrc .prettierrc .stylelintignore .stylelintrc ./
COPY static static
COPY assets assets
COPY webpack webpack
COPY config config
COPY app app
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes
58 changes: 29 additions & 29 deletions static/fonts/LICENCE.md → assets/fonts/LICENCE.md
Expand Up @@ -6,9 +6,9 @@ Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL

-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
---

## SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
Expand Down Expand Up @@ -51,32 +51,32 @@ a copy of the Font Software, to use, study, copy, merge, embed,
modify, redistribute, and sell modified and unmodified copies of the
Font Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components, in
Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the
corresponding Copyright Holder. This restriction only applies to the
primary font name as presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created using
the Font Software.
1. Neither the Font Software nor any of its individual components, in
Original or Modified Versions, may be sold by itself.

2. Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3. No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the
corresponding Copyright Holder. This restriction only applies to the
primary font name as presented to the users.

4. The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5. The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created using
the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
Expand Down

0 comments on commit 0636ed1

Please sign in to comment.