Skip to content

Commit

Permalink
Use different font size to differentiate between 1% and 10% (#130)
Browse files Browse the repository at this point in the history
  • Loading branch information
@cheton
cheton committed Feb 11, 2017
1 parent 6e0c7d1 commit 446f2ef
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 17 deletions.
40 changes: 32 additions & 8 deletions src/web/widgets/Grbl/Overrides.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ class Overrides extends Component {
controller.command('feedOverride', -10);
}}
>
<i className="fa fa-arrow-down fa-fw" />-10%
<i className="fa fa-arrow-down" style={{ fontSize: 14 }} />
<span style={{ marginLeft: 5 }}>
-10%
</span>
</RepeatButton>
<RepeatButton
className="btn btn-default"
Expand All @@ -40,7 +43,10 @@ class Overrides extends Component {
controller.command('feedOverride', -1);
}}
>
<i className="fa fa-arrow-down fa-fw" />-1%
<i className="fa fa-arrow-down" style={{ fontSize: 10 }} />
<span style={{ marginLeft: 5 }}>
-1%
</span>
</RepeatButton>
<RepeatButton
className="btn btn-default"
Expand All @@ -49,7 +55,10 @@ class Overrides extends Component {
controller.command('feedOverride', 1);
}}
>
<i className="fa fa-arrow-up fa-fw" />1%
<i className="fa fa-arrow-up" style={{ fontSize: 10 }} />
<span style={{ marginLeft: 5 }}>
1%
</span>
</RepeatButton>
<RepeatButton
className="btn btn-default"
Expand All @@ -58,7 +67,10 @@ class Overrides extends Component {
controller.command('feedOverride', 10);
}}
>
<i className="fa fa-arrow-up fa-fw" />10%
<i className="fa fa-arrow-up" style={{ fontSize: 14 }} />
<span style={{ marginLeft: 5 }}>
10%
</span>
</RepeatButton>
<button
type="button"
Expand All @@ -79,7 +91,10 @@ class Overrides extends Component {
controller.command('spindleOverride', -10);
}}
>
<i className="fa fa-arrow-down fa-fw" />-10%
<i className="fa fa-arrow-down" style={{ fontSize: 14 }} />
<span style={{ marginLeft: 5 }}>
-10%
</span>
</RepeatButton>
<RepeatButton
className="btn btn-default"
Expand All @@ -88,7 +103,10 @@ class Overrides extends Component {
controller.command('spindleOverride', -1);
}}
>
<i className="fa fa-arrow-down fa-fw" />-1%
<i className="fa fa-arrow-down" style={{ fontSize: 10 }} />
<span style={{ marginLeft: 5 }}>
-1%
</span>
</RepeatButton>
<RepeatButton
className="btn btn-default"
Expand All @@ -97,7 +115,10 @@ class Overrides extends Component {
controller.command('spindleOverride', 1);
}}
>
<i className="fa fa-arrow-up fa-fw" />1%
<i className="fa fa-arrow-up" style={{ fontSize: 10 }} />
<span style={{ marginLeft: 5 }}>
1%
</span>
</RepeatButton>
<RepeatButton
className="btn btn-default"
Expand All @@ -106,7 +127,10 @@ class Overrides extends Component {
controller.command('spindleOverride', 10);
}}
>
<i className="fa fa-arrow-up fa-fw" />10%
<i className="fa fa-arrow-up" style={{ fontSize: 14 }} />
<span style={{ marginLeft: 5 }}>
10%
</span>
</RepeatButton>
<button
type="button"
Expand Down
42 changes: 33 additions & 9 deletions src/web/widgets/Smoothie/Overrides.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ class Overrides extends Component {
controller.command('feedOverride', -10);
}}
>
<i className="fa fa-arrow-down fa-fw" />-10%
<i className="fa fa-arrow-down" style={{ fontSize: 14 }} />
<span style={{ marginLeft: 5 }}>
-10%
</span>
</RepeatButton>
<RepeatButton
className="btn btn-default"
Expand All @@ -40,7 +43,10 @@ class Overrides extends Component {
controller.command('feedOverride', -1);
}}
>
<i className="fa fa-arrow-down fa-fw" />-1%
<i className="fa fa-arrow-down" style={{ fontSize: 10 }} />
<span style={{ marginLeft: 5 }}>
-1%
</span>
</RepeatButton>
<RepeatButton
className="btn btn-default"
Expand All @@ -49,7 +55,10 @@ class Overrides extends Component {
controller.command('feedOverride', 1);
}}
>
<i className="fa fa-arrow-up fa-fw" />1%
<i className="fa fa-arrow-up" style={{ fontSize: 10 }} />
<span style={{ marginLeft: 5 }}>
1%
</span>
</RepeatButton>
<RepeatButton
className="btn btn-default"
Expand All @@ -58,7 +67,10 @@ class Overrides extends Component {
controller.command('feedOverride', 10);
}}
>
<i className="fa fa-arrow-up fa-fw" />10%
<i className="fa fa-arrow-up" style={{ fontSize: 14 }} />
<span style={{ marginLeft: 5 }}>
10%
</span>
</RepeatButton>
<button
type="button"
Expand All @@ -79,7 +91,10 @@ class Overrides extends Component {
controller.command('spindleOverride', -10);
}}
>
<i className="fa fa-arrow-down fa-fw" />-10%
<i className="fa fa-arrow-down" style={{ fontSize: 14 }} />
<span style={{ marginLeft: 5 }}>
-10%
</span>
</RepeatButton>
<RepeatButton
className="btn btn-default"
Expand All @@ -88,7 +103,10 @@ class Overrides extends Component {
controller.command('spindleOverride', -1);
}}
>
<i className="fa fa-arrow-down fa-fw" />-1%
<i className="fa fa-arrow-down" style={{ fontSize: 10 }} />
<span style={{ marginLeft: 5 }}>
-1%
</span>
</RepeatButton>
<RepeatButton
className="btn btn-default"
Expand All @@ -97,7 +115,10 @@ class Overrides extends Component {
controller.command('spindleOverride', 1);
}}
>
<i className="fa fa-arrow-up fa-fw" />1%
<i className="fa fa-arrow-up" style={{ fontSize: 10 }} />
<span style={{ marginLeft: 5 }}>
1%
</span>
</RepeatButton>
<RepeatButton
className="btn btn-default"
Expand All @@ -106,7 +127,10 @@ class Overrides extends Component {
controller.command('spindleOverride', 10);
}}
>
<i className="fa fa-arrow-up fa-fw" />10%
<i className="fa fa-arrow-up" style={{ fontSize: 14 }} />
<span style={{ marginLeft: 5 }}>
10%
</span>
</RepeatButton>
<button
type="button"
Expand All @@ -116,7 +140,7 @@ class Overrides extends Component {
controller.command('spindleOverride', 0);
}}
>
<i className="fa fa-fw fa-undo" />
<i className="fa fa-undo fa-fw" />
</button>
</DigitalReadout>
</div>
Expand Down

0 comments on commit 446f2ef

Please sign in to comment.