diff --git a/doc/sphinx-guides/source/_static/fontcustom-preview.html b/doc/sphinx-guides/source/_static/fontcustom-preview.html new file mode 100644 index 00000000000..7d0d707a674 --- /dev/null +++ b/doc/sphinx-guides/source/_static/fontcustom-preview.html @@ -0,0 +1,429 @@ + + + + fontcustom glyphs preview + + + + + + + + + +
+
+

fontcustom contains 15 glyphs:

+ Toggle Preview Characters +
+ + +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ + + +
+ + diff --git a/doc/sphinx-guides/source/_static/fontcustom.css b/doc/sphinx-guides/source/_static/fontcustom.css index 9499403bf7e..6e12425c1f6 100644 --- a/doc/sphinx-guides/source/_static/fontcustom.css +++ b/doc/sphinx-guides/source/_static/fontcustom.css @@ -4,12 +4,12 @@ @font-face { font-family: "fontcustom"; - src: url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.eot"); - src: url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.eot?#iefix") format("embedded-opentype"), - url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff2") format("woff2"), - url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff") format("woff"), - url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.ttf") format("truetype"), - url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.svg#fontcustom") format("svg"); + src: url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.eot"); + src: url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.eot?#iefix") format("embedded-opentype"), + url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff2") format("woff2"), + url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff") format("woff"), + url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.ttf") format("truetype"), + url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.svg#fontcustom") format("svg"); font-weight: normal; font-style: normal; } @@ -17,7 +17,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: "fontcustom"; - src: url("./fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.svg#fontcustom") format("svg"); + src: url("fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.svg#fontcustom") format("svg"); } } @@ -53,18 +53,18 @@ font-smoothing: antialiased; } -.icon-astro:before { content: "\f104"; } -.icon-audio:before { content: "\f105"; } -.icon-code:before { content: "\f10b"; } -.icon-dataset:before { content: "\f102"; } -.icon-dataverse:before { content: "\f100"; } -.icon-document:before { content: "\f106"; } -.icon-file:before { content: "\f10a"; } -.icon-geodata:before { content: "\f107"; } -.icon-image:before { content: "\f103"; } -.icon-network:before { content: "\f10c"; } -.icon-other:before { content: "\f10d"; } -.icon-package:before { content: "\f10f"; } -.icon-tabular:before { content: "\f108"; } -.icon-unlock:before { content: "\f10e"; } -.icon-video:before { content: "\f109"; } +.icon-astro:before { content: "\f114"; } +.icon-audio:before { content: "\f115"; } +.icon-code:before { content: "\f116"; } +.icon-dataset:before { content: "\f117"; } +.icon-dataverse:before { content: "\f118"; } +.icon-document:before { content: "\f119"; } +.icon-file:before { content: "\f11a"; } +.icon-geodata:before { content: "\f11b"; } +.icon-image:before { content: "\f11c"; } +.icon-network:before { content: "\f11d"; } +.icon-other:before { content: "\f11f"; } +.icon-package:before { content: "\f120"; } +.icon-tabular:before { content: "\f122"; } +.icon-unlock:before { content: "\f123"; } +.icon-video:before { content: "\f124"; } diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.eot b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.eot new file mode 100644 index 00000000000..bf233901ed7 Binary files /dev/null and b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.eot differ diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.svg b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.svg new file mode 100644 index 00000000000..b35ccdb6076 --- /dev/null +++ b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.svg @@ -0,0 +1,127 @@ + + + + + +Created by FontForge 20201107 at Fri Jul 23 16:57:46 2021 + By Philip Durbin + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.ttf b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.ttf new file mode 100644 index 00000000000..de307f17f62 Binary files /dev/null and b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.ttf differ diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff new file mode 100644 index 00000000000..a38775fee1f Binary files /dev/null and b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff differ diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff2 b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff2 new file mode 100644 index 00000000000..f246005260c Binary files /dev/null and b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_0f2e3abd7943864d8b51d195be0f5883.woff2 differ diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.eot b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.eot deleted file mode 100644 index 1f5dccf4cf4..00000000000 Binary files a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.eot and /dev/null differ diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.svg b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.svg deleted file mode 100644 index c26d77cbd2a..00000000000 --- a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.svg +++ /dev/null @@ -1,168 +0,0 @@ - - - - - -Created by FontForge 20141215 at Thu Aug 17 11:31:46 2017 - By Michael Heppler - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.ttf b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.ttf deleted file mode 100644 index 56ba52dc77c..00000000000 Binary files a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.ttf and /dev/null differ diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff deleted file mode 100644 index 7a7815808cf..00000000000 Binary files a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff and /dev/null differ diff --git a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff2 b/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff2 deleted file mode 100644 index 50886942958..00000000000 Binary files a/doc/sphinx-guides/source/_static/fontcustom/fontcustom_fb6bd74e6004cae7db6ffae62177daaf.woff2 and /dev/null differ diff --git a/doc/sphinx-guides/source/conf.py b/doc/sphinx-guides/source/conf.py index a68a623d24e..1a420147eb7 100755 --- a/doc/sphinx-guides/source/conf.py +++ b/doc/sphinx-guides/source/conf.py @@ -222,7 +222,7 @@ # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +html_static_path = ['_static', '_static/fontcustom-preview.html'] #html_js_files = [] diff --git a/doc/sphinx-guides/source/developers/fontcustom.rst b/doc/sphinx-guides/source/developers/fontcustom.rst new file mode 100755 index 00000000000..2a94b0ffc0b --- /dev/null +++ b/doc/sphinx-guides/source/developers/fontcustom.rst @@ -0,0 +1,102 @@ +=========== +Font Custom +=========== + +As mentioned under :ref:`style-guide-fontcustom` in the Style Guide, Dataverse uses `Font Custom`_ to create custom icon fonts. + +.. _Font Custom: https://github.com/FontCustom/fontcustom + +.. contents:: |toctitle| + :local: + +Previewing Icons +---------------- + +The process below updates a `preview page`_ that you can use to see how the icons look. + +.. _preview page: ../_static/fontcustom-preview.html + +In `scripts/icons/svg`_ in the source tree, you can see the SVG files that the icons are built from. + +.. _scripts/icons/svg: https://github.com/IQSS/dataverse/tree/develop/scripts/icons + +Install Font Custom +------------------- + +You'll need Font Custom and its dependencies installed if you want to update the icons. + +Ruby Version +~~~~~~~~~~~~ + +Font Custom is written in Ruby. Ruby 3.0 didn't "just work" with FontAwesome but Ruby 2.7 was fine. + +RVM is a good way to install a specific version of Ruby: https://rvm.io + +Install Dependencies and Font Custom Gem +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The brew commands below assume you are on a Mac. See :doc:`dev-environment` for more on ``brew``. + +.. code-block:: bash + + brew tap bramstein/webfonttools + brew update + brew install woff2 + brew install sfnt2woff + brew install fontforge + brew install eot-utils + gem install fontcustom + + +(``brew install sfnt2woff`` isn't currently listed in the FontCustom README but it's in mentioned in https://github.com/FontCustom/fontcustom/pull/385) + +If ``fontcustom --help`` works now, you have it installed. + +Updating Icons +-------------- + +Navigate to ``scripts/icons`` in the source tree (or `online`_) and you will find: + +- An ``svg`` directory containing the "source" for the icons. +- Scripts to update the icons. + +.. _online: https://github.com/IQSS/dataverse/tree/develop/scripts/icons + +There is a copy of these icons in both the app and the guides. We'll update the guides first because it's much quicker to iterate and notice any problems with the icons. + +Updating the Guides Icons +~~~~~~~~~~~~~~~~~~~~~~~~~ + +Run ``docs.sh`` and then open ``../../doc/sphinx-guides/source/_static/fontcustom-preview.html`` in a browser to look at the icons. (This is the `preview page`_ mentioned above that gets incorporated in the next Sphinx build.) + +Update any files in the ``svg`` directory and run the script again to see any differences. + +Note that Font Custom creates font files with unique names. For this reason, we should remove the old files from git as we add the new ones. The script deletes the old files for you but in a step below we'll do a ``git add`` to stage this change. + +Updating the App Icons +~~~~~~~~~~~~~~~~~~~~~~ + +Assuming you're happy with how the icons look in the preview page in the guides, you can move on to updating the icons in the Dataverse app itself. + +This time the script is called ``app.sh`` and it works the same way with the addition of tweaking some URLs. Go ahead and run this script and do a full "clean and build" before making sure the changes are visible in the application. + +Committing Changes to Git +~~~~~~~~~~~~~~~~~~~~~~~~~ + +As mentioned above, icons are in both the app and the docs. Again, because the filenames change, we should make sure the old files are removed from git. + +From the root of the repo, run the following: + +.. code-block:: bash + + git add doc/sphinx-guides/source/_static + git add src/main/webapp/resources + +That should be enough to make sure old files are replaced by new ones. At this point, you can commit and make a pull request. + +Caveats About Font Custom +------------------------- + +Font Custom is a useful tool and has an order of magnitude more stars on GitHub than its competitors. However, an `issue`_ suggests that the tool is somewhat abandoned. Its domain has expired but you can still get at what used to be its website at https://fontcustom.github.io/fontcustom/ + +.. _issue: https://github.com/FontCustom/fontcustom/issues/321 diff --git a/doc/sphinx-guides/source/developers/index.rst b/doc/sphinx-guides/source/developers/index.rst index 78d4a6f378a..405e2e64a59 100755 --- a/doc/sphinx-guides/source/developers/index.rst +++ b/doc/sphinx-guides/source/developers/index.rst @@ -38,3 +38,4 @@ Developer Guide dataset-semantic-metadata-api dataset-migration-api workflows + fontcustom diff --git a/doc/sphinx-guides/source/style/foundations.rst b/doc/sphinx-guides/source/style/foundations.rst index f016e005336..31e0c314a05 100755 --- a/doc/sphinx-guides/source/style/foundations.rst +++ b/doc/sphinx-guides/source/style/foundations.rst @@ -277,10 +277,12 @@ There are over 250 glyphs in font format from the Glyphicon Halflings set provid -FontCustom Icon Font --------------------- +.. _style-guide-fontcustom: + +Font Custom Icon Font +--------------------- -With the use of `FontCustom `__ we were able to generate our own custom icon webfonts. We use these in the search result cards to help distinguish between Dataverse collection, dataset and file results. +With the use of `Font Custom `__ we generate our own custom icon fonts. We use these in the search result cards to help distinguish between Dataverse collection, dataset and file results. .. raw:: html @@ -298,6 +300,7 @@ With the use of `FontCustom `__ we wer +The :doc:`/developers/fontcustom` section of the Developer Guide explains how to update these custom icons. Socicon Icon Font ----------------- diff --git a/scripts/icons/.gitignore b/scripts/icons/.gitignore new file mode 100644 index 00000000000..26a34e81bd9 --- /dev/null +++ b/scripts/icons/.gitignore @@ -0,0 +1,2 @@ +.fontcustom-manifest.json +preview diff --git a/scripts/icons/README.md b/scripts/icons/README.md new file mode 100644 index 00000000000..61d5b49ca5d --- /dev/null +++ b/scripts/icons/README.md @@ -0,0 +1 @@ +See https://guides.dataverse.org/en/latest/developers/fontcustom.html diff --git a/scripts/icons/app.sh b/scripts/icons/app.sh new file mode 100755 index 00000000000..51883b06cb6 --- /dev/null +++ b/scripts/icons/app.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# Filenames change each time so remove the old ones. +rm ../../src/main/webapp/resources/fontcustom/* +# Generate new files (see config file for paths). +fontcustom compile -c fontcustom-app.yml +# We want a fresh run each time since we have two scripts. +rm .fontcustom-manifest.json +# Use absolute src url path to "/resources..." +# We've always done it this way. +# The sed command is extra verbose for precision and clarity. +sed -i -e 's/url("\.\./url("\/resources/' ../../src/main/webapp/resources/css/fontcustom.css +echo "Done! If all went well, you can see the icons at preview/fontcustom-preview.html" diff --git a/scripts/icons/docs.sh b/scripts/icons/docs.sh new file mode 100755 index 00000000000..4ef2e0e0193 --- /dev/null +++ b/scripts/icons/docs.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# Filenames change each time so remove the old ones. +rm ../../doc/sphinx-guides/source/_static/fontcustom/* +# Generate new files (see config file for paths). +fontcustom compile -c fontcustom-docs.yml +# We want a fresh run each time since we have two scripts. +rm .fontcustom-manifest.json diff --git a/scripts/icons/fontcustom-app.yml b/scripts/icons/fontcustom-app.yml new file mode 100644 index 00000000000..0ccf0343c90 --- /dev/null +++ b/scripts/icons/fontcustom-app.yml @@ -0,0 +1,99 @@ +# ============================================================================= +# Font Custom Configuration +# This file should live in the directory where you run `fontcustom compile`. +# For more info, visit . +# ============================================================================= + + +# ----------------------------------------------------------------------------- +# Project Info +# ----------------------------------------------------------------------------- + +# The font's name. Also determines the file names of generated templates. +#font_name: icons + +# Format of CSS selectors. {{glyph}} is substituted for the glyph name. +#css_selector: .i-{{glyph}} + +# Generate fonts without asset-busting hashes. +#no_hash: true + +# Encode WOFF fonts into the generated CSS. +#base64: true + +# Forces compilation, even if inputs have not changed +force: true + +# Display (possibly useful) debugging messages. +#debug: true + +# Hide status messages. +#quiet: true + +# Copyright information. +#copyright: + + +# ----------------------------------------------------------------------------- +# Input / Output Locations +# You can save generated fonts, CSS, and other files to different locations +# here. Font Custom can also read input vectors and templates from different +# places. +# +# NOTE: +# - Be sure to preserve the whitespace in these YAML hashes. +# - INPUT[:vectors] and OUTPUT[:fonts] are required. Everything else is +# optional. +# - Specify output locations for custom templates by including their file +# names as the key. +# ----------------------------------------------------------------------------- + +input: + vectors: svg +# templates: my/templates + +output: + fonts: ../../src/main/webapp/resources/fontcustom + css: ../../src/main/webapp/resources/css + preview: preview +# my-custom-template.yml: path/to/template/output + + +# ----------------------------------------------------------------------------- +# Templates +# A YAML array of templates and files to generate alongside fonts. Custom +# templates should be saved in the INPUT[:templates] directory and referenced +# by their base file name. +# +# For Rails and Compass templates, set `preprocessor_path` as the relative +# path from OUTPUT[:css] to OUTPUT[:fonts]. By default, these are the same +# directory. +# +# Included in Font Custom: preview, css, scss, scss-rails +# Default: css, preview +# ----------------------------------------------------------------------------- + +#templates: +#- scss-rails +#- preview +#- my-custom-template.yml + +#preprocessor_path: ../fonts/ + + +# ----------------------------------------------------------------------------- +# Font Settings (defaults shown) +# ----------------------------------------------------------------------------- + +# Size (in pica points) for which your font is designed. +#font_design_size: 16 + +# The em size. Setting this will scale the entire font to the given size. +#font_em: 512 + +# The font's ascent and descent. Used to calculate the baseline. +#font_ascent: 448 +#font_descent: 64 + +# Horizontally fit glyphs to their individual vector widths. +#autowidth: false diff --git a/scripts/icons/fontcustom-docs.yml b/scripts/icons/fontcustom-docs.yml new file mode 100644 index 00000000000..dfc66081d9c --- /dev/null +++ b/scripts/icons/fontcustom-docs.yml @@ -0,0 +1,100 @@ +# ============================================================================= +# Font Custom Configuration +# This file should live in the directory where you run `fontcustom compile`. +# For more info, visit . +# ============================================================================= + + +# ----------------------------------------------------------------------------- +# Project Info +# ----------------------------------------------------------------------------- + +# The font's name. Also determines the file names of generated templates. +#font_name: icons + +# Format of CSS selectors. {{glyph}} is substituted for the glyph name. +#css_selector: .i-{{glyph}} + +# Generate fonts without asset-busting hashes. +#no_hash: true + +# Encode WOFF fonts into the generated CSS. +#base64: true + +# Forces compilation, even if inputs have not changed +force: true + +# Display (possibly useful) debugging messages. +#debug: true + +# Hide status messages. +#quiet: true + +# Copyright information. +#copyright: + + +# ----------------------------------------------------------------------------- +# Input / Output Locations +# You can save generated fonts, CSS, and other files to different locations +# here. Font Custom can also read input vectors and templates from different +# places. +# +# NOTE: +# - Be sure to preserve the whitespace in these YAML hashes. +# - INPUT[:vectors] and OUTPUT[:fonts] are required. Everything else is +# optional. +# - Specify output locations for custom templates by including their file +# names as the key. +# ----------------------------------------------------------------------------- + +input: + vectors: svg +# templates: my/templates + +output: + fonts: ../../doc/sphinx-guides/source/_static/fontcustom + css: ../../doc/sphinx-guides/source/_static + + preview: ../../doc/sphinx-guides/source/_static +# my-custom-template.yml: path/to/template/output + + +# ----------------------------------------------------------------------------- +# Templates +# A YAML array of templates and files to generate alongside fonts. Custom +# templates should be saved in the INPUT[:templates] directory and referenced +# by their base file name. +# +# For Rails and Compass templates, set `preprocessor_path` as the relative +# path from OUTPUT[:css] to OUTPUT[:fonts]. By default, these are the same +# directory. +# +# Included in Font Custom: preview, css, scss, scss-rails +# Default: css, preview +# ----------------------------------------------------------------------------- + +#templates: +#- scss-rails +#- preview +#- my-custom-template.yml + +#preprocessor_path: ../fonts/ + + +# ----------------------------------------------------------------------------- +# Font Settings (defaults shown) +# ----------------------------------------------------------------------------- + +# Size (in pica points) for which your font is designed. +#font_design_size: 16 + +# The em size. Setting this will scale the entire font to the given size. +#font_em: 512 + +# The font's ascent and descent. Used to calculate the baseline. +#font_ascent: 448 +#font_descent: 64 + +# Horizontally fit glyphs to their individual vector widths. +#autowidth: false diff --git a/scripts/icons/svg/astro.svg b/scripts/icons/svg/astro.svg new file mode 100644 index 00000000000..9104a106c64 --- /dev/null +++ b/scripts/icons/svg/astro.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/scripts/icons/svg/audio.svg b/scripts/icons/svg/audio.svg new file mode 100644 index 00000000000..d50b18508bb --- /dev/null +++ b/scripts/icons/svg/audio.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/scripts/icons/svg/code.svg b/scripts/icons/svg/code.svg new file mode 100644 index 00000000000..fc1d3bdfd52 --- /dev/null +++ b/scripts/icons/svg/code.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + diff --git a/scripts/icons/svg/dataset.svg b/scripts/icons/svg/dataset.svg new file mode 100644 index 00000000000..f1ac63397c9 --- /dev/null +++ b/scripts/icons/svg/dataset.svg @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/scripts/icons/svg/dataverse.svg b/scripts/icons/svg/dataverse.svg new file mode 100644 index 00000000000..981f16db17a --- /dev/null +++ b/scripts/icons/svg/dataverse.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/scripts/icons/svg/document.svg b/scripts/icons/svg/document.svg new file mode 100644 index 00000000000..53ae21d8fd8 --- /dev/null +++ b/scripts/icons/svg/document.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + diff --git a/scripts/icons/svg/file.svg b/scripts/icons/svg/file.svg new file mode 100644 index 00000000000..fcd32098dce --- /dev/null +++ b/scripts/icons/svg/file.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/scripts/icons/svg/geodata.svg b/scripts/icons/svg/geodata.svg new file mode 100644 index 00000000000..7a1032a00be --- /dev/null +++ b/scripts/icons/svg/geodata.svg @@ -0,0 +1,10 @@ + + + + + diff --git a/scripts/icons/svg/image.svg b/scripts/icons/svg/image.svg new file mode 100644 index 00000000000..c7df826129e --- /dev/null +++ b/scripts/icons/svg/image.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/scripts/icons/svg/network.svg b/scripts/icons/svg/network.svg new file mode 100644 index 00000000000..f4d012a1fe4 --- /dev/null +++ b/scripts/icons/svg/network.svg @@ -0,0 +1,10 @@ + + + + + diff --git a/scripts/icons/svg/other.svg b/scripts/icons/svg/other.svg new file mode 100644 index 00000000000..82fc3892389 --- /dev/null +++ b/scripts/icons/svg/other.svg @@ -0,0 +1,6 @@ + + + + + diff --git a/scripts/icons/svg/package.svg b/scripts/icons/svg/package.svg new file mode 100644 index 00000000000..d465c0a9997 --- /dev/null +++ b/scripts/icons/svg/package.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/scripts/icons/svg/tabular.svg b/scripts/icons/svg/tabular.svg new file mode 100644 index 00000000000..fcd32098dce --- /dev/null +++ b/scripts/icons/svg/tabular.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/scripts/icons/svg/unlock.svg b/scripts/icons/svg/unlock.svg new file mode 100644 index 00000000000..80f6de53190 --- /dev/null +++ b/scripts/icons/svg/unlock.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/scripts/icons/svg/video.svg b/scripts/icons/svg/video.svg new file mode 100644 index 00000000000..238e275c4a9 --- /dev/null +++ b/scripts/icons/svg/video.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/src/main/webapp/resources/css/fontcustom.css b/src/main/webapp/resources/css/fontcustom.css index 5e4a5bb5cbc..08b3e68450b 100644 --- a/src/main/webapp/resources/css/fontcustom.css +++ b/src/main/webapp/resources/css/fontcustom.css @@ -4,12 +4,12 @@ @font-face { font-family: "fontcustom"; - src: url("/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.eot"); - src: url("/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.eot?#iefix") format("embedded-opentype"), - url("/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff2") format("woff2"), - url("/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff") format("woff"), - url("/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.ttf") format("truetype"), - url("/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.svg#fontcustom") format("svg"); + src: url("/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.eot"); + src: url("/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.eot?#iefix") format("embedded-opentype"), + url("/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff2") format("woff2"), + url("/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff") format("woff"), + url("/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.ttf") format("truetype"), + url("/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.svg#fontcustom") format("svg"); font-weight: normal; font-style: normal; } @@ -17,7 +17,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: "fontcustom"; - src: url("/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.svg#fontcustom") format("svg"); + src: url("/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.svg#fontcustom") format("svg"); } } @@ -53,18 +53,18 @@ font-smoothing: antialiased; } -.icon-astro:before { content: "\f104"; } -.icon-audio:before { content: "\f105"; } -.icon-code:before { content: "\f10b"; } -.icon-dataset:before { content: "\f102"; } -.icon-dataverse:before { content: "\f100"; } -.icon-document:before { content: "\f106"; } -.icon-file:before { content: "\f10a"; } +.icon-astro:before { content: "\f100"; } +.icon-audio:before { content: "\f101"; } +.icon-code:before { content: "\f102"; } +.icon-dataset:before { content: "\f103"; } +.icon-dataverse:before { content: "\f104"; } +.icon-document:before { content: "\f105"; } +.icon-file:before { content: "\f106"; } .icon-geodata:before { content: "\f107"; } -.icon-image:before { content: "\f103"; } -.icon-network:before { content: "\f10c"; } -.icon-other:before { content: "\f10d"; } -.icon-package:before { content: "\f10f"; } -.icon-tabular:before { content: "\f108"; } -.icon-unlock:before { content: "\f10e"; } -.icon-video:before { content: "\f109"; } +.icon-image:before { content: "\f108"; } +.icon-network:before { content: "\f109"; } +.icon-other:before { content: "\f10a"; } +.icon-package:before { content: "\f10b"; } +.icon-tabular:before { content: "\f10c"; } +.icon-unlock:before { content: "\f10d"; } +.icon-video:before { content: "\f10e"; } diff --git a/src/main/webapp/resources/css/fontcustom.css-e b/src/main/webapp/resources/css/fontcustom.css-e new file mode 100644 index 00000000000..010c155d6e5 --- /dev/null +++ b/src/main/webapp/resources/css/fontcustom.css-e @@ -0,0 +1,70 @@ +/* + Icon Font: fontcustom +*/ + +@font-face { + font-family: "fontcustom"; + src: url("../fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.eot"); + src: url("../fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.eot?#iefix") format("embedded-opentype"), + url("../fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff2") format("woff2"), + url("../fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff") format("woff"), + url("../fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.ttf") format("truetype"), + url("../fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.svg#fontcustom") format("svg"); + font-weight: normal; + font-style: normal; +} + +@media screen and (-webkit-min-device-pixel-ratio:0) { + @font-face { + font-family: "fontcustom"; + src: url("../fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.svg#fontcustom") format("svg"); + } +} + +[data-icon]:before { content: attr(data-icon); } + +[data-icon]:before, +.icon-astro:before, +.icon-audio:before, +.icon-code:before, +.icon-dataset:before, +.icon-dataverse:before, +.icon-document:before, +.icon-file:before, +.icon-geodata:before, +.icon-image:before, +.icon-network:before, +.icon-other:before, +.icon-package:before, +.icon-tabular:before, +.icon-unlock:before, +.icon-video:before { + display: inline-block; + font-family: "fontcustom"; + font-style: normal; + font-weight: normal; + font-variant: normal; + line-height: 1; + text-decoration: inherit; + text-rendering: optimizeLegibility; + text-transform: none; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + font-smoothing: antialiased; +} + +.icon-astro:before { content: "\f100"; } +.icon-audio:before { content: "\f101"; } +.icon-code:before { content: "\f102"; } +.icon-dataset:before { content: "\f103"; } +.icon-dataverse:before { content: "\f104"; } +.icon-document:before { content: "\f105"; } +.icon-file:before { content: "\f106"; } +.icon-geodata:before { content: "\f107"; } +.icon-image:before { content: "\f108"; } +.icon-network:before { content: "\f109"; } +.icon-other:before { content: "\f10a"; } +.icon-package:before { content: "\f10b"; } +.icon-tabular:before { content: "\f10c"; } +.icon-unlock:before { content: "\f10d"; } +.icon-video:before { content: "\f10e"; } diff --git a/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.eot b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.eot new file mode 100644 index 00000000000..86533efdae4 Binary files /dev/null and b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.eot differ diff --git a/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.svg b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.svg new file mode 100644 index 00000000000..57ac72f6f8f --- /dev/null +++ b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.svg @@ -0,0 +1,127 @@ + + + + + +Created by FontForge 20201107 at Fri Jul 23 16:58:42 2021 + By Philip Durbin + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.ttf b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.ttf new file mode 100644 index 00000000000..e6bdae2f414 Binary files /dev/null and b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.ttf differ diff --git a/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff new file mode 100644 index 00000000000..ad488443904 Binary files /dev/null and b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff differ diff --git a/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff2 b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff2 new file mode 100644 index 00000000000..1c64fffa1e6 Binary files /dev/null and b/src/main/webapp/resources/fontcustom/fontcustom_2d8a223b23af3c2ffc668cd1b506f1fa.woff2 differ diff --git a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.eot b/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.eot deleted file mode 100644 index e092c9b1c55..00000000000 Binary files a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.eot and /dev/null differ diff --git a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.svg b/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.svg deleted file mode 100644 index a935291017a..00000000000 --- a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.svg +++ /dev/null @@ -1,168 +0,0 @@ - - - - - -Created by FontForge 20141215 at Tue Aug 29 11:31:31 2017 - By Michael Heppler - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.ttf b/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.ttf deleted file mode 100644 index ffb69c47bc5..00000000000 Binary files a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.ttf and /dev/null differ diff --git a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff b/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff deleted file mode 100644 index 715a3d68703..00000000000 Binary files a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff and /dev/null differ diff --git a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff2 b/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff2 deleted file mode 100644 index 5a84475d119..00000000000 Binary files a/src/main/webapp/resources/fontcustom/fontcustom_47254e4da4fa5ad5e2bb7c085027ce43.woff2 and /dev/null differ