Skip to content

Commit

Permalink
Ticket #4847 - Studio: Layout changes. Stage 3.
Browse files Browse the repository at this point in the history
  • Loading branch information
AntonLV committed Dec 10, 2024
1 parent 5eaf78c commit af57873
Show file tree
Hide file tree
Showing 55 changed files with 130 additions and 189 deletions.
3 changes: 2 additions & 1 deletion modules/boonex/english/data/langs/system/en.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1117,7 +1117,7 @@
<string name="_adm_lmi_cpt_search_forms"><![CDATA[Search Forms]]></string>
<string name="_adm_lmi_cpt_search_fields"><![CDATA[Search Fields]]></string>
<string name="_adm_lmi_cpt_search_sortable_fields"><![CDATA[Search Sortable Fields]]></string>
<string name="_adm_lmi_cpt_splash"><![CDATA[Splash page]]></string>
<string name="_adm_lmi_cpt_splash"><![CDATA[Welcome page]]></string>
<string name="_adm_lmi_cpt_displays"><![CDATA[Displays]]></string>
<string name="_adm_lmi_cpt_downloaded"><![CDATA[Downloaded]]></string>
<string name="_adm_lmi_cpt_etemplates_text"><![CDATA[Email Texts]]></string>
Expand Down Expand Up @@ -1147,6 +1147,7 @@
<string name="_adm_lmi_cpt_purchases"><![CDATA[Purchases]]></string>
<string name="_adm_lmi_cpt_pwa"><![CDATA[Progressive Web App]]></string>
<string name="_adm_lmi_cpt_ractions"><![CDATA[Actions]]></string>
<string name="_adm_lmi_cpt_reports"><![CDATA[Reports]]></string>
<string name="_adm_lmi_cpt_rlevels"><![CDATA[Levels]]></string>
<string name="_adm_lmi_cpt_sets"><![CDATA[Sets]]></string>
<string name="_adm_lmi_cpt_settings"><![CDATA[Settings]]></string>
Expand Down
3 changes: 2 additions & 1 deletion modules/boonex/russian/data/langs/system/ru.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,7 @@
<string name="_adm_lmi_cpt_search_forms"><![CDATA[Формы поиска]]></string>
<string name="_adm_lmi_cpt_search_fields"><![CDATA[Поля поиска]]></string>
<string name="_adm_lmi_cpt_search_sortable_fields"><![CDATA[Поля сортироски поиска]]></string>
<string name="_adm_lmi_cpt_splash"><![CDATA[Страница-заставка]]></string>
<string name="_adm_lmi_cpt_splash"><![CDATA[Приветственная страница]]></string>
<string name="_adm_lmi_cpt_displays"><![CDATA[Дисплеи]]></string>
<string name="_adm_lmi_cpt_downloaded"><![CDATA[Скачано]]></string>
<string name="_adm_lmi_cpt_etemplates_text"><![CDATA[Тексты email-ов]]></string>
Expand Down Expand Up @@ -1130,6 +1130,7 @@
<string name="_adm_lmi_cpt_purchases"><![CDATA[Покупки]]></string>
<string name="_adm_lmi_cpt_pwa"><![CDATA[Веб приложение]]></string>
<string name="_adm_lmi_cpt_ractions"><![CDATA[Действия]]></string>
<string name="_adm_lmi_cpt_reports"><![CDATA[Отчеты]]></string>
<string name="_adm_lmi_cpt_rlevels"><![CDATA[Уровни]]></string>
<string name="_adm_lmi_cpt_sets"><![CDATA[Наборы]]></string>
<string name="_adm_lmi_cpt_settings"><![CDATA[Настройки]]></string>
Expand Down
20 changes: 20 additions & 0 deletions plugins_public/tailwind/css/tailwind.css
Original file line number Diff line number Diff line change
Expand Up @@ -1299,6 +1299,21 @@
@apply text-gray-900 dark:text-white;
}

.bx-std .bx-def-font-color {
@apply text-gray-800 dark:text-gray-200;
}

.bx-std .bx-btn:not(.bx-btn-primary) {
@apply bg-gray-200 dark:bg-gray-800 hover:bg-white dark:hover:bg-gray-700 active:bg-gray-100 dark:active:bg-gray-800;
@apply border-black/10 dark:border-white/10;
@apply text-gray-800 dark:text-gray-200;
}
.bx-std .bx-btn.bx-btn-primary {
@apply bg-black/80 dark:bg-white/80 hover:bg-black/90 dark:hover:bg-white/90;
@apply border-white/20 dark:border-white/20;
@apply text-white/80 dark:text-black/40;
}

/* Studio: Launcher */
.bx-std-bg.bx-std-page-launcher {
@apply bg-gray-200 dark:bg-black;
Expand All @@ -1307,6 +1322,11 @@
.bx-std-widgets .bx-std-widget {
@apply px-6 pt-6 pb-3 sm:px-10 sm:pt-10 sm:pb-4;
}

/* Studio: Settings */
#adm-settings-form-categorized .bx-form-advanced-wrapper .bx-form-section-wrapper:last-child {
@apply bg-white/90 dark:bg-gray-900/90;
}


