Skip to content

Commit

Permalink
Merge branch 'main' into nimmo-fix-query-test-ordering
Browse files Browse the repository at this point in the history
  • Loading branch information
nimmolo committed Jan 3, 2025
2 parents 385176c + 154aefe commit 56d6b68
Show file tree
Hide file tree
Showing 25 changed files with 501 additions and 482 deletions.
52 changes: 44 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ GEM
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
brakeman (6.2.2)
brakeman (7.0.0)
racc
browser (6.2.0)
builder (3.3.0)
Expand Down Expand Up @@ -115,9 +115,9 @@ GEM
cuprite (0.15.1)
capybara (~> 3.0)
ferrum (~> 0.15.0)
dartsass-sprockets (3.1.0)
dartsass-sprockets (3.2.0)
railties (>= 4.0.0)
sassc-embedded (~> 1.69)
sassc-embedded (~> 1.80.1)
sprockets (> 3.0)
sprockets-rails
tilt
Expand Down Expand Up @@ -151,10 +151,14 @@ GEM
concurrent-ruby (~> 1.1)
webrick (~> 1.7)
websocket-driver (~> 0.7)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
ffi (1.17.0-x86_64-linux-musl)
ffi (1.17.1-aarch64-linux-gnu)
ffi (1.17.1-aarch64-linux-musl)
ffi (1.17.1-arm-linux-gnu)
ffi (1.17.1-arm-linux-musl)
ffi (1.17.1-arm64-darwin)
ffi (1.17.1-x86_64-darwin)
ffi (1.17.1-x86_64-linux-gnu)
ffi (1.17.1-x86_64-linux-musl)
fugit (1.11.1)
et-orbi (~> 1, >= 1.2.11)
raabro (~> 1.4)
Expand Down Expand Up @@ -188,6 +192,12 @@ GEM
googleauth (~> 1.9)
mini_mime (~> 1.0)
google-logging-utils (0.1.0)
google-protobuf (4.29.2)
bigdecimal
rake (>= 13)
google-protobuf (4.29.2-aarch64-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.29.2-arm64-darwin)
bigdecimal
rake (>= 13)
Expand Down Expand Up @@ -228,12 +238,15 @@ GEM
jwt (2.10.1)
base64
language_server-protocol (3.17.0.3)
libv8-node (18.19.0.0)
libv8-node (18.19.0.0-aarch64-linux)
libv8-node (18.19.0.0-aarch64-linux-musl)
libv8-node (18.19.0.0-arm64-darwin)
libv8-node (18.19.0.0-x86_64-darwin)
libv8-node (18.19.0.0-x86_64-linux)
libv8-node (18.19.0.0-x86_64-linux-musl)
logger (1.6.4)
loofah (2.23.1)
loofah (2.24.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
mail (2.8.1)
Expand Down Expand Up @@ -285,6 +298,14 @@ GEM
net-protocol
netrc (0.11.0)
nio4r (2.7.4)
nokogiri (1.18.1-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.1-aarch64-linux-musl)
racc (~> 1.4)
nokogiri (1.18.1-arm-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.1-arm-linux-musl)
racc (~> 1.4)
nokogiri (1.18.1-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.1-x86_64-darwin)
Expand Down Expand Up @@ -403,6 +424,14 @@ GEM
rubocop (>= 1.48.1)
ruby-progressbar (1.13.0)
rubyzip (2.3.2)
sass-embedded (1.83.0-aarch64-linux-gnu)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-aarch64-linux-musl)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-arm-linux-gnueabihf)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-arm-linux-musleabihf)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-arm64-darwin)
google-protobuf (~> 4.28)
sass-embedded (1.83.0-x86_64-darwin)
Expand Down Expand Up @@ -497,6 +526,13 @@ GEM
zeitwerk (2.7.1)

PLATFORMS
aarch64-linux
aarch64-linux-gnu
aarch64-linux-musl
arm-linux-gnu
arm-linux-gnueabihf
arm-linux-musl
arm-linux-musleabihf
arm64-darwin
x86_64-darwin
x86_64-linux
Expand Down
33 changes: 2 additions & 31 deletions app/assets/stylesheets/Admin.scss
Original file line number Diff line number Diff line change
@@ -1,32 +1,3 @@
@import "defaults";

