Skip to content

Bump bootstrap from 4.6.0 to 5.1.0 #1908

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.

Sign up for GitHub

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

Closed
dependabot wants to merge 2 commits into from
Closed

Bump bootstrap from 4.6.0 to 5.1.0 #1908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2d8551
Bump bootstrap from 4.6.0 to 5.1.0
dependabot[bot] Aug 5, 2021
0358113
WIP
dmetzner Aug 7, 2021
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
33 changes: 24 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"@material/top-app-bar": "^12.0",
"ajv": "^8.6.2",
"animate.css": "^4.1.1",
"bootstrap": "^4.6.0",
"bootstrap": "^5.1.0",
"clipboard": "^2.0.8",
"external-svg-loader": "^1.3.4",
"jquery": "^3.6.0",
Expand Down
4 changes: 2 additions & 2 deletions templates/Default/sidebar.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
<a class="nav-link" href="{{ url('notifications') }}" id="sidebar-notifications">
<span class="sidebar-link-icon material-icons">notifications</span>
<span class="sidebar-link-text">{{ "notifications"|trans({}, "catroweb") }}</span>
<span class="badge-pill badge-danger all-notifications" id="sidebar_badge--unseen-notifications"></span>
<span class="rounded-pill bg-danger all-notifications" id="sidebar_badge--unseen-notifications"></span>
</a>
</li>

<li class="nav-item">
<a class="nav-link" href="{{ url('achievements_overview') }}" id="sidebar-achievements">
<span class="sidebar-link-icon material-icons">events</span>
<span class="sidebar-link-text">{{ "achievements.sidebar.title"|trans({}, "catroweb") }}</span>
<span class="badge-pill badge-primary" id="sidebar_badge--unseen-achievements"></span>
<span class="rounded-pill bg-primary" id="sidebar_badge--unseen-achievements"></span>
</a>
</li>

