Merge branch 'master' into fix/configurable_concurrency_limits

go-shiori · Sep 22, 2024 · 7f2b185 · 7f2b185
2 parents 555936b + 9492075
commit 7f2b185
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/internal/cmd/root.go b/internal/cmd/root.go
@@ -73,7 +73,7 @@ func initShiori(ctx context.Context, cmd *cobra.Command) (*config.Config, *depen
 	cfg := config.ParseServerConfiguration(ctx, logger)
 	cfg.LogLevel = logger.Level.String()
 
-	if storageDirectory != "" && cfg.Storage.DataDir != "" {
+	if storageDirectory != "" {
 		logger.Warn("--storage-directory is set, overriding SHIORI_DIR.")
 		cfg.Storage.DataDir = storageDirectory
 	}

diff --git a/internal/view/assets/css/style.css b/internal/view/assets/css/style.css
diff --git a/internal/view/assets/less/common.less b/internal/view/assets/less/common.less
@@ -586,7 +586,7 @@ a {
 		&.list {
 			grid-gap: 0;
 			padding-bottom: 0;
-			grid-template-columns: minmax(0, 1000px);
+			grid-template-columns: auto;
 
 			.pagination-box {
 				padding: 16px 0;