$BODY_BG_COLOR: #DD00DD;

$LOGO_BORDER_COLOR: black;
$LOGO_BORDER_WIDTH: 2px; // vs 1px in default
$LOGO_FG_COLOR: black;
$LOGO_BG_COLOR: yellow;
$LOGO_HOVER_FG_COLOR: purple;
$LOGO_HOVER_BG_COLOR: yellow;

$LEFT_BAR_BORDER_COLOR: #535354; // gray
$LEFT_BAR_BORDER_RADIUS: 0px;
$LEFT_BAR_HEADER_FG_COLOR: black;
$LEFT_BAR_HEADER_BG_COLOR: yellow;
$LEFT_BAR_FG_COLOR: #2050E0;
$LEFT_BAR_BG_COLOR: yellow;
$LEFT_BAR_HOVER_FG_COLOR: yellow;
$LEFT_BAR_HOVER_BG_COLOR: #2050E0;

$TOP_BAR_BG_COLOR: #DD00DD;

$TOP_BAR_BORDER_COLOR: none;
$TOP_BAR_BORDER_WIDTH: 0;
$TOP_BAR_BORDER_STYLE: none;
$TOP_BAR_BORDER_RADIUS: 0;
$TOP_BAR_FG_COLOR: $BODY_FG_COLOR;
$TOP_BAR_BG_COLOR: $BODY_BG_COLOR;

$VOTE_METER_FG_COLOR: #000000;

@import "variables/defaults";
@import "variables/admin";
@import "mushroom_observer";
84 changes: 2 additions & 82 deletions app/assets/stylesheets/Agaricus.scss
Original file line number Diff line number Diff line change
@@ -1,83 +1,3 @@
@import "defaults";

$augustus_cap: #ECCF95;
$brasiliensis_gills_1: #BF6262; // #A06463
$brasiliensis_gills_2: #743931;
$campestris_cap: #F6F0F2;
$cupreobrunneus_gills: #3B2821;
$lilaceps_stain: #B4725F;
$semotus_cap: #BC9D89;
$xanthodermus_stain: #D4A833;
$polyozellus_light: #a5bffa;
$polyozellus_dark: #5167b2;

$BUTTON_FG_COLOR: $cupreobrunneus_gills;

$BODY_FG_COLOR: $cupreobrunneus_gills;
$BODY_BG_COLOR: $campestris_cap;

$LINK_FG_COLOR: $brasiliensis_gills_1;
$LINK_VISITED_FG_COLOR: $cupreobrunneus_gills;
$LINK_HOVER_FG_COLOR: $brasiliensis_gills_2;
$LINK_HOVER_BG_COLOR: $campestris_cap;

$LOGO_BORDER_COLOR: $cupreobrunneus_gills;
$LOGO_FG_COLOR: $cupreobrunneus_gills;
$LOGO_BG_COLOR: $semotus_cap;
$LOGO_HOVER_FG_COLOR: $brasiliensis_gills_2;
$LOGO_HOVER_BG_COLOR: $campestris_cap;

$LEFT_BAR_BORDER_COLOR: $augustus_cap;
$LEFT_BAR_HEADER_FG_COLOR: $cupreobrunneus_gills;
$LEFT_BAR_HEADER_BG_COLOR: $augustus_cap;
$LEFT_BAR_FG_COLOR: $brasiliensis_gills_1;
$LEFT_BAR_BG_COLOR: $augustus_cap;
$LEFT_BAR_HOVER_FG_COLOR: $brasiliensis_gills_2;
$LEFT_BAR_HOVER_BG_COLOR: $campestris_cap;

$TOP_BAR_FG_COLOR: $cupreobrunneus_gills;
$TOP_BAR_BG_COLOR: $campestris_cap;
$TOP_BAR_LINK_FG_COLOR: $brasiliensis_gills_1;
$TOP_BAR_LINK_HOVER_FG_COLOR: $brasiliensis_gills_2;
$TOP_BAR_LINK_HOVER_BG_COLOR: $campestris_cap;

$LIST_BORDER_COLOR: transparent;
//$LIST_BORDER_COLOR: #DDDDDD;
$LIST_HEADER_FG_COLOR: #777777;
$LIST_HEADER_BG_COLOR: #EEEEEE;
$LIST_FG_COLOR: $cupreobrunneus_gills;
$LIST_BG_COLOR: mix($campestris_cap, white, 50%);

