瀏覽代碼

Updated version number and added dark theme

Toby Chui 4 月之前
父節點
當前提交
0331d57fa6
共有 8 個文件被更改,包括 14 次插入12 次删除
  1. 1 1
      main.go
  2. 2 2
      mod/acme/ca.go
  3. 1 1
      mod/update/v308/typedef307.go
  4. 1 1
      mod/update/v308/typedef308.go
  5. 4 3
      reverseproxy.go
  6. 3 2
      web/darktheme.css
  7. 1 1
      web/main.css
  8. 1 1
      web/tools/fs.css

+ 1 - 1
main.go

@@ -60,7 +60,7 @@ var enableAutoUpdate = flag.Bool("cfgupgrade", true, "Enable auto config upgrade
 
 var (
 	name        = "Zoraxy"
-	version     = "3.1.2"
+	version     = "3.1.3"
 	nodeUUID    = "generic" //System uuid, in uuidv4 format
 	development = true      //Set this to false to use embedded web fs
 	bootTime    = time.Now().Unix()

+ 2 - 2
mod/acme/ca.go

@@ -3,7 +3,7 @@ package acme
 /*
 	CA.go
 
-	This script load CA defination from embedded ca.json
+	This script load CA definition from embedded ca.json
 */
 import (
 	_ "embed"
@@ -13,7 +13,7 @@ import (
 	"strings"
 )
 
-// CA Defination, load from embeded json when startup
+// CA definition, load from embeded json when startup
 type CaDef struct {
 	Production map[string]string
 	Test       map[string]string

+ 1 - 1
mod/update/v308/typedef307.go

@@ -1,7 +1,7 @@
 package v308
 
 /*
-	v307 type definations
+	v307 type definitions
 
 	This file wrap up the self-contained data structure
 	for v3.0.7 structure and allow automatic updates

+ 1 - 1
mod/update/v308/typedef308.go

@@ -1,7 +1,7 @@
 package v308
 
 /*
-	v308 type definations
+	v308 type definition
 
 	This file wrap up the self-contained data structure
 	for v3.0.8 structure and allow automatic updates

+ 4 - 3
reverseproxy.go

@@ -1173,7 +1173,7 @@ func HandleCustomHeaderAdd(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	//Create a Custom Header Defination type
+	//Create a Custom Header Definition type
 	var rewriteDirection rewrite.HeaderDirection
 	if direction == "toOrigin" {
 		rewriteDirection = rewrite.HeaderDirection_ZoraxyToUpstream
@@ -1189,7 +1189,8 @@ func HandleCustomHeaderAdd(w http.ResponseWriter, r *http.Request) {
 	if rewriteType == "remove" {
 		isRemove = true
 	}
-	headerRewriteDefination := rewrite.UserDefinedHeader{
+
+	headerRewriteDefinition := rewrite.UserDefinedHeader{
 		Key:       name,
 		Value:     value,
 		Direction: rewriteDirection,
@@ -1197,7 +1198,7 @@ func HandleCustomHeaderAdd(w http.ResponseWriter, r *http.Request) {
 	}
 
 	//Create a new custom header object
-	err = targetProxyEndpoint.AddUserDefinedHeader(&headerRewriteDefination)
+	err = targetProxyEndpoint.AddUserDefinedHeader(&headerRewriteDefinition)
 	if err != nil {
 		utils.SendErrorResponse(w, "unable to add header rewrite rule: "+err.Error())
 		return

+ 3 - 2
web/darktheme.css

@@ -235,7 +235,7 @@ body.darkTheme .ui.celled.sortable.unstackable.compact.table tbody td .ui.circul
 body.darkTheme .ui.celled.sortable.unstackable.compact.table tbody td .ui.circular.mini.basic.icon.button:hover {
     background-color: var(--button_hover_bg) !important;
     color: var(--button_hover_color) !important;
-    border: 1px solid var(--button_hover_border_color) !important;
+    border: 1px solid var(--button_border_color) !important;
 }
 
 body.darkTheme .ui.celled.sortable.unstackable.compact.table tbody td .ui.circular.mini.red.basic.icon.button {
@@ -244,8 +244,9 @@ body.darkTheme .ui.celled.sortable.unstackable.compact.table tbody td .ui.circul
 }
 
 body.darkTheme .ui.celled.sortable.unstackable.compact.table tbody td .ui.circular.mini.red.basic.icon.button:hover {
-    background-color: var(--button_red_hover_bg) !important;
+    background-color: #380a0a !important;
     color: var(--button_red_hover_color) !important;
+    
 }
 
 body.darkTheme .ui.basic.small.icon.circular.button {

+ 1 - 1
web/main.css

@@ -5,7 +5,7 @@
   
 }
 
-/* Theme Color Definations */
+/* Theme Color Definition */
 body:not(.darkTheme){
     --theme_bg: #f6f6f6;
     --theme_bg_primary: #ffffff;

+ 1 - 1
web/tools/fs.css

@@ -6,7 +6,7 @@
 */
 
 /*
-    Color definations
+    Color definition
 */
 :root{
     --dark_theme_toggle: #333333;