Skip to content

Commit cf3f46e

Browse files
chore: merge alloy-font-awesome history into third-party/projects
1 parent 5dd5c6c commit cf3f46e

File tree

240 files changed

+32874
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+32874
-0
lines changed

third-party/README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,11 @@
77
- Changelog showing Liferay changes: [`CHANGELOG.md`](./projects/jquery-form/CHANGELOG.md).
88
- Our package name: `@liferay/jquery-form`
99
- Usage site in Liferay DXP: [`frontend-js-jquery-web`](https://github.com/liferay/liferay-portal/blob/master/modules/apps/frontend-js/frontend-js-jquery-web)
10+
11+
## Font Awesome
12+
13+
- Upstream project: https://github.com/FortAwesome/Font-Awesome
14+
- Base version used by Liferay: [font-awesome/v3.2.0](https://github.com/FortAwesome/Font-Awesome/tree/906345058f738c2b931f89754a319ed108e17bd8)
15+
- Changelog showing Liferay changes: [`CHANGELOG.md`](./projects/alloy-font-awesome/CHANGELOG.md).
16+
- Our package name: `liferay-font-awesome`
17+
- Usage site in Liferay DXP: [`frontend-theme-font-awesome-web`](https://github.com/liferay/liferay-portal/tree/master/modules/apps/frontend-theme/frontend-theme-font-awesome-web)
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
*.pyc
2+
*.egg-info
3+
*.db
4+
*.db.old
5+
*.swp
6+
*.db-journal
7+
8+
.coverage
9+
.DS_Store
10+
.installed.cfg
11+
_gh_pages/*
12+
13+
.idea/*
14+
.svn/*
15+
src/website/static/*
16+
src/website/media/*
17+
18+
bin
19+
cfcache
20+
develop-eggs
21+
dist
22+
downloads
23+
eggs
24+
parts
25+
tmp
26+
.sass-cache
27+
node_modules
28+
29+
src/website/settingslocal.py
30+
stunnel.log
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.9.3-p392
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
## [v3.4.2](https://github.com/liferay/alloy-font-awesome/tree/v3.4.2) (2021-09-08)
2+
3+
[Full changelog](https://github.com/liferay/alloy-font-awesome/compare/v3.2.1...v3.4.2)
4+
5+
### :package: Miscellaneous
6+
7+
- Switch less to a devDependency ([\#5](https://github.com/liferay/alloy-font-awesome/pull/5))
8+
- LPS-135072 Upgrade package version ([\#4](https://github.com/liferay/alloy-font-awesome/pull/4))
Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
# Contributing to Font Awesome
2+
3+
Looking to contribute something to Font Awesome? **Here's how you can help.**
4+
5+
## Reporting issues
6+
7+
We only accept issues that are icon requests, bug reports, or feature requests. Bugs must be isolated and reproducible problems that we can fix within the Font Awesome core. Please read the following guidelines to ensure you are the paragon of bug reporting.
8+
9+
1. **Search for existing issues.** We get a lot of duplicate issues, and you'd help us out a lot by first checking if someone else has reported the same issue. Moreover, the issue may have already been resolved with a fix available.
10+
2. **Create an isolated and reproducible test case.** Be sure the problem exists in Font Awesome's code with a [reduced test case](http://css-tricks.com/reduced-test-cases/) that should be included in each bug report.
11+
3. **Include a live example.** Make use of jsFiddle, jsBin, or Codepen to share your isolated test cases.
12+
4. **Share as much information as possible.** Include operating system and version, browser and version, version of Font Awesome, etc. where appropriate. Also include steps to reproduce the bug.
13+
14+
## Key branches
15+
16+
- `master` is the latest, deployed version (not to be used for pull requests)
17+
- `gh-pages` is the hosted docs (not to be used for pull requests)
18+
- `*-wip` branches are the official work in progress branches for the next releases. All pull requests should be submitted against the appropriate branch
19+
20+
## Notes on the repo
21+
22+
As of v3.2.0, Font Awesome's CSS, LESS, SCSS, and documentation are all powered by Jekyll templates and built before each commit and release.
23+
24+
- `_config.yml` - much of the site is driven off variables from this file, including Font Awesome and Bootstrap versions
25+
- `src/` - All edits to documentation, LESS, SCSS, and CSS should be made to files and templates in this directory
26+
- `src/icons.yml` - all LESS, SCSS, and CSS icon definitions are driven off this single file
27+
28+
## Pull requests
29+
30+
- Submit all pull requests against the appropriate `*-wip` branch for easier merging
31+
- Any changes to the docs must be made to the Liquid templates in the `src` directory
32+
- CSS changes must be done in .less and .scss files first, never the compiled files
33+
- If modifying the .less and .scss files, always recompile and commit the compiled files
34+
- Try not to pollute your pull request with unintended changes--keep them simple and small
35+
- Try to share which browsers your code has been tested in before submitting a pull request
36+
37+
## Style Guides
38+
39+
### Git Commit Messages
40+
41+
This section shows you how to write commit messages. Follow these guidelines to help us maintain order and make it easier to locate your changes.
42+
43+
Each commit message consists of a header, a body and a footer. The header has a special format that includes a type, a scope and a subject:
44+
45+
```
46+
<type>(<scope>): <subject>
47+
```
48+
49+
The header is mandatory and the scope of the header is optional.
50+
51+
> This repository follows the "[Conventional Commits](https://www.conventionalcommits.org/)" specification.
52+
53+
### Coding standards: HTML
54+
55+
- Two spaces for indentation, never tabs
56+
- Double quotes only, never single quotes
57+
- Always use proper indentation
58+
- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags)
59+
60+
### Coding standards: CSS
61+
62+
- Adhere to the [Recess CSS property order](http://markdotto.com/2011/11/29/css-property-order/)
63+
- Multiple-line approach (one property and value per line)
64+
- Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`)
65+
- End all lines with a semi-colon
66+
- For multiple, comma-separated selectors, place each selector on it's own line
67+
- Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks)
68+
69+
## Release process
70+
71+
To publish a new version, follow these steps:
72+
73+
```bash
74+
# Confirm you are logged in on Github and NPM
75+
ssh -T git@github.com
76+
yarn login
77+
78+
# Checkout the latest code
79+
git checkout master
80+
81+
# Update the CHANGELOG. With the `--interactive` flag, `changelog-generator`
82+
# will propose a semantic version. If you wish to manually set the version,
83+
# see `--help` for options.
84+
npx @liferay/changelog-generator --interactive
85+
86+
# Confirm a staged CHANGELOG.md file. Review it and update if needed.
87+
88+
# Update version. The version was determined in the last step.
89+
yarn version --new-version $VERSION
90+
91+
# Confirm a tagged commit was created. It should contain CHANGELOG.md and the
92+
# version increase in package.json.
93+
94+
# Change commit message
95+
git commit --amend -m "chore: prepare v$VERSION release"
96+
97+
# Push to Git
98+
git push --follow-tags
99+
100+
# Publish to NPM
101+
yarn publish
102+
```
103+
104+
## License
105+
106+
By contributing your code, you agree to license your contribution under the terms of the MIT License:
107+
108+
- http://opensource.org/licenses/mit-license.html
109+
110+
## Thanks
111+
112+
Thanks to Bootstrap for their wonderful CONTRIBUTING.MD doc. It was modified to create this one.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
source 'https://rubygems.org'
2+
3+
gem 'jekyll', '~> 1.0'
4+
gem 'debugger'
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
classifier (1.3.3)
5+
fast-stemmer (>= 1.0.0)
6+
colorator (0.1)
7+
columnize (0.3.6)
8+
commander (4.1.3)
9+
highline (~> 1.6.11)
10+
debugger (1.6.0)
11+
columnize (>= 0.3.1)
12+
debugger-linecache (~> 1.2.0)
13+
debugger-ruby_core_source (~> 1.2.1)
14+
debugger-linecache (1.2.0)
15+
debugger-ruby_core_source (1.2.2)
16+
directory_watcher (1.4.1)
17+
fast-stemmer (1.0.2)
18+
highline (1.6.19)
19+
jekyll (1.0.0)
20+
classifier (~> 1.3)
21+
colorator (~> 0.1)
22+
commander (~> 4.1.3)
23+
directory_watcher (~> 1.4.1)
24+
kramdown (~> 0.14)
25+
liquid (~> 2.3)
26+
maruku (~> 0.5)
27+
pygments.rb (~> 0.4.2)
28+
safe_yaml (~> 0.7.0)
29+
kramdown (0.14.2)
30+
liquid (2.5.0)
31+
maruku (0.6.1)
32+
syntax (>= 1.0.0)
33+
posix-spawn (0.3.6)
34+
pygments.rb (0.4.2)
35+
posix-spawn (~> 0.3.6)
36+
yajl-ruby (~> 1.1.0)
37+
safe_yaml (0.7.1)
38+
syntax (1.0.0)
39+
yajl-ruby (1.1.0)
40+
41+
PLATFORMS
42+
ruby
43+
44+
DEPENDENCIES
45+
debugger
46+
jekyll (~> 1.0)
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#[Font Awesome v3.2.1](http://fontawesome.io)
2+
###the iconic font designed for Bootstrap
3+
4+
Font Awesome is a full suite of 361 pictographic icons for easy scalable vector graphics on websites, created and
5+
maintained by [Dave Gandy](http://twitter.com/davegandy). Stay up to date [@fontawesome](http://twitter.com/fontawesome).
6+
7+
Get started at http://fontawesome.io!
8+
9+
##License
10+
- The Font Awesome font is licensed under the SIL OFL 1.1:
11+
- http://scripts.sil.org/OFL
12+
- Font Awesome CSS, LESS, and SASS files are licensed under the MIT License:
13+
- http://opensource.org/licenses/mit-license.html
14+
- The Font Awesome documentation is licensed under the CC BY 3.0 License:
15+
- http://creativecommons.org/licenses/by/3.0/
16+
- Attribution is no longer required as of Font Awesome 3.0, but much appreciated:
17+
- `Font Awesome by Dave Gandy - http://fontawesome.io`
18+
- Full details: http://fontawesome.io/license
19+
20+
##Changelog
21+
- v3.0.0 - all icons redesigned from scratch, optimized for Bootstrap's 14px default
22+
- v3.0.1 - much improved rendering in webkit, various bug fixes
23+
- v3.0.2 - much improved rendering and alignment in IE7
24+
- v3.1.0 - Added 54 icons, icon stacking styles, flipping and rotating icons, removed SASS support
25+
- [v3.1.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=4&page=1&state=closed)
26+
- [v3.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=3&page=1&state=closed)
27+
- [v3.2.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=5&page=1&state=closed)
28+
29+
##Versioning
30+
31+
Font Awesome will be maintained under the Semantic Versioning guidelines as much as possible. Releases will be numbered with the following format:
32+
33+
`<major>.<minor>.<patch>`
34+
35+
And constructed with the following guidelines:
36+
37+
* Breaking backward compatibility bumps the major (and resets the minor and patch)
38+
* New additions, including new icons, without breaking backward compatibility bumps the minor (and resets the patch)
39+
* Bug fixes and misc changes bumps the patch
40+
41+
For more information on SemVer, please visit http://semver.org.
42+
43+
##Author
44+
- Email: dave@fontawesome.io
45+
- Twitter: http://twitter.com/davegandy
46+
- GitHub: https://github.com/davegandy
47+
- Work: Lead Product Designer @ http://kyru.us
48+
49+
## Hacking on Font Awesome
50+
51+
From the root of the repository, install the tools used to develop.
52+
53+
$ bundle install
54+
$ npm install
55+
56+
Build the project and documentation:
57+
58+
$ bundle exec jekyll build
59+
60+
Or serve it on a local server on http://localhost:7998/Font-Awesome/:
61+
62+
$ bundle exec jekyll serve
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
safe: false
2+
port: 7998
3+
baseurl: /Font-Awesome/ # Where GitHub serves the project up from
4+
url: http://localhost:7998
5+
6+
source: src
7+
destination: _gh_pages
8+
plugins: src/_plugins
9+
10+
pygments: true
11+
permalink: pretty
12+
13+
# ensures SCSS files are compiled
14+
#include: [_bootstrap.scss, _core.scss, _extras.scss, _icons.scss, _mixins.scss, _path.scss, _variables.scss]
15+
include: [_bootstrap.scss, _core.scss, _extras.scss, _icons-alloy.scss, _icons-alloy-extra.scss, _mixins-alloy.scss, _path-alloy.scss, _variables.scss]
16+
17+
# used in building icon pages
18+
icon_meta: src/icons.yml
19+
icon_layout: icon.html # Relative to _layouts directory
20+
icon_destination: icon # Relative to destination
21+
22+
fontawesome:
23+
version: 3.2.1
24+
minor_version: 3.2
25+
url: http://fontawesome.io
26+
legacy_url: http://fortawesome.github.com/Font-Awesome/
27+
blog_url: http://blog.fontawesome.io
28+
twitter: fontawesome
29+
tagline: The iconic font designed for Bootstrap
30+
author:
31+
name: Dave Gandy
32+
email: dave@fontawesome.io
33+
twitter: davegandy
34+
work:
35+
name: Kyruus
36+
url: http://kyruus.com
37+
title: Lead Product Designer
38+
github:
39+
url: https://github.com/FortAwesome/Font-Awesome
40+
project: Font-Awesome
41+
org: FortAwesome
42+
license:
43+
font:
44+
version: SIL OFL 1.1
45+
url: http://scripts.sil.org/OFL
46+
code:
47+
version: MIT License
48+
url: http://opensource.org/licenses/mit-license.html
49+
documentation:
50+
version: CC BY 3.0
51+
url: http://creativecommons.org/licenses/by/3.0/
52+
53+
bootstrap:
54+
version: 2.3.2
55+
url: http://getbootstrap.com
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"name": "fortawesome/font-awesome",
3+
"description": "The iconic font designed for Bootstrap",
4+
"keywords": ["font", "awesome", "fontawesome", "icon", "font", "bootstrap"],
5+
"homepage": "http://fontawesome.io/",
6+
"authors": [
7+
{
8+
"name": "Dave Gandy",
9+
"email": "dave@fontawesome.io",
10+
"role": "Developer",
11+
"homepage": "http://twitter.com/davegandy"
12+
}
13+
],
14+
"extra": {
15+
"branch-alias": {
16+
"dev-master": "3.2.x-dev"
17+
}
18+
},
19+
"license": [
20+
"OFL-1.1",
21+
"MIT"
22+
],
23+
"require-dev": {
24+
"jekyll": "1.0.2",
25+
"lessc": "1.3.3"
26+
}
27+
}

0 commit comments

Comments
 (0)