$TOOLTIP_FG_COLOR: $campestris_cap;
$TOOLTIP_BG_COLOR: $cupreobrunneus_gills;

$PAGER_FG_COLOR: $cupreobrunneus_gills;
$PAGER_HOVER_FG_COLOR: $brasiliensis_gills_2;
$PAGER_HOVER_BG_COLOR: $campestris_cap;
$PAGER_ACTIVE_FG_COLOR: $campestris_cap;
$PAGER_ACTIVE_BG_COLOR: $brasiliensis_gills_2;

$MENU_BORDER_COLOR: $brasiliensis_gills_2;
$MENU_FG_COLOR: black;
$MENU_BG_COLOR: white;
$MENU_HOT_FG_COLOR: black;
$MENU_HOT_BG_COLOR: $xanthodermus_stain;
$MENU_WARM_FG_COLOR: black;
$MENU_WARM_BG_COLOR: $lilaceps_stain;

$INFO_BG_COLOR: $polyozellus_light;
$INFO_BORDER_COLOR: $polyozellus_dark;
$INFO_FG_COLOR: $BODY_FG_COLOR;
$SUCCESS_BG_COLOR: #E0FFE0;
$SUCCESS_BORDER_COLOR: #70C070;
$SUCCESS_FG_COLOR: $BODY_FG_COLOR;
$WARNING_BG_COLOR: #FFF8E0;
$WARNING_BORDER_COLOR: #F8CC70;
$WARNING_FG_COLOR: $BODY_FG_COLOR;
$DANGER_BG_COLOR: #FFE0E0;
$DANGER_BORDER_COLOR: #F07070;
$DANGER_FG_COLOR: $BODY_FG_COLOR;

$WELL_FG_COLOR: lighten($cupreobrunneus_gills, 25%);

@import "variables/defaults";
@import "variables/agaricus";
@import "mushroom_observer";
107 changes: 2 additions & 105 deletions app/assets/stylesheets/Amanita.scss
Original file line number Diff line number Diff line change
@@ -1,106 +1,3 @@
@import "defaults";

$phalloides_foreground: #e6edd5;
$phalloides_light_cap: #dfe4bc;
$phalloides_middle_cap: #beb977;
$phalloides_dark_cap: #787133;
$calyptroderma_spring_background: #ebcc79;
$calyptroderma_spring_foreground: #f9f2e0;
$calyptroderma_fall_dark_cap: #954c23;
$calyptroderma_volva: #ebe4de;
$calyptroderma_light_cap: #f5bd5e;
$calyptroderma_middle_cap: #c18346;
$muscaria_background: #cc2616;
$muscaria_foreground: #fff8c6;
$velosa_background: #dd9d5f;
$velosa_light_veil: #f9e8d3; // faebd4
$velosa_dark_veil: #f4d5a6;
$novinupta_background: #d1afa5;
$pachycolea_background: #383138;
$pachycolea_foreground: #bfc0bb;
$pachycolea_light_stipe: #aa9a83;
$pachycolea_dark_brown: #60412d;
$polyozellus_light: #a5bffa;
$polyozellus_dark: #5167b2;

$BUTTON_FG_COLOR: $pachycolea_foreground;
$BUTTON_BG_COLOR: $pachycolea_background;
$BUTTON_ACTIVE_FG_COLOR: $muscaria_background;

$BODY_FG_COLOR: $pachycolea_foreground;
$BODY_BG_COLOR: $pachycolea_background;

$LINK_FG_COLOR: $pachycolea_light_stipe;
$LINK_VISITED_FG_COLOR: $muscaria_foreground;
$LINK_HOVER_FG_COLOR: $pachycolea_light_stipe;
$LINK_HOVER_BG_COLOR: $muscaria_background;

$LOGO_BORDER_COLOR: $velosa_light_veil;
$LOGO_FG_COLOR: $muscaria_foreground;
$LOGO_BG_COLOR: $muscaria_background;
$LOGO_HOVER_FG_COLOR: $muscaria_foreground;
$LOGO_HOVER_BG_COLOR: $muscaria_background;

