0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-26 05:12:39 +00:00

Start fixing merge conflicts

This commit is contained in:
Trevor Buckner
2024-01-12 11:37:34 -05:00
parent c73d02c550
commit f088fc49f3

View File

@@ -6,7 +6,6 @@
position: relative;
height: @menuHeight;
background-color: #ddd;
.editors {
position: absolute;
display: flex;
@@ -14,92 +13,74 @@
right: 0px;
height: @menuHeight;
justify-content: space-between;
&>div {
height: @menuHeight;
width: @menuHeight;
cursor: pointer;
line-height: @menuHeight;
text-align: center;
&:hover,
&.selected {
background-color: #999;
}
&.text {
.tooltipLeft('Brew Editor');
}
&.style {
.tooltipLeft('Style Editor');
}
&.meta {
.tooltipLeft('Properties');
}
&.undo {
.tooltipLeft('Undo');
font-size: 0.75em;
color: grey;
&.active {
color: black;
}
}
&.redo {
.tooltipLeft('Redo');
font-size: 0.75em;
color: grey;
&.active {
color: black;
}
}
&.foldAll {
.tooltipLeft('Fold All');
font-size: 0.75em;
color: grey;
&.active {
color: black;
}
}
&.unfoldAll {
.tooltipLeft('Unfold All');
font-size: 0.75em;
color: grey;
&.active {
color: black;
}
}
&.editorTheme {
.tooltipLeft('Editor Themes');
font-size: 0.75em;
color: black;
&.active {
color: white;
background-color: black;
}
}
&.divider {
background: linear-gradient(#000, #000) no-repeat center/1px 100%;
width: 5px;
&:hover {
background-color: inherit;
}
}
}
.themeSelector {
position: absolute;
left: -65px;
@@ -110,7 +91,6 @@
border-radius: 5px;
}
}
.snippetBarButton {
height: @menuHeight;
line-height: @menuHeight;
@@ -120,19 +100,16 @@
font-size: 0.625em;
text-transform: uppercase;
cursor: pointer;
&:hover,
&.selected {
background-color: #999;
}
i {
vertical-align: middle;
margin-right: 3px;
font-size: 1.4em;
}
}
.toggleMeta {
position: absolute;
top: 0px;
@@ -140,16 +117,13 @@
border-left: 1px solid black;
.tooltipLeft("Edit Brew Properties");
}
.snippetGroup {
border-right: 1px solid black;
&:hover {
&>.dropdown {
visibility: visible;
}
}
.dropdown {
position: absolute;
top: 100%;
@@ -158,7 +132,6 @@
margin-left: -5px;
padding: 0px;
background-color: #ddd;
.snippet {
position: relative;
.animate(background-color);
@@ -168,21 +141,17 @@
padding: 5px;
cursor: pointer;
font-size: 10px;
i {
margin-right: 8px;
font-size: 1.2em;
height: 1.2em;
&~i {
margin-right: 0;
margin-left: 5px;
}
/* Fonts */
&.font {
height:auto;
&::before {
content:'F';
font-size:1.4em;
@@ -207,11 +176,9 @@
&.TimesNewRoman {font-family: 'Times New Roman';}
}
}
.name {
margin-right: auto;
}
.beta {
color: white;
padding: 4px 6px;
@@ -222,13 +189,10 @@
border-radius: 12px;
font-family: monospace;
}
&:hover {
background-color: #999;
&>.dropdown {
visibility: visible;
&.side {
left: 100%;
top: 0%;