/* Modules: Timeline */
Expand Down
2 changes: 1 addition & 1 deletion plugins_public/tailwind/css/tailwind.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions studio/classes/BxDolStudioAudit.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
* @{
*/

define('BX_DOL_STUDIO_AUD_TYPE_GENERAL', 'general');
define('BX_DOL_STUDIO_AUD_TYPE_REPORTS', 'reports');
define('BX_DOL_STUDIO_AUD_TYPE_SETTINGS', 'settings');

define('BX_DOL_STUDIO_AUD_TYPE_DEFAULT', BX_DOL_STUDIO_AUD_TYPE_GENERAL);
define('BX_DOL_STUDIO_AUD_TYPE_DEFAULT', BX_DOL_STUDIO_AUD_TYPE_REPORTS);

class BxDolStudioAudit extends BxTemplStudioWidget
{
Expand Down
16 changes: 3 additions & 13 deletions studio/template/css/common.less
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ a:hover > .sys-icon-a i {
box-shadow: none;
}
.bx-db-header {
padding: 1.25rem 1.5rem;
padding: 1.25rem 1.5rem 0 1.5rem;
}
.bx-db-header .bx-db-menu-tab-btn .bx-btn {
display: inline-flex;
Expand All @@ -50,7 +50,7 @@ a:hover > .sys-icon-a i {
.bx-db-content.bx-content-padding-block .bx-dbd-block-actions {
margin-left: -1.5rem;
margin-right: -1.5rem;
padding: 1.5rem 1.5rem 0 1.5rem;
padding: 0 1.5rem;
}
.bx-db-content.bx-def-padding-top {
padding: 1rem;
Expand Down Expand Up @@ -131,23 +131,13 @@ div.bx-db-note {
font-size: 0.875rem;
font-weight: 500;
}
.bx-btn {
border: 1px solid rgba(228, 228, 231, 1);
.background-color(rgba(255, 255, 255, 1));
color: rgba(39, 39, 42, 1)
}

.bx-btn.bx-btn-primary {
border-width: 0px;
.background-color(rgba(28, 100, 242, 1));
color: rgba(255, 255, 255, 1);
}

.bx-btn:not(.bx-btn-primary):hover,
.bx-btn:not(.bx-btn-primary):active {
border: 1px solid rgba(228, 228, 231, 0.8);
.background-color(rgba(255, 255, 255, 1.0));
color: rgba(82, 82, 91, 0.8);
}
.bx-btn:not(.bx-btn-primary) .sys-icon:not(.sys-colored) {
color: rgba(82, 82, 91, 1.0);
}
Expand Down
5 changes: 1 addition & 4 deletions studio/template/css/settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@ div.bx-std-page-column.bx-std-page-content div.bx-std-page-column-cnt {
position: absolute;
bottom: 0;
width: 100%;

margin: 0;
padding: 1.25rem 1.5rem;

border-top: 1px solid rgba(209, 213, 219, 1.0);
background-color: rgba(255, 255, 255, 1.0);
}

#adm-settings-form .bx-form-advanced-wrapper .bx-form-section-wrapper:first-child,
Expand Down
3 changes: 0 additions & 3 deletions studio/template/css/store.css
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,6 @@ span.bx-std-product-versions {
.bx-std-pc-cover {
display: block;
height: 12.5rem;

background-color: rgba(228, 228, 231, 1);

overflow: hidden;
}

Expand Down
2 changes: 1 addition & 1 deletion studio/template/dbd_cache.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<bx_if:show_empty>__message__</bx_if:show_empty>
</div>
<bx_if:show_actions>
<div class="bx-dbd-block-actions border-t border-b-zinc-200 space-x-4">
<div class="bx-dbd-block-actions space-x-4">
<a class="bx-btn" href="javascript:void(0)" onclick="javascript:__js_object__.clearCache('all')"><bx_text:_adm_dbd_txt_c_clear_all /></a>
<a class="bx-btn" href="javascript:void(0)" onclick="javascript:__js_object__.clearCacheSelect(this)"><bx_text:_adm_dbd_txt_c_select /></a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion studio/template/dbd_htools.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</div>
</bx_if:show_content>
</div>
<div class="bx-dbd-block-actions border-t border-b-zinc-200 space-x-4" style="display:none">
<div class="bx-dbd-block-actions space-x-4" style="display:none">
<a class="bx-btn" href="javascript:void(0)" onclick="javascript:__js_object__.serverAudit()"><bx_text:_sys_inst_server_audit /></a>
<a class="bx-btn" href="javascript:void(0)" onclick="javascript:__js_object__.permissions()"><bx_text:_sys_audit_permissions /></a>
</div>
Expand Down
2 changes: 1 addition & 1 deletion studio/template/dbd_versions.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</div>
</div>
</div>
<div class="bx-dbd-block-actions border-t border-b-zinc-200" style="display:none">
<div class="bx-dbd-block-actions" style="display:none">
<a class="bx-btn bx-btn-primary" href="javascript:void(0)" onclick="javascript:__js_object__.performUpgrade()"><bx_text:_adm_dbd_btn_update /></a>
</div>
<script language="javascript">
Expand Down
2 changes: 1 addition & 1 deletion studio/template/designbox_11.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- Design Box 11 [start]: Content + title + background + padding -->
<div class="bx-db-container bx-def-color-bg-block rounded-2xl">
<div class="bx-db-header px-3 md:px-4 pt-2 md:pt-3 border-b border-b-zinc-200">
<div class="bx-db-header px-3 md:px-4 pt-2 md:pt-3">
<div class="bx-db-title">__title__</div>__caption_item__
</div>
<div class="bx-db-content bx-content-padding-block relative">__designbox_content__</div>
Expand Down
15 changes: 1 addition & 14 deletions studio/template/images/icons/mi-agt-assistants.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 1 addition & 14 deletions studio/template/images/icons/mi-agt-automators.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit af57873

Please sign in to comment.