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