diff --git a/.gitignore b/.gitignore index f60b52a8a..312382f77 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ db/*.sqlite3 log/*.log tmp/ -.sass-cache/ .DS_Store .rvmrc *~ @@ -11,6 +10,3 @@ tmp/ *.swp *.swo public/assets/ - -/app/assets/builds/* -!/app/assets/builds/.keep diff --git a/Gemfile b/Gemfile index 4ae4fc3ea..a2959addb 100644 --- a/Gemfile +++ b/Gemfile @@ -5,9 +5,7 @@ ruby ENV['CUSTOM_RUBY_VERSION'] || '~> 3.4.7' gem 'rails', '~> 8.1' gem 'puma' gem 'bootsnap', require: false -gem "importmap-rails" gem "propshaft" -gem "dartsass-rails" gem 'aws-sdk-s3', '~> 1' group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 9e5e192c6..3b0f82ecf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -102,48 +102,14 @@ GEM concurrent-ruby (1.3.7) connection_pool (3.0.2) crass (1.0.7) - dartsass-rails (0.5.1) - railties (>= 6.0.0) - sass-embedded (~> 1.63) date (3.5.1) drb (2.2.3) erb (6.0.4) erubi (1.13.1) globalid (1.3.0) activesupport (>= 6.1) - google-protobuf (4.34.1) - bigdecimal - rake (~> 13.3) - google-protobuf (4.34.1-aarch64-linux-gnu) - bigdecimal - rake (~> 13.3) - google-protobuf (4.34.1-aarch64-linux-musl) - bigdecimal - rake (~> 13.3) - google-protobuf (4.34.1-arm64-darwin) - bigdecimal - rake (~> 13.3) - google-protobuf (4.34.1-x86-linux-gnu) - bigdecimal - rake (~> 13.3) - google-protobuf (4.34.1-x86-linux-musl) - bigdecimal - rake (~> 13.3) - google-protobuf (4.34.1-x86_64-darwin) - bigdecimal - rake (~> 13.3) - google-protobuf (4.34.1-x86_64-linux-gnu) - bigdecimal - rake (~> 13.3) - google-protobuf (4.34.1-x86_64-linux-musl) - bigdecimal - rake (~> 13.3) i18n (1.14.8) concurrent-ruby (~> 1.0) - importmap-rails (2.2.3) - actionpack (>= 6.0.0) - activesupport (>= 6.0.0) - railties (>= 6.0.0) io-console (0.8.2) irb (1.17.0) pp (>= 0.6.0) @@ -265,37 +231,6 @@ GEM tsort reline (0.6.3) io-console (~> 0.5) - sass-embedded (1.98.0) - google-protobuf (~> 4.31) - rake (>= 13) - sass-embedded (1.98.0-aarch64-linux-android) - google-protobuf (~> 4.31) - sass-embedded (1.98.0-aarch64-linux-gnu) - google-protobuf (~> 4.31) - sass-embedded (1.98.0-aarch64-linux-musl) - google-protobuf (~> 4.31) - sass-embedded (1.98.0-arm-linux-androideabi) - google-protobuf (~> 4.31) - sass-embedded (1.98.0-arm-linux-gnueabihf) - google-protobuf (~> 4.31) - sass-embedded (1.98.0-arm-linux-musleabihf) - google-protobuf (~> 4.31) - sass-embedded (1.98.0-arm64-darwin) - google-protobuf (~> 4.31) - sass-embedded (1.98.0-riscv64-linux-android) - google-protobuf (~> 4.31) - sass-embedded (1.98.0-riscv64-linux-gnu) - google-protobuf (~> 4.31) - sass-embedded (1.98.0-riscv64-linux-musl) - google-protobuf (~> 4.31) - sass-embedded (1.98.0-x86_64-darwin) - google-protobuf (~> 4.31) - sass-embedded (1.98.0-x86_64-linux-android) - google-protobuf (~> 4.31) - sass-embedded (1.98.0-x86_64-linux-gnu) - google-protobuf (~> 4.31) - sass-embedded (1.98.0-x86_64-linux-musl) - google-protobuf (~> 4.31) securerandom (0.4.1) sqlite3 (2.9.5) mini_portile2 (~> 2.8.0) @@ -352,8 +287,6 @@ PLATFORMS DEPENDENCIES aws-sdk-s3 (~> 1) bootsnap - dartsass-rails - importmap-rails pg propshaft puma diff --git a/Procfile.dev b/Procfile.dev index 9cad9378e..794ac3ea5 100644 --- a/Procfile.dev +++ b/Procfile.dev @@ -1,2 +1 @@ web: unset PORT && bin/rails server -css: bin/rails dartsass:watch diff --git a/app/assets/builds/.keep b/app/assets/builds/.keep deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css new file mode 100644 index 000000000..d0cba97c0 --- /dev/null +++ b/app/assets/stylesheets/application.css @@ -0,0 +1,118 @@ +body { + padding-top: 50px; + font-size: 13px; +} + +.container-fluid { + max-width: 1200px; +} + +.navbar-nav > li > a, .navbar-brand { + height: 28px; +} + +@media screen and (max-width: 767px) { + .table-responsive-border { + border: 1px solid #ddd; + } + .table-responsive-border > .table { + margin-bottom: 0; + } + + .table-responsive { + width: 100%; + margin-bottom: 15px; + overflow-y: hidden; + } + + .table-responsive > .table > thead > tr > th, + .table-responsive > .table > thead > tr > td, + .table-responsive > .table > tbody > tr > th, + .table-responsive > .table > tbody > tr > td, + .table-responsive > .table > tfoot > tr > th, + .table-responsive > .table > tfoot > tr > td { + white-space: nowrap; + } + + .table-responsive > .table-bordered { + border: 0; + } + + .table-responsive > .table-bordered > thead > tr > th:first-child, + .table-responsive > .table-bordered > thead > tr > td:first-child, + .table-responsive > .table-bordered > tbody > tr > th:first-child, + .table-responsive > .table-bordered > tbody > tr > td:first-child, + .table-responsive > .table-bordered > tfoot > tr > th:first-child, + .table-responsive > .table-bordered > tfoot > tr > td:first-child { + border-left: 0; + } + + .table-responsive > .table-bordered > thead > tr > th:last-child, + .table-responsive > .table-bordered > thead > tr > td:last-child, + .table-responsive > .table-bordered > tbody > tr > th:last-child, + .table-responsive > .table-bordered > tbody > tr > td:last-child, + .table-responsive > .table-bordered > tfoot > tr > th:last-child, + .table-responsive > .table-bordered > tfoot > tr > td:last-child { + border-right: 0; + } + + .table-responsive > .table-bordered > tbody > tr:last-child > th, + .table-responsive > .table-bordered > tbody > tr:last-child > td, + .table-responsive > .table-bordered > tfoot > tr:last-child > th, + .table-responsive > .table-bordered > tfoot > tr:last-child > td { + border-bottom: 0; + } +} + +table.reports th, table.reports td { + padding: 1px !important; +} + +table.reports tr.branch-separator td { + border-top: solid 2px black; +} + +table.reports tr td.datetime { + text-align: center; +} + +table.reports tr td.branch { + text-align: center; +} + +table.reports tr td.revision { + font-family: Menlo, monospace; + text-align: center; +} + +/* :where() keeps specificity at 0-1-1 so the later td.summary rules + still win for the summary column, which falls in this range. */ +table.reports tr td:nth-child(n+6):where(:nth-child(-n+9)) { + background-color: #FF9090; +} + +table.reports tr td:nth-child(n+6):where(:nth-child(-n+9)):empty { + background-color: #F0FFF0; +} + +table.reports tr td.summary { + background-color: #F0FFF0; +} + +table.reports tr td.summary div { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + width: 250px !important; +} + +table.reports tr td.summary.failure { + background-color: #FF9090; +} + +table.reports tr td.diff div { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + width: 100px !important; +} diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss deleted file mode 100644 index 3294eba65..000000000 --- a/app/assets/stylesheets/application.scss +++ /dev/null @@ -1,135 +0,0 @@ -// Entry point for your Sass build -// vendor/assets/stylesheets/bootstrap.min.css: v5.2.3 -@use 'bootstrap.min'; - -body { - padding-top: 50px; - font-size: 13px; -} - -.container-fluid { - max-width: 1200px; -} - -.navbar-nav > li > a, .navbar-brand { - height: 28px; -} - -.table-responsive-border { - @media screen and (max-width: 767px) { - border: 1px solid #ddd; - > .table { - margin-bottom: 0; - } - } -} - -.table-responsive { - overflow-x: auto; - min-height: 0.01%; - - @media screen and (max-width: 767px) { - width: 100%; - margin-bottom: 15px; - overflow-y: hidden; - -ms-overflow-style: -ms-autohiding-scrollbar; - - > .table { - > thead, - > tbody, - > tfoot { - > tr { - > th, - > td { - white-space: nowrap; - } - } - } - } - - > .table-bordered { - border: 0; - - > thead, - > tbody, - > tfoot { - > tr { - > th:first-child, - > td:first-child { - border-left: 0; - } - > th:last-child, - > td:last-child { - border-right: 0; - } - } - } - - > tbody, - > tfoot { - > tr:last-child { - > th, - > td { - border-bottom: 0; - } - } - } - - } - } -} - -table.reports { - th, td { - padding: 1px !important; - } - tr.branch-separator td { - border-top: solid 2px black; - } - tr { - td.server { - // width: 150px; - } - td.datetime { - text-align: center; - } - td.branch { - text-align: center; - } - td.option { - } - td.revision { - font-family: Menlo, monospace; - text-align: center; - } - @for $i from 6 through 9 { - td:nth-child(#{$i}) { - background-color: #FF9090; - // width: 50px; - } - td:nth-child(#{$i}):empty { - background-color: #F0FFF0; - } - } - td.summary { - background-color: #F0FFF0; - div { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - width: 250px !important; - } - } - td.summary.failure { - background-color: #FF9090; - } - td.diff { - div { - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - width: 100px !important; - } - } - } -} diff --git a/app/javascript/application.js b/app/javascript/application.js deleted file mode 100644 index 7260fc0bb..000000000 --- a/app/javascript/application.js +++ /dev/null @@ -1,9 +0,0 @@ -// Entry point for the build script in your package.json -import * as Popper from "@popperjs/core" -import * as Bootstrap from "bootstrap" - -document.addEventListener('DOMContentLoaded' ,function() { - $("a[rel=popover]").popover(); - $(".tooltip").tooltip(); - return $("a[rel=tooltip]").tooltip(); -}); diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 16ffd359f..39f40137b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,8 +9,7 @@ <%= favicon_link_tag 'favicon.ico', :rel => 'shortcut icon' %> - <%= stylesheet_link_tag "application", :media => "all" %> - <%= javascript_importmap_tags %> + <%= stylesheet_link_tag "bootstrap.min", "application", :media => "all" %> diff --git a/bin/importmap b/bin/importmap deleted file mode 100755 index 36502ab16..000000000 --- a/bin/importmap +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env ruby - -require_relative "../config/application" -require "importmap/commands" diff --git a/config/importmap.rb b/config/importmap.rb deleted file mode 100644 index e124f387d..000000000 --- a/config/importmap.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Pin npm packages by running ./bin/importmap - -pin "application", preload: true -pin "bootstrap", to: "https://ga.jspm.io/npm:bootstrap@5.2.3/dist/js/bootstrap.esm.js" -pin "@popperjs/core", to: "https://ga.jspm.io/npm:@popperjs/core@2.11.6/lib/index.js"