resolve merge conflicts

This commit is contained in:
durstann
2026-08-31 16:04:34 -07:00
33 changed files with 4790 additions and 3234 deletions
@@ -22,7 +22,7 @@
.editors {
display : flex;
justify-content : flex-end;
min-width : 250px; //must be controlled every time an item is added, must be hardcoded for the wrapping as it is applied
min-width : 275px; //must be controlled every time an item is added, must be hardcoded for the wrapping as it is applied
font-size: .85rem;
&:only-child {min-width : unset; margin-left : auto;}
reading-order : 2;
@@ -77,6 +77,11 @@
color : grey;
&.active { color : inherit; }
}
&.formatCode {
.tooltipLeft('Clean your Code');
color : grey;
&.active { color : inherit; }
}
&.history {
.tooltipLeft('History');
position : relative;
@@ -211,8 +216,8 @@
}
}
}
@container editor (width < 816px) {
.snippetBar {
@container editor (width < 841px) {
.snippetBar {
.editors {
flex : 1;
justify-content : space-between;