Skip to content

Commit

Permalink
- added preconfigs.user.json
Browse files Browse the repository at this point in the history
- moved README.md to root
- added Umbraco 13.1.1 testing site

# Conflicts:
#	Our.Iconic/Our.Iconic.csproj
  • Loading branch information
skartknet committed Feb 26, 2024
1 parent ce4f9d3 commit 0b83e77
Show file tree
Hide file tree
Showing 25 changed files with 1,253 additions and 56 deletions.
6 changes: 6 additions & 0 deletions Iconic.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Our.Iconic", "Our.Iconic\Ou
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UmbracoV12", "UmbracoV12\UmbracoV12.csproj", "{6710B413-13FC-4C78-AD21-EFFCB3A9992D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UmbracoV13", "UmbracoV13\UmbracoV13.csproj", "{6EC3DC60-72CA-44FD-8726-21EFB88C4811}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -27,6 +29,10 @@ Global
{6710B413-13FC-4C78-AD21-EFFCB3A9992D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6710B413-13FC-4C78-AD21-EFFCB3A9992D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6710B413-13FC-4C78-AD21-EFFCB3A9992D}.Release|Any CPU.Build.0 = Release|Any CPU
{6EC3DC60-72CA-44FD-8726-21EFB88C4811}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6EC3DC60-72CA-44FD-8726-21EFB88C4811}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6EC3DC60-72CA-44FD-8726-21EFB88C4811}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6EC3DC60-72CA-44FD-8726-21EFB88C4811}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
112 changes: 56 additions & 56 deletions Our.Iconic/Our.Iconic.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,62 +47,62 @@
<ProjectReference Include="..\Our.Iconic.Core\Our.Iconic.Core.csproj" />
</ItemGroup>

<ItemGroup>
<Content Update="wwwroot\js\build\findPolyfill.min.js">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\js\src\iconic.controller.js">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\js\src\iconic.dialog.controller.js">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\js\src\iconic.directives.js">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\js\src\iconic.models.js">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\js\src\iconic.prevalues.controller.js">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\js\src\iconic.prevalues.editor.controller.js">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\lang\en-US.xml">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\lang\es-ES.xml">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\preconfigs.json">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Styles\iconic.css">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Styles\iconic.min.css">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Styles\iconic.min.css.map">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Styles\iconic.scss">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Views\iconic.dialog.html">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Views\iconic.edit.dialog.html">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Views\iconic.html">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Views\iconic.prevalues.html">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Content Update="wwwroot\js\build\findPolyfill.min.js">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\js\src\iconic.controller.js">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\js\src\iconic.dialog.controller.js">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\js\src\iconic.directives.js">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\js\src\iconic.models.js">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\js\src\iconic.prevalues.controller.js">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\js\src\iconic.prevalues.editor.controller.js">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\lang\en-US.xml">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\lang\es-ES.xml">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\preconfigs.json">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Styles\iconic.css">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Styles\iconic.min.css">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Styles\iconic.min.css.map">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Styles\iconic.scss">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Views\iconic.dialog.html">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Views\iconic.edit.dialog.html">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Views\iconic.html">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
<Content Update="wwwroot\Views\iconic.prevalues.html">
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</Content>
</ItemGroup>
<!-- Workaround for this bug (replace the analyzer name with the one you need to exclude (filename only, no extension) -->
<Target Name="RemoveLuceneAnalyzer" BeforeTargets="CoreCompile">
<ItemGroup>
Expand Down
59 changes: 59 additions & 0 deletions Our.Iconic/wwwroot/preconfigs.user.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"preconfigs": [
{
"name": "Glyphicons",
"selector": "\\.(glyphicon-[\\w-]+):before{",
"template": "<i class=\"glyphicon {icon}\"></i>"
},
{
"name": "Font Awesome 4",
"selector": "\\.(fa-[\\w-]+):before{",
"template": "<i class=\"fa {icon}\"></i>"
},
{
"name": "Foundation Icons",
"selector": "\\.(fi-[\\w-]+):before{",
"template": "<i class=\"{icon}\"></i>"
},
{
"name": "Material Icons",
"selector": "(\\w+) [a-zA-Z0-9_]*",
"template": "<i class=\"material-icons\">{icon}</i>"
},
{
"name": "Simple Line Icons",
"selector": "\\.(icon-[\\w-]+):before {",
"template": "<i class=\"{icon}\"></i>"
},
{
"name": "Font Awesome 5 (Brands)",
"selector": "\\.(fa-[\\w-]+):before {",
"template": "<i class=\"fab {icon}\"></i>"
},
{
"name": "Font Awesome 5 (Regular)",
"selector": "\\.(fa-[\\w-]+):before {",
"template": "<i class=\"far {icon}\"></i>"
},
{
"name": "Font Awesome 5 (Solid)",
"selector": "\\.(fa-[\\w-]+):before {",
"template": "<i class=\"fas {icon}\"></i>"
},
{
"name": "Font Awesome 5 (Light)",
"selector": "\\.(fa-[\\w-]+):before {",
"template": "<i class=\"fal {icon}\"></i>"
},
{
"name": "Font Awesome 6 (Brands)",
"selector": "\\.(fa-[\\w-]+)::before {",
"template": "<i class=\"fa-brands {icon}\"></i>"
},
{
"name": "Font Awesome 6 (Solid)",
"selector": "\\.(fa-[\\w-]+)::before {",
"template": "<i class=\"fa-solid {icon}\"></i>"
}
]
}
30 changes: 30 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Iconic Configuration & Usage Documentation


## Contents

[Configuring the Datatype](Documentation/Configuration)

[Datatype Usage and Rendering Icons](Documentation/Usage)

[Tips & Tricks](Documentation/Tips)

## How to Contribute
If you have information to share about how to configure a specific icon set, or do something cool with Iconic, please fork this repository and contribute your findings to the appropriate Documentation section.

To contribute [Code](https://github.com/skartknet/Iconic/pulls), [Issues/Bugs](https://github.com/skartknet/Iconic/issues), [Ideas, etc.](https://github.com/skartknet/Iconic/discussions) check out the [GitHub site](https://github.com/skartknet/Iconic).

## Need Help?
Head over to the [Discussions section](https://github.com/skartknet/Iconic/discussions/categories/q-a) to see if anyone else has solved you particular issue, or [add your own "Q&A" categorized post](https://github.com/skartknet/Iconic/discussions/new?category=q-a).

# Changelog

## v5.4.1
- added preconfigs.user.json
- moved README.md to root
- added Umbraco 13.1.1 testing site

## v5.4
- Update Material icons codepoints
- Fixed Rules source file not taking default CSS file is empty. (#41)
- Added support for user preconfigs
Loading

0 comments on commit 0b83e77

Please sign in to comment.