Skip to content

Commit

Permalink
Removed rounded and radius borders in css.
Browse files Browse the repository at this point in the history
  • Loading branch information
laurentmuller committed Feb 9, 2025
1 parent 551df0d commit 2377a74
Show file tree
Hide file tree
Showing 14 changed files with 24 additions and 30 deletions.
1 change: 0 additions & 1 deletion public/css/color_picker.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
height: 1.25rem;
width: 1.5rem;
margin: 2px;
border-radius: 0;
}

.color-picker .btn-color:focus {
Expand Down
10 changes: 10 additions & 0 deletions public/css/select2.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@

.select2-container--bootstrap-5 .select2-selection {
background-color: var(--bs-body-bg) !important;
/*
border: var(--bs-border-width) solid var(--bs-border-color);
border-radius: var(--bs-border-radius);
*/
}

html[data-bs-theme=dark] .select2-container--bootstrap-5 .select2-selection__rendered {
Expand Down Expand Up @@ -37,6 +39,7 @@ html[data-bs-theme=dark] .select2-container--bootstrap-5 .select2-selection__cho
.select2-container--bootstrap-5 .select2-selection.select2-selection--single {
padding-top: 5px !important;
min-height: calc(1.5em + 0.7rem);
border-radius: 0;
}

.select2-container--bootstrap-5 .select2-selection.select2-selection--multiple {
Expand All @@ -62,6 +65,13 @@ html[data-bs-theme=dark] .select2-container--bootstrap-5 .select2-selection__cho
margin-right: 0.2rem !important;
}

.select2-container--bootstrap-5 .select2-dropdown,
.select2-container--bootstrap-5 .select2-selection,
.select2-container--bootstrap-5 .select2-dropdown .select2-search .select2-search__field,
.select2-container--bootstrap-5 .select2-selection--multiple .select2-selection__rendered .select2-selection__choice {
border-radius: 0 !important;
}

.select2-container--bootstrap-5 .select2-selection--multiple .select2-search {
display: inline;
}
Expand Down
1 change: 0 additions & 1 deletion public/css/sidebar.css
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ html[data-bs-theme=light] .navbar-vertical.navbar-dark .border-bottom {

.navbar-vertical::-webkit-scrollbar-thumb {
visibility: hidden;
border-radius: 3px;
background-color: var(--bs-secondary-bg-subtle);
}

Expand Down
6 changes: 0 additions & 6 deletions public/css/simple_editor.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,9 @@
}

.simple-editor .simple-editor-toolbar button {
border-radius: 0;
border: 0;
}

/* first button */
.simple-editor .simple-editor-toolbar .btn-group:first-child button:first-child {
border-top-left-radius: var(--bs-border-radius) !important;
}

.simple-editor .simple-editor-content {
box-sizing: border-box;
max-height: 500px;
Expand Down
10 changes: 4 additions & 6 deletions public/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ footer span {
/* read-only widget */
.form-control-plaintext.form-control-readonly {
padding: 0.375rem 0.75rem;
border-radius: var(--bs-border-radius);
border: var(--bs-border-width) solid var(--bs-border-color);
color: var(--bs-secondary-color) !important;
}
Expand Down Expand Up @@ -642,7 +641,6 @@ table.table-fixed-header th {

.small-scrollbar::-webkit-scrollbar-thumb {
visibility: hidden;
border-radius: 0;
background-color: var(--bs-secondary-bg-subtle);
}

Expand Down Expand Up @@ -837,8 +835,8 @@ span.bottom-border-gradient {
content: '';
height: 0.25rem;
bottom: -0.25rem;
left: var(--bs-border-radius);
right: var(--bs-border-radius);
left: 0;
right: 0;
}

.bottom-border-gradient-20:after {
Expand Down Expand Up @@ -875,7 +873,7 @@ span.bottom-border-gradient {
background: linear-gradient(
to right,
var(--bs-danger) calc(20% - 1px),
transparent calc(20% - 1px), transparent calc(20% + 1px),
transparent 20%, transparent calc(20% + 1px),
var(--bs-danger) calc(20% + 1px), var(--bs-danger) calc(40% - 1px),
transparent calc(40% - 1px), transparent calc(40% + 1px),
var(--bs-warning) calc(40% + 1px), var(--bs-warning) calc(60% - 1px),
Expand All @@ -889,7 +887,7 @@ span.bottom-border-gradient {
background: linear-gradient(
to right,
var(--bs-danger) calc(20% - 1px),
transparent calc(20% - 1px), transparent calc(20% + 1px),
transparent 20%, transparent calc(20% + 1px),
var(--bs-danger) calc(20% + 1px), var(--bs-danger) calc(40% - 1px),
transparent calc(40% - 1px), transparent calc(40% + 1px),
var(--bs-warning) calc(40% + 1px), var(--bs-warning) calc(60% - 1px),
Expand Down
5 changes: 1 addition & 4 deletions public/js/plugins/plugin-treeview.js
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,6 @@ $(function () {
}

that.toggling = true;
$item.removeClass('rounded-bottom');
$icon.toggleClass(options.collapseIcon).toggleClass(options.expandIcon);
$group.toggle(options.toggleDuration, function () {
const title = $icon.hasClass(options.expandIcon) ? options.texts.collapse : options.texts.expand;
Expand All @@ -529,8 +528,6 @@ $(function () {
*/
_updateBorders() {
this.$element.find('.list-group-item:first').removeClass('border-top-0');
this.$element.find('.list-group-item.rounded-bottom').removeClass('rounded-bottom');
this.$element.find('.list-group-item:visible:last').addClass('rounded-bottom');
return this;
}

Expand Down Expand Up @@ -625,7 +622,7 @@ $(function () {
itemIcon: '<i class="item-icon me-1" />',
itemText: '<span class="item-text w-100" />',
itemBadge: '<span class="badge" />',
groupItem: '<div role="group" class="group-item list-group rounded-0" />'
groupItem: '<div role="group" class="group-item list-group" />'
}
};

Expand Down
2 changes: 1 addition & 1 deletion templates/command/command_execute_result.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{% if parameters|length %}
<div class="mb-3">
<span class="form-label">{{ 'command.list.fields.arguments'|trans }}</span>
<div class="border pre-scrollable pre-scrollable-highlight-php small-scrollbar font-monospace rounded">
<div class="border pre-scrollable pre-scrollable-highlight-php small-scrollbar font-monospace">
{{ parameters|var_export_php }}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/dialog/dialog_table_page.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</div>
<div class="modal-body p-4">
<label for="page-range" class="form-label">{{ 'datatable.dialog_message'|trans }}</label>
<input id="page-range" type="range" class="form-range border rounded-pill px-1 py-2" min="1" max="100" step="1" value="1">
<input id="page-range" type="range" class="form-range border px-1 py-2" min="1" max="100" step="1" value="1">
<div class="d-flex-wrap-center">
<label id="page-record" for="page-range" class="form-label me-auto">&nbsp;</label>
<label id="page-label" for="page-range" class="form-label">&nbsp;</label>
Expand Down
5 changes: 1 addition & 4 deletions templates/fields.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,6 @@
{%- else -%}
<div class="input-group">
{%- set is_empty = not value -%}
{% if is_empty %}
{% set attr = attr|merge({class: (attr.class|default('') ~ ' rounded-end')|trim}) %}
{% endif %}
{{- block('form_widget_simple') }}
<button class="btn btn-file-delete btn-outline-secondary{% if is_empty %} d-none{% endif %}" type="button" title="{{ 'common.button_delete'|trans }}">
<i class="fa-solid fa-times"></i>
Expand Down Expand Up @@ -198,7 +195,7 @@
{%- set editor_id = form.vars.id ~ '_editor' -%}
<div class="simple-editor form-control p-0" id="{{ editor_id }}">
{% if groups|default([])|length -%}
<div class="simple-editor-toolbar btn-toolbar rounded-top d-print-none" role="toolbar">
<div class="simple-editor-toolbar btn-toolbar d-print-none" role="toolbar">
{% for group, actions in groups %}
<div class="btn-group btn-group-sm" role="group" aria-label="{{ group }}">
{% for action in actions %}
Expand Down
2 changes: 1 addition & 1 deletion templates/help/_help_tools.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{%- set full_path = 'help/images/' ~ path ~ constant('App\\Service\\HelpService::IMAGES_EXT') -%}
{% if asset_exists(full_path) %}
{% if screenshot %}<p class="mb-2">{{ 'help.labels.screenshot'|trans }}</p>{% endif %}
{{ asset_image(full_path, {class: 'img-fluid rounded', alt: 'help.labels.screenshot'|trans}) }}
{{ asset_image(full_path, {class: 'img-fluid', alt: 'help.labels.screenshot'|trans}) }}
{% endif %}
{%- endmacro %}

Expand Down
2 changes: 1 addition & 1 deletion templates/parameters/_parameters.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{%- set show = 'common.expand'|trans -%}
{%- set hide = 'common.collapse'|trans -%}
{%- set title = expanded ? hide : show -%}
<div class="card-header d-flex-wrap-center rounded-0">
<div class="card-header d-flex-wrap-center">
<a class="drop-down-icon-right card-title" href="#{{ href }}" data-bs-toggle="collapse"
aria-expanded="{{ expanded|json_encode }}" title="{{ title }}" data-show="{{ show }}" data-hide="{{ hide }}">
{{- output_icon(icon ~ ' fa-fw me-1') -}}{{- name -}}
Expand Down
2 changes: 1 addition & 1 deletion templates/test/parameter.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
{%- set hide = 'common.collapse'|trans -%}
{%- set title = expanded ? hide : show -%}
{%- set name = ('parameters.group_' ~ href)|trans -%}
<div class="card-header d-flex-wrap-center rounded-0">
<div class="card-header d-flex-wrap-center">
<a class="drop-down-icon-right card-title collapsed{% if expanded %} show{% endif %}" href="#{{ href }}"
data-bs-toggle="collapse" data-show="{{ show }}" data-hide="{{ hide }}"
title="{{ title }}" aria-expanded="{{ expanded|json_encode }}">
Expand Down
4 changes: 2 additions & 2 deletions templates/test/tree_view.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
{% from 'macros/_icons.html.twig' import icon %}
{# macros #}
{% macro side_bar_collapse(text, target, expanded = false, icon = false) %}
<button class="btn btn-toggle rounded border-0" data-bs-toggle="collapse" data-bs-target="{{ target }}" aria-expanded="{{ expanded|json_encode }}">
<button class="btn btn-toggle border-0" data-bs-toggle="collapse" data-bs-target="{{ target }}" aria-expanded="{{ expanded|json_encode }}">
{%- if icon -%}{{- icon(icon ~ ' me-1') -}}{%- endif %}{{- text -}}
</button>
{% endmacro %}
{% macro side_bar_link(text, icon = null, href = '#') %}
<li><a href="{{ href }}" class="rounded d-block">{{ icon(icon, text) }}</a></li>
<li><a href="{{ href }}" class="d-block">{{ icon(icon, text) }}</a></li>
{% endmacro %}
{% macro side_bar_divider() %}
<li><hr class="dropdown-divider border-top my-1"></li>
Expand Down
2 changes: 1 addition & 1 deletion templates/user/user_show.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{%- set value = (item.enabled ? 'common.value_enabled' : 'common.value_disabled')|trans -%}
{{ property('user.fields.enabled', value, item.enabled ? 'text-success' : 'text-danger') }}
{{ property('user.fields.lastLogin', item.lastLogin ? item.lastLogin|locale_datetime : 'common.value_none'|trans) }}
{%- set image = asset_image_user(item, '096', {alt: 'user.fields.imageFile'|trans, title: 'user.image.title'|trans, class: 'border rounded avatar-lg'}) -%}
{%- set image = asset_image_user(item, '096', {alt: 'user.fields.imageFile'|trans, title: 'user.image.title'|trans, class: 'avatar-lg'}) -%}
{%- if image -%}
{{ property('user.fields.imageFile', image) }}
{%- endif -%}
Expand Down

0 comments on commit 2377a74

Please sign in to comment.