Skip to content

Commit b9b13b3

Browse files
committed
Merge branch '6.2' into 6.3
* 6.2: [Profiler] Add a tip about profiler icons Add a new item to the list of concrete examples of Code of Conduct
2 parents f0f2232 + 242a7c5 commit b9b13b3

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

contributing/code_of_conduct/concrete_example_document.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ Concrete Examples
2121
* Pattern of inappropriate social contact, such as requesting/assuming
2222
inappropriate levels of intimacy with others;
2323
* Continued one-on-one communication after requests to cease;
24-
* Putting down people based on their technology choices or their work.
24+
* Putting down people based on their technology choices or their work;
25+
* Taking photographs of conference attendees and speakers and publishing them
26+
without their explicit permission.
2527

2628
The original list is inspired and modified from `geek feminism`_ and
2729
confirmed by experiences from PHPWomen.

profiler.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,12 @@ block and set the value of two variables called ``icon`` and ``text``:
371371
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: false }) }}
372372
{% endblock %}
373373

374+
.. tip::
375+
376+
Symfony Profiler icons are selected from `Tabler icons`_, a large and open
377+
source collection of SVG icons. It's recommended to also use those icons for
378+
your own profiler panels to get a consistent look.
379+
374380
.. tip::
375381

376382
Built-in collector templates define all their images as embedded SVG files.
@@ -519,3 +525,4 @@ you'll need to configure the data collector explicitly:
519525
520526
.. _`Single-page applications`: https://en.wikipedia.org/wiki/Single-page_application
521527
.. _`Blackfire`: https://blackfire.io/docs/introduction?utm_source=symfony&utm_medium=symfonycom_docs&utm_campaign=profiler
528+
.. _`Tabler icons`: https://github.com/tabler/tabler-icons

0 commit comments

Comments
 (0)