Merge branch 'feature/ui' into develop
This commit is contained in:
commit
57f3a0d252
|
@ -71,14 +71,21 @@
|
|||
|
||||
.side-menu-setting-list {
|
||||
margin: 10px 4px 4px 0px;
|
||||
border: 1px solid var(--color-border-dark);
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
.side-menu-setting-list-item {
|
||||
padding: 5px 10px;
|
||||
border: 1px solid var(--color-border-dark);
|
||||
border-bottom: 1px solid var(--color-border-dark);
|
||||
max-width: 300px;
|
||||
margin: -1px 0 0 0;
|
||||
cursor: pointer;
|
||||
line-height: 32px;
|
||||
}
|
||||
|
||||
.side-menu-setting-list-item:last-child {
|
||||
border-bottom: 0;
|
||||
}
|
||||
|
||||
.side-menu-setting-list-drop {
|
||||
|
@ -93,8 +100,9 @@
|
|||
}
|
||||
|
||||
.side-menu-setting-list-item input {
|
||||
min-height: auto;
|
||||
margin-top: -1px;
|
||||
margin-top: 0;
|
||||
height: 21px !important;
|
||||
min-height: auto !important;
|
||||
}
|
||||
|
||||
#apps-categories-custom-list select {
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
"Panel": "Panel"
|
||||
"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Otevřít nabídku při najetím ukazatelem na tlačítko nabídky (automaticky vypnuto pro dotykové obrazovky)."
|
||||
"Display the big menu": "Zobrazit velkou nabídku"
|
||||
"This menu is not compatible with AppOrder.": "Nabídka není kompatibilní s jinou aplikací (doplňkem) „Pořadí aplikací“."
|
||||
"Display the logo": "Zobrazit logo"
|
||||
"This feature is not compatible with the <code>big menu</code> display.": "Tato funkce není kompatibilní se zobrazením <code>velké nabídky</code>."
|
||||
"Icons and texts": "Ikony a texty"
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
"Panel": "Panel"
|
||||
"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Öffne das Menü, wenn die Maus über das Menü-Symbol bewegt wird (auf Touchscreens automatisch deaktiviert)."
|
||||
"Display the big menu": "Großes Menü anzeigen"
|
||||
"This menu is not compatible with AppOrder.": "Dieses Menü ist nicht mit <code>AppOrder</code> kompatibel."
|
||||
"Display the logo": "Logo anzeigen"
|
||||
"This feature is not compatible with the <code>big menu</code> display.": "Diese Funktion ist nicht mit dem <code>großen Menü</code> kompatibel."
|
||||
"Icons and texts": "Symbole und Texte"
|
||||
|
|
|
@ -48,7 +48,6 @@
|
|||
"Panel": "Panneau"
|
||||
"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Ouvrir le menu au passage de la souris (automatiquement désactivé sur les écrans tactiles)"
|
||||
"Display the big menu": "Afficher le menu large"
|
||||
"This menu is not compatible with AppOrder.": "Ce menu n'est pas compatible avec l'application AppOrder"
|
||||
"Display the logo": "Afficher le logo"
|
||||
"This feature is not compatible with the <code>big menu</code> display.": "Cette fonctionnalité n'est pas compatible avec l'affichage du menu large."
|
||||
"Icons and texts": "Icônes et textes"
|
||||
|
|
|
@ -40,7 +40,6 @@
|
|||
"Panel": "面板"
|
||||
"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "鼠标悬停时打开菜单 (触摸屏时将自动禁用)"
|
||||
"Display the big menu": "显示大型菜单"
|
||||
"This menu is not compatible with AppOrder.": "型菜单与应用顺序不兼容"
|
||||
"Display the logo": "显示logo"
|
||||
"This feature is not compatible with the <code>big menu<\/code> display.": "此功能与显示<code>大型菜单<\/code>不兼容。"
|
||||
"Icons and texts": "图标与文字"
|
||||
|
|
|
@ -509,7 +509,6 @@ $labelReset = 'Reset to default';
|
|||
<?php p($l->t('With categories')); ?>
|
||||
</label>
|
||||
</div>
|
||||
<p><em><?php echo $l->t('This menu is not compatible with AppOrder.'); ?></em></p>
|
||||
<p>
|
||||
<img
|
||||
class="side-menu-display <?php echo $displays['side-with-categories'] ? 'is-active' : '' ?>"
|
||||
|
@ -524,7 +523,6 @@ $labelReset = 'Reset to default';
|
|||
<?php p($l->t('Big menu')); ?>
|
||||
</label>
|
||||
</div>
|
||||
<p><em><?php echo $l->t('This menu is not compatible with AppOrder.'); ?></em></p>
|
||||
<p>
|
||||
<img
|
||||
class="side-menu-display <?php echo $displays['big-menu'] ? 'is-active' : '' ?>"
|
||||
|
|
Loading…
Reference in a new issue