Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v15.8.9 #2449

Merged
merged 6 commits into from
Nov 17, 2023
Merged

v15.8.9 #2449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
848e140
change button style part I
gabrielburnworth Nov 15, 2023
a23e5f9
scale setup wizard firmware settings
gabrielburnworth Nov 15, 2023
cdc2e58
fix missed last lua edit bug (closes #2447)
gabrielburnworth Nov 15, 2023
c79a492
fix autofocus and style bugs
gabrielburnworth Nov 16, 2023
4f99440
fix additional autofocus and style bugs
gabrielburnworth Nov 16, 2023
b9e6d00
upgrade deps
gabrielburnworth Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ GEM
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
date (3.3.3)
date (3.3.4)
declarative (0.0.20)
delayed_job (4.1.11)
activesupport (>= 3.0, < 8.0)
Expand Down Expand Up @@ -159,19 +159,19 @@ GEM
webrick
google-apis-iamcredentials_v1 (0.17.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.19.0)
google-apis-core (>= 0.9.0, < 2.a)
google-apis-storage_v1 (0.29.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.3.1)
google-cloud-storage (1.44.0)
google-cloud-storage (1.45.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.19.0)
google-apis-storage_v1 (~> 0.29.0)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
Expand Down Expand Up @@ -205,7 +205,7 @@ GEM
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.21.4)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
Expand All @@ -221,16 +221,16 @@ GEM
multipart-post (2.3.0)
mutations (0.9.1)
activesupport
net-imap (0.4.4)
net-imap (0.4.5)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
net-protocol (0.2.2)
timeout
net-smtp (0.4.0)
net-protocol
nio4r (2.5.9)
nio4r (2.6.0)
nokogiri (1.15.4-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
Expand All @@ -251,7 +251,7 @@ GEM
faraday_middleware (~> 1.2)
hashie (~> 4.1)
multi_json (~> 1.15)
racc (1.7.2)
racc (1.7.3)
rack (2.2.8)
rack-attack (6.7.0)
rack (>= 1.0, < 4)
Expand Down Expand Up @@ -363,7 +363,7 @@ GEM
thor (1.3.0)
thwait (0.2.0)
e2mmap
timeout (0.4.0)
timeout (0.4.1)
trailblazer-option (0.1.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
Expand Down
6 changes: 3 additions & 3 deletions frontend/controls/peripherals/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export class Peripherals
</EmptyStateWrapper>
<div className={"peripherals-buttons"}>
<button
className="fb-button-2 gray"
className="fb-button gray"
onClick={this.toggle}
title={editButtonText}
disabled={!!status && isEditing}>
Expand All @@ -145,15 +145,15 @@ export class Peripherals
onClick={this.maybeSave} />
<button
hidden={!isEditing}
className="fb-button-2 green"
className="fb-button green"
type="button"
title={t("add peripheral")}
onClick={() => this.newPeripheral()}>
<i className="fa fa-plus" />
</button>
<button
hidden={!isEditing || this.props.firmwareHardware == "none"}
className="fb-button-2 green"
className="fb-button green"
type="button"
title={t("add stock peripherals")}
onClick={() => this.stockPeripherals.map(p =>
Expand Down
Loading