$LEFT_BAR_BORDER_COLOR: $velosa_background;
$LEFT_BAR_HEADER_FG_COLOR: $muscaria_background;
$LEFT_BAR_HEADER_BG_COLOR: $velosa_background;
$LEFT_BAR_FG_COLOR: $velosa_light_veil;
$LEFT_BAR_BG_COLOR: $velosa_background;
$LEFT_BAR_HOVER_FG_COLOR: $velosa_light_veil;
$LEFT_BAR_HOVER_BG_COLOR: $muscaria_background;

$TOP_BAR_FG_COLOR: $pachycolea_foreground;
$TOP_BAR_BG_COLOR: $pachycolea_background;
$TOP_BAR_LINK_FG_COLOR: $pachycolea_light_stipe;
$TOP_BAR_LINK_HOVER_FG_COLOR: $pachycolea_light_stipe;
$TOP_BAR_LINK_HOVER_BG_COLOR: $muscaria_background;

$LIST_BORDER_COLOR: transparent;
$LIST_HEADER_FG_COLOR: #777777;
$LIST_HEADER_BG_COLOR: #EEEEEE;
$LIST_FG_COLOR: $pachycolea_foreground;
$LIST_BG_COLOR: mix($pachycolea_background, black, 80%);
$LIST_EVEN_BG_COLOR: $LIST_BG_COLOR;
$LIST_ODD_BG_COLOR: mix($LIST_EVEN_BG_COLOR, black, 25%);

$TOOLTIP_FG_COLOR: $pachycolea_background;
$TOOLTIP_BG_COLOR: $pachycolea_foreground;

$VOTE_METER_FG_COLOR: $pachycolea_foreground;
$VOTE_METER_BG_COLOR: $pachycolea_background;

$PROGRESS_BG_COLOR: $pachycolea_background;
$PROGRESS_FG_COLOR: $pachycolea_foreground;
$PROGRESS_BAR_COLOR: $phalloides_dark_cap;

$PAGER_FG_COLOR: $pachycolea_foreground;
$PAGER_HOVER_FG_COLOR: $pachycolea_foreground;
$PAGER_HOVER_BG_COLOR: $muscaria_background;
$PAGER_ACTIVE_FG_COLOR: $pachycolea_background;
$PAGER_ACTIVE_BG_COLOR: $pachycolea_foreground;

$MENU_BORDER_COLOR: $pachycolea_background;
$MENU_FG_COLOR: black;
$MENU_BG_COLOR: white;
$MENU_HOT_FG_COLOR: black;
$MENU_HOT_BG_COLOR: $muscaria_background;
$MENU_WARM_FG_COLOR: black;
$MENU_WARM_BG_COLOR: $velosa_background;

$INFO_BG_COLOR: $polyozellus_dark;
$INFO_BORDER_COLOR: $polyozellus_light;
$INFO_FG_COLOR: $pachycolea_foreground;
$SUCCESS_BG_COLOR: #E0FFE0;
$SUCCESS_BORDER_COLOR: #70C070;
$SUCCESS_FG_COLOR: black;
$WARNING_BG_COLOR: #FFF8E0;
$WARNING_BORDER_COLOR: #F8CC70;
$WARNING_FG_COLOR: black;
$DANGER_BG_COLOR: #FFE0E0;
$DANGER_BORDER_COLOR: #F07070;
$DANGER_FG_COLOR: black;

$WELL_BG_COLOR: rgba($pachycolea_light_stipe, 0.45);
$WELL_FG_COLOR: $pachycolea_foreground;

@import "variables/defaults";
@import "variables/amanita";
@import "mushroom_observer";
11 changes: 2 additions & 9 deletions app/assets/stylesheets/BlackOnWhite.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
// This theme is newer than the genus-color themes,
// and does not use the "old_theme" defaults.
@import "defaults";

$LOGO_BORDER_COLOR: #DDDDDD;
$LEFT_BAR_BORDER_COLOR: #DDDDDD;
$TOP_BAR_BORDER_COLOR: #D9D9D9;
$LIST_BORDER_COLOR: #DDDDDD;
$BUTTON_HOVER_BORDER_COLOR: #CCCCCC;
$BUTTON_BG_COLOR: #CCCCCC;

@import "variables/defaults";
@import "variables/black_on_white";
@import "mushroom_observer";
Loading

0 comments on commit 56d6b68

Please sign in to comment.