Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add or update license files across repo #12

Merged
merged 8 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Contributing

If you would like to contribute code to this project you can do so through GitHub by forking the repository and sending a pull request. Before RDK accepts your code into the project you must sign the RDK Contributor License Agreement (CLA).
1 change: 1 addition & 0 deletions COPYING
27 changes: 27 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,30 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

MIT License

Copyright <YEAR> <COPYRIGHT HOLDER>
anthony9187 marked this conversation as resolved.
Show resolved Hide resolved

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.


https://github.com/sindresorhus/ts-extras is
Copyright (c) Sindre Sorhus [email protected] (https://sindresorhus.com)
Licensed under the MIT License
9 changes: 4 additions & 5 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ within the component is also subject to the terms and conditions
of these licenses. The LICENSE file contains the text of all the
licenses which apply within this component,except as indicated in the following paragraphs.

The src/shared/public/fonts/notoSans directory within this component contains fonts which are licensed under the Open Font License. The notoSans
The packages/shared/public/fonts/notoSans directory within this component contains fonts which are licensed under the Open Font License. The notoSans
directory contains its own license file, called LICENSE, which describes the licensing of the
files in the notoSans directory.

The src/shared/public/fonts/ubuntu directory within this component contains fonts which are licensed under the Ubuntu Font Licence. The ubuntu
directory contains its own license file, called LICENSE, which describes the licensing of the
files in the ubuntu directory.

The src/packages/solid/types/object-methods.d.ts file within this component contains code which is licensed under the MIT license. The file contains a header describing the license of the contents of the file
https://github.com/sindresorhus/ts-extras is
Copyright (c) Sindre Sorhus [email protected] (https://sindresorhus.com)
Licensed under the MIT License
17 changes: 0 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
<!--
Copyright 2023 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

SPDX-License-Identifier: Apache-2.0
-->

# Solid UI

This library contains a suite of [themeable](THEMING.md) UI components written for the [SolidJS Lightning](https://github.com/lightning-tv/solid) Framework. check them out in our [storybook docs](https://lightning-js.github.io/ui-components/).
Expand Down
17 changes: 0 additions & 17 deletions THEMING.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
<!--
Copyright 2024 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

SPDX-License-Identifier: Apache-2.0
-->

# Theming in solid-ui

## What is theming?
Expand Down
2 changes: 1 addition & 1 deletion packages/sandbox/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import App from './pages/App';
import coreExtensionModuleUrl from '../shared/AppCoreExtensions.js?importChunkUrl';
import coreWorkerUrl from '../shared/threadx-core-worker.js?importChunkUrl';

Config.fontSettings.fontFamily = 'Ubuntu';
Config.fontSettings.fontFamily = 'Roboto';
Config.fontSettings.color = 0xffffffff;

const driver = 'main';
Expand Down
26 changes: 11 additions & 15 deletions packages/shared/AppCoreExtensions.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
/*
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:
*
* Copyright 2023 Comcast
/**
* Copyright 2023 Comcast Cable Communications Management, LLC
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
Expand All @@ -15,9 +12,11 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* SPDX-License-Identifier: Apache-2.0
*/

import { CoreExtension, SdfTrFontFace } from '@lightningjs/renderer/core';
import { CoreExtension, WebTrFontFace } from '@lightningjs/renderer/core';

const basePath = './';

Expand All @@ -37,36 +36,33 @@ export default class AppCoreExtension extends CoreExtension {
// }),
// );
stage.fontManager.addFontFace(
new SdfTrFontFace('msdf', {
new WebTrFontFace({
fontFamily: 'Arial',
anthony9187 marked this conversation as resolved.
Show resolved Hide resolved
descriptors: {
weight: 700
},
atlasDataUrl: basePath + 'fonts/ubuntu/Ubuntu-Bold.msdf.json',
atlasUrl: basePath + 'fonts/ubuntu/Ubuntu-Bold.msdf.png',
fontUrl: basePath + 'fonts/roboto/Roboto-Bold.ttf',
stage
})
);
stage.fontManager.addFontFace(
new SdfTrFontFace('msdf', {
new WebTrFontFace({
fontFamily: 'Arial',
descriptors: {
weight: 400
},
atlasDataUrl: basePath + 'fonts/ubuntu/Ubuntu-Regular.msdf.json',
atlasUrl: basePath + 'fonts/ubuntu/Ubuntu-Regular.msdf.png',
fontUrl: basePath + 'fonts/roboto/Roboto-Regular.ttf',
stage
})
);

stage.fontManager.addFontFace(
new SdfTrFontFace('msdf', {
new WebTrFontFace({
fontFamily: 'Arial',
descriptors: {
weight: 500
},
atlasDataUrl: basePath + 'fonts/ubuntu/Ubuntu-Regular.msdf.json',
atlasUrl: basePath + 'fonts/ubuntu/Ubuntu-Regular.msdf.png',
fontUrl: basePath + 'fonts/roboto/Roboto-Regular.ttf',
stage
})
);
Expand Down
Loading
Loading