Merge branch 'dev' into dev_skillslist
# Conflicts: # CHANGELOG.md # system/lang/en-en.json # system/lang/fr-fr.json # system/scripts/actor.js # system/scripts/actors/base-character-sheet.js # system/scripts/combat.js # system/scripts/config.js # system/scripts/dice/dice-picker-dialog.js # system/scripts/dice/roll-n-keep-dialog.js # system/scripts/gm/gm-monitor.js # system/scripts/gm/gm-toolbox.js # system/scripts/hooks.js # system/scripts/items/technique-sheet.js # system/scripts/main-l5r5e.js # system/scripts/migration.js # system/scripts/preloadTemplates.js # system/scripts/settings.js # system/scripts/socket-handler.js # system/styles/l5r5e.css # system/system.json # system/templates/actors/character-sheet.html
This commit is contained in:
@@ -14,6 +14,10 @@ button {
|
||||
.system {
|
||||
overflow: auto;
|
||||
border-bottom: 1px solid var(--color-border-light-highlight);
|
||||
|
||||
.system-title {
|
||||
white-space: break-spaces;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,8 +32,7 @@ button {
|
||||
overflow: initial;
|
||||
height: calc(100% - 1.1rem);
|
||||
top: 0.2rem;
|
||||
width: 320px;
|
||||
min-width: 40px;
|
||||
min-width: 20rem;
|
||||
letter-spacing: 0.1rem;
|
||||
position: relative;
|
||||
margin-right: 0.5rem;
|
||||
@@ -168,6 +171,9 @@ button {
|
||||
}
|
||||
}
|
||||
&.collapsed {
|
||||
min-width: 0;
|
||||
width: 3rem !important;
|
||||
|
||||
#sidebar-tabs {
|
||||
> .item {
|
||||
&.active {
|
||||
|
||||
Reference in New Issue
Block a user