Expand Down
4 changes: 2 additions & 2 deletions templates/Header/header_notification_options.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
class="btn top-app-bar-btn-options mdc-list-item mdc-ripple-upgraded"
role="menuitem"
tabindex="0">
<span class="material-icons mr-2">delete</span><span class="top-app-bar-btn-options-text">
<span class="material-icons me-2">delete</span><span class="top-app-bar-btn-options-text">
{{ "deleteAllNotificationsButtonTitle"|trans({}, "catroweb") }}
</span>
</li>
Expand All @@ -17,7 +17,7 @@
class="btn top-app-bar-btn-options mdc-list-item mdc-ripple-upgraded"
role="menuitem"
tabindex="0">
<span class="material-icons mr-2">done</span><span class="top-app-bar-btn-options-text">
<span class="material-icons me-2">done</span><span class="top-app-bar-btn-options-text">
{{ "clearAllNotificationsButtonTitle"|trans({}, "catroweb") }}
</span>
</li>
Expand Down
4 changes: 2 additions & 2 deletions templates/Header/header_project_options.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
role="menuitem"
tabindex="0"
data-clipboard-text="{{ url('program', { id : program.id }) }}">
<span class="material-icons mr-2">share</span><span id="top-app-bar__btn-share-text" class="top-app-bar-btn-options-text">
<span class="material-icons me-2">share</span><span id="top-app-bar__btn-share-text" class="top-app-bar-btn-options-text">
{{ "share.text"|trans({}, "catroweb") }}
</span>
</li>
Expand All @@ -19,7 +19,7 @@
class="btn top-app-bar-btn-options mdc-list-item mdc-ripple-upgraded"
role="menuitem"
tabindex="1">
<span class="material-icons mr-2">flag</span><span class="top-app-bar-btn-options-text">
<span class="material-icons me-2">flag</span><span class="top-app-bar-btn-options-text">
{{ "report"|trans({}, "catroweb") }}
</span>
</li>
Expand Down
4 changes: 2 additions & 2 deletions templates/Header/header_studio_options.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
role="menuitem"
tabindex="0"
data-clipboard-text="{{ url('studio_details', { id : studio.id }) }}">
<span class="material-icons mr-2">share</span><span id="top-app-bar__btn-share-text" class="top-app-bar-btn-options-text">
<span class="material-icons me-2">share</span><span id="top-app-bar__btn-share-text" class="top-app-bar-btn-options-text">
{{ "share.text"|trans({}, "catroweb") }}
</span>
</li>
<li id="top-app-bar__btn-report-studio"
class="btn top-app-bar-btn-options mdc-list-item mdc-ripple-upgraded"
role="menuitem"
tabindex="1">
<span class="material-icons mr-2">flag</span><span class="top-app-bar-btn-options-text">
<span class="material-icons me-2">flag</span><span class="top-app-bar-btn-options-text">
{{ "report"|trans({}, "catroweb") }}
</span>
</li>
Expand Down
63 changes: 33 additions & 30 deletions templates/Index/welcome-section.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,38 +22,41 @@
{{ include('Index/youtubeHelpVideo.html.twig') }}
</div>
<div class="col-12 col-lg-6 mt-2">
<a class="btn btn-primary btn-block" target="_blank" href="{{ url('google_play_store') }}">
<i class="material-icons align-bottom">get_app</i>
{# <img style="width: 1.5rem; height: 1.5rem;" alt="Play Store Logo" src="{{ asset('images/social/google_playstore.png') }}"/> #}
<span> {{ "googlePlay"|trans({}, "catroweb") }}</span>
</a>
{% if flavor() == "luna" %}
<a class="btn btn-primary btn-block" target="_blank" href="https://catrob.at/lcd">
<img style="height: 1.5rem; width: 1.5rem;" alt="Discord server"
src="{{ asset('images/social/Discord-Logo-White.svg') }}">
<span>Discord chat</span>
</a>
{% elseif flavor() == 'arduino' %}
{% elseif flavor() == 'mindstorms' %}
{# show nothing for now #}
{% elseif flavor() == 'embroidery' %}
<a class="btn btn-primary btn-block" target="_blank" href="https://www.instagram.com/code_n_stitch/">
<i class="material-icons align-bottom">explore</i>
{# <img alt="Code&Stitch Instagram" src="{{ asset('images/social/instagram.svg') }}"> #}
<span>Instagram</span>
</a>
{% else %}
<a class="btn btn-primary btn-block" target="_blank" href="https://catrob.at/ca">
<div class="d-grid gap-2">
<a class="btn btn-primary btn-block" target="_blank" href="{{ url('google_play_store') }}">
<i class="material-icons align-bottom">get_app</i>
{# <img style="width: 1.5rem; height: 1.5rem;" alt="App Store Logo" src="{{ asset('images/social/apple_logo.png') }}"/> #}
<span> {{ "iosAppStore"|trans({}, "catroweb") }}</span>
{# <img style="width: 1.5rem; height: 1.5rem;" alt="Play Store Logo" src="{{ asset('images/social/google_playstore.png') }}"/> #}
<span> {{ "googlePlay"|trans({}, "catroweb") }}</span>
</a>
<a class="btn btn-primary btn-block" target="_blank" href="https://catrob.at/HuaweiAppGallery">
<i class="material-icons align-bottom">get_app</i>
{# <img style="width: 1.5rem; height: 1.5rem;" alt="Huawei AppGallery Logo" src="{{ asset('images/social/huawei_logo.png') }}"/> #}
<span> {{ "huaweiAppGallery"|trans({}, "catroweb") }}</span>
</a>
{% endif %}
{% if flavor() == "luna" %}
<a class="btn btn-primary btn-block" target="_blank" href="https://catrob.at/lcd">
<img style="height: 1.5rem; width: 1.5rem;" alt="Discord server"
src="{{ asset('images/social/Discord-Logo-White.svg') }}">
<span>Discord chat</span>
</a>
{% elseif flavor() == 'arduino' %}
{% elseif flavor() == 'mindstorms' %}
{# show nothing for now #}
{% elseif flavor() == 'embroidery' %}
<a class="btn btn-primary btn-block" target="_blank" href="https://www.instagram.com/code_n_stitch/">
<i class="material-icons align-bottom">explore</i>
{# <img alt="Code&Stitch Instagram" src="{{ asset('images/social/instagram.svg') }}"> #}
<span>Instagram</span>
</a>
{% else %}
<a class="btn btn-primary btn-block" target="_blank" href="https://catrob.at/ca">
<i class="material-icons align-bottom">get_app</i>
{# <img style="width: 1.5rem; height: 1.5rem;" alt="App Store Logo" src="{{ asset('images/social/apple_logo.png') }}"/> #}
<span> {{ "iosAppStore"|trans({}, "catroweb") }}</span>
</a>
<a class="btn btn-primary btn-block" target="_blank" href="https://catrob.at/HuaweiAppGallery">
<i class="material-icons align-bottom">get_app</i>
{# <img style="width: 1.5rem; height: 1.5rem;" alt="Huawei AppGallery Logo" src="{{ asset('images/social/huawei_logo.png') }}"/> #}
<span> {{ "huaweiAppGallery"|trans({}, "catroweb") }}</span>
</a>
{% endif %}
</div>

</div>
</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions templates/Program/program.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@
<span class="translate-program-button-wrapper">
<span id="program-translation-button" class="program-translation-button catro-icon-button"
data-toggle="tooltip" title="{{ 'programs.showTranslation'|trans({}, 'catroweb') }}">
<i class="ml-2 material-icons">
<i class="ms-2 material-icons">
translate
</i>
</span>
<span id="program-translation-loading-spinner" style="display: none;">
<i class="ml-2 material-icons">
<i class="ms-2 material-icons">
{% include 'Default/loadingSpinner.html.twig' with {'size': 'small'} %}
</i>
</span>
<span id="remove-program-translation-button" class="program-comment-translation-button catro-icon-button" style="display: none"
data-toggle="tooltip" title="Hide Translation">
<i class="ml-2 material-icons" data-toggle="tooltip" title="{{ 'programs.hideTranslation'|trans({}, 'catroweb') }}">
<i class="ms-2 material-icons" data-toggle="tooltip" title="{{ 'programs.hideTranslation'|trans({}, 'catroweb') }}">
close
</i>
</span>
Expand All @@ -59,7 +59,7 @@
<div class="" onclick="program.projectViewButtonsAction('{{ path('profile', {'id': program.user.id }) }}', '#project-user-spinner{{ suffix|default('') }}',
'#code-view-icon{{ suffix|default('') }}')">
<a class="icon-text align-bottom" id="program-owner-username">
<i class="material-icons pr-2" id="user-profile-icon">person</i>
<i class="material-icons pe-2" id="user-profile-icon">person</i>
{{ program.user }}
</a>
<span>
Expand All @@ -71,12 +71,12 @@

<div class="">
<i class="material-icons mt-2">query_builder</i>
<span class="icon-text ml-2 align-bottom mt-2">{{ program_details.age }}</span>
<span class="icon-text ms-2 align-bottom mt-2">{{ program_details.age }}</span>
</div>

<div class="">
<i class="material-icons mt-2">description</i>
<span class="icon-text ml-2 align-bottom mt-2">{{ program_details.filesize }} MB</span>
<span class="icon-text ms-2 align-bottom mt-2">{{ program_details.filesize }} MB</span>
</div>

<div id="project-like" class="d-none d-lg-block mt-3">
Expand Down
8 changes: 4 additions & 4 deletions templates/Program/programComments.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<span class="translate-comment-button-wrapper">
<span id="comment-translation-button-{{ comment.id }}" class="comment-translation-button catro-icon-button"
data-toggle="tooltip" title="{{ 'programs.showTranslation'|trans({}, 'catroweb') }}">
<i class="ml-3 material-icons">
<i class="ms-3 material-icons">
translate
</i>
</span>
Expand All @@ -67,7 +67,7 @@
</span>
<span id="remove-comment-translation-button-{{ comment.id }}" class="remove-comment-translation-button catro-icon-button" style="display: none"
data-toggle="tooltip" title="Hide Translation">
<i class="ml-3 material-icons" data-toggle="tooltip" title="{{ 'programs.hideTranslation'|trans({}, 'catroweb') }}">
<i class="ms-3 material-icons" data-toggle="tooltip" title="{{ 'programs.hideTranslation'|trans({}, 'catroweb') }}">
close
</i>
</span>
Expand All @@ -78,14 +78,14 @@
{# Everybody, but the comment owner must be able to report a comment #}
<a id="comment-report-button-{{ comment.id }}" class="comment-report-button"
data-toggle="tooltip" title="{{ 'programs.report'|trans({}, 'catroweb') }}">
<i class="ml-3 material-icons text-danger">not_interested</i>
<i class="ms-3 material-icons text-danger">not_interested</i>
</a>
{% endif %}
{% if program_details.isAdmin or (app.user and comment.username == app.user.username) %}
{# Only Admins and comment owner can delete the comment #}
<a id="comment-delete-button-{{ comment.id }}" class="comment-delete-button"
data-toggle="tooltip" title="{{ 'programs.delete'|trans({}, 'catroweb') }}">
<i class="ml-2 material-icons text-danger">delete</i>
<i class="ms-2 material-icons text-danger">delete</i>
</a>
{% endif %}
</div>
Expand Down
6 changes: 3 additions & 3 deletions templates/Program/program_apk_generation_buttons.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div>
<button id="apk-pending{{ suffix|default('') }}"
class="btn btn-outline-primary btn-block d-none">
<i class="material-icons align-bottom text-left">
<i class="material-icons align-bottom text-start">
{% include 'Default/loadingSpinner.html.twig' with {'spinner_id': 'apk-progressbar' ~ suffix|default(), 'size': 'small'} %}
</i>
<span>{{ "apk.preparing"|trans({}, "catroweb") }}</span>
Expand All @@ -19,12 +19,12 @@
<div>
<button id="apk-download{{ suffix|default('') }}"
class="btn btn-outline-primary btn-block d-none">
<i class="material-icons text-left d-none">
<i class="material-icons text-start d-none">
{% include 'Default/loadingSpinner.html.twig' with {'spinner_id': 'download-spinner' ~ suffix|default(), 'size': 'small'} %}
</i>
<i class="material-icons align-bottom">casino</i>
<span>{{ "apk.download"|trans({}, "catroweb") }}</span>
</button>
</div>
<i class="material-icons text-left d-none" id="apk-pb{{ suffix|default('') }}">
<i class="material-icons text-start d-none" id="apk-pb{{ suffix|default('') }}">
{% include 'Default/loadingSpinner.html.twig' with {'spinner_id': 'download-progressbar' ~ suffix|default(), 'size': 'small'} only %}</i>
2 changes: 1 addition & 1 deletion templates/Program/program_code_statistics_button.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
class="btn btn-outline-primary btn-block"
onclick="program.projectViewButtonsAction('{{ path('code_statistics', {'id': program.id }) }}', '#code-statistics-button-spinner{{ suffix|default('') }}',
'#code-statistics-icon{{ suffix|default('') }}')">
<i class="material-icons d-none text-left" id="code-statistics-button-spinner{{ suffix|default('') }}">
<i class="material-icons d-none text-start" id="code-statistics-button-spinner{{ suffix|default('') }}">
{% include 'Default/loadingSpinner.html.twig' with {'spinner_id': 'code-statistics-spinner' ~ suffix|default(), 'size': 'small'} %}
</i>
<i class="material-icons align-bottom" id="code-statistics-icon{{ suffix|default('') }}">show_chart</i>
Expand Down
2 changes: 1 addition & 1 deletion templates/Program/program_code_view_button.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
class="btn btn-outline-primary btn-block"
onclick="program.projectViewButtonsAction('{{ path('code_view', {'id': program.id }) }}', '#code-view-button-spinner{{ suffix|default('') }}',
'#code-view-icon{{ suffix|default('') }}')">
<i class="material-icons d-none text-left" id="code-view-button-spinner{{ suffix|default('') }}">
<i class="material-icons d-none text-start" id="code-view-button-spinner{{ suffix|default('') }}">
{% include 'Default/loadingSpinner.html.twig' with {'spinner_id': 'code-view-spinner' ~ suffix|default(), 'size': 'small'} %}
</i>
<i class="material-icons align-bottom" id="code-view-icon">extension</i>
Expand Down
6 changes: 3 additions & 3 deletions templates/Program/program_description.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{% if app.user and my_program %}
<a data-toggle="tooltip" title="{{ 'programs.editDescription'|trans({}, 'catroweb') }}">
<i id="edit-description-button"
class="ml-3 material-icons catro-icon-button align-bottom">edit</i>
class="ms-3 material-icons catro-icon-button align-bottom">edit</i>
</a>
{% endif %}
</span>
Expand Down Expand Up @@ -46,7 +46,7 @@
{% if app.user and my_program %}
<a data-toggle="tooltip" title="{{ 'programs.editCredits'|trans({}, 'catroweb') }}">
<i id="edit-credits-button"
class="ml-3 material-icons catro-icon-button align-bottom">edit</i>
class="ms-3 material-icons catro-icon-button align-bottom">edit</i>
</a>
{% endif %}
</span>
Expand Down Expand Up @@ -79,7 +79,7 @@
{% if app.user and my_program %}
<a data-toggle="tooltip" title="{{ 'programs.editCredits'|trans({}, 'catroweb') }}">
<i id="edit-credits-button"
class="ml-3 material-icons catro-icon-button align-bottom">edit</i>
class="ms-3 material-icons catro-icon-button align-bottom">edit</i>
</a>
{% endif %}
</span>
Expand Down
Loading