0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-19 14:12:40 +00:00

changes as requested, wrapping of editor tools, and linting

This commit is contained in:
Víctor Losada Hernández
2024-10-18 00:52:26 +02:00
parent 8538ccabe6
commit 5a75182aff
2 changed files with 145 additions and 144 deletions

View File

@@ -151,7 +151,7 @@ const Snippetbar = createClass({
renderSnippetGroups : function(){ renderSnippetGroups : function(){
const snippets = this.state.snippets.filter((snippetGroup)=>snippetGroup.view === this.props.view); const snippets = this.state.snippets.filter((snippetGroup)=>snippetGroup.view === this.props.view);
return <div className="snippets"> return <div className='snippets'>
{_.map(snippets, (snippetGroup)=>{ {_.map(snippets, (snippetGroup)=>{
return <SnippetGroup return <SnippetGroup
brew={this.props.brew} brew={this.props.brew}
@@ -164,7 +164,7 @@ const Snippetbar = createClass({
/>; />;
}) })
} }
</div> </div>;
}, },
replaceContent : function(item){ replaceContent : function(item){
@@ -223,6 +223,7 @@ const Snippetbar = createClass({
} }
return <div className='editors'> return <div className='editors'>
<div className='historyTools'>
<div className={`editorTool snippetGroup history ${this.state.historyExists ? 'active' : ''}`} <div className={`editorTool snippetGroup history ${this.state.historyExists ? 'active' : ''}`}
onClick={this.toggleHistoryMenu} > onClick={this.toggleHistoryMenu} >
<i className='fas fa-clock-rotate-left' /> <i className='fas fa-clock-rotate-left' />
@@ -236,15 +237,18 @@ const Snippetbar = createClass({
onClick={this.props.redo} > onClick={this.props.redo} >
<i className='fas fa-redo' /> <i className='fas fa-redo' />
</div> </div>
<div className='divider'></div> </div>
<div className='codeTools'>
{foldButtons} {foldButtons}
<div className={`editorTool editorTheme ${this.state.themeSelector ? 'active' : ''}`} <div className={`editorTool editorTheme ${this.state.themeSelector ? 'active' : ''}`}
onClick={this.toggleThemeSelector} > onClick={this.toggleThemeSelector} >
<i className='fas fa-palette' /> <i className='fas fa-palette' />
{this.state.themeSelector && this.renderThemeSelector()} {this.state.themeSelector && this.renderThemeSelector()}
</div> </div>
</div>
<div className='divider'></div>
<div className='tabs'>
<div className={cx('text', { selected: this.props.view === 'text' })} <div className={cx('text', { selected: this.props.view === 'text' })}
onClick={()=>this.props.onViewChange('text')}> onClick={()=>this.props.onViewChange('text')}>
<i className='fa fa-beer' /> <i className='fa fa-beer' />
@@ -257,22 +261,6 @@ const Snippetbar = createClass({
onClick={()=>this.props.onViewChange('meta')}> onClick={()=>this.props.onViewChange('meta')}>
<i className='fas fa-info-circle' /> <i className='fas fa-info-circle' />
</div> </div>
<div className='divider'></div>
{foldButtons}
<div className={`editorTool editorTheme ${this.state.themeSelector ? 'active' : ''}`}
onClick={this.toggleThemeSelector} >
<i className='fas fa-palette' />
{this.state.themeSelector && this.renderThemeSelector()}
</div>
<div className='divider'></div>
<div className={`editorTool undo ${this.props.historySize.undo ? 'active' : ''}`}
onClick={this.props.undo} >
<i className='fas fa-undo' />
</div>
<div className={`editorTool redo ${this.props.historySize.redo ? 'active' : ''}`}
onClick={this.props.redo} >
<i className='fas fa-redo' />
</div> </div>
</div>; </div>;
@@ -280,9 +268,8 @@ const Snippetbar = createClass({
render : function(){ render : function(){
return <div className='snippetBar'> return <div className='snippetBar'>
{this.renderEditorButtons()}
{this.renderSnippetGroups()} {this.renderSnippetGroups()}
{this.renderEditorButtons()}
</div>; </div>;
} }
}); });
@@ -315,7 +302,7 @@ const SnippetGroup = createClass({
<i className={snippet.icon} /> <i className={snippet.icon} />
<span className={`name${snippet.disabled ? ' disabled' : ''}`} title={snippet.name}>{snippet.name}</span> <span className={`name${snippet.disabled ? ' disabled' : ''}`} title={snippet.name}>{snippet.name}</span>
{snippet.experimental && <span className='beta'>beta</span>} {snippet.experimental && <span className='beta'>beta</span>}
{snippet.disabled && <span className='beta' title="temporarily disabled due to large slowdown; under re-design">disabled</span>} {snippet.disabled && <span className='beta' title='temporarily disabled due to large slowdown; under re-design'>disabled</span>}
{snippet.subsnippets && <> {snippet.subsnippets && <>
<i className='fas fa-caret-right'></i> <i className='fas fa-caret-right'></i>
<div className='dropdown side'> <div className='dropdown side'>

View File

@@ -5,21 +5,30 @@
@menuHeight : 25px; @menuHeight : 25px;
position : relative; position : relative;
min-width : 331px; min-width : 331px;
height : @menuHeight; height : auto;
color : black; color : black;
background-color : #DDDDDD; background-color : #DDDDDD;
display: flex; display: flex;
justify-content: space-between;
flex-wrap:wrap-reverse;
.snippets { .snippets {
position : absolute; display : flex;
top : 0px; justify-content : space-between;
right : 0px;
} }
.editors { .editors {
display : flex; display : flex;
justify-content : space-between; justify-content : space-between;
height : @menuHeight; >div {
display:flex;
justify-content: space-around;
flex:1;
border-left:1px solid;
&:first-child {
border-left: none;
}
& > div { & > div {
width : @menuHeight; width : @menuHeight;
@@ -64,6 +73,7 @@
font-size : 0.75em; font-size : 0.75em;
color : grey; color : grey;
position : relative; position : relative;
border:none;
&.active { &.active {
color : inherit; color : inherit;
} }
@@ -102,6 +112,7 @@
background-color : inherit; background-color : inherit;
} }
} }
}
.snippetBarButton { .snippetBarButton {
display : inline-block; display : inline-block;
height : @menuHeight; height : @menuHeight;
@@ -111,6 +122,7 @@
line-height : @menuHeight; line-height : @menuHeight;
text-transform : uppercase; text-transform : uppercase;
cursor : pointer; cursor : pointer;
text-wrap: nowrap;
&:hover, &.selected { background-color : #999999; } &:hover, &.selected { background-color : #999999; }
i { i {
margin-right : 3px; margin-right : 3px;
@@ -126,7 +138,8 @@
.tooltipLeft('Edit Brew Properties'); .tooltipLeft('Edit Brew Properties');
} }
.snippetGroup { .snippetGroup {
border-left : 1px solid currentColor; border-right : 1px solid currentColor;
&:hover { &:hover {
& > .dropdown { visibility : visible; } & > .dropdown { visibility : visible; }
} }
@@ -213,15 +226,16 @@
} }
} }
@container editor (width < 538px) { @container editor (width < 568px) {
.snippetBar { .editors,.snippets {
display : flex; width:332.59px;
flex-wrap : wrap; }
height : 50px; .editors {
border-right:1px solid;
}
.snippetBar .editors>div.history>.dropdown {
right:unset;
}
.snippets {
position : static;
}
}
} }