diff --git a/data/events.json b/data/events.json index 4858fdb..a81b045 100644 --- a/data/events.json +++ b/data/events.json @@ -3564,7 +3564,7 @@ "id": 10412, "event": "你有了第一部自己的手机。", "include": "(MNY>3)&(EVT?[10009])", - "exclude": "(MNY>7)&(EVT?[10412])" + "exclude": "(MNY>7)|(EVT?[10412])" }, "10413": { "id": 10413, diff --git a/data/events.xlsx b/data/events.xlsx index 475e9ee..c8f4fd5 100644 Binary files a/data/events.xlsx and b/data/events.xlsx differ diff --git a/view/dark.css b/view/dark.css index bbc29dd..3d4ee6d 100644 --- a/view/dark.css +++ b/view/dark.css @@ -187,6 +187,13 @@ html { background-color: lightsalmon !important; } +.grade1b, +.grade2b, +.grade3b { + padding-left: 1.5rem; + box-sizing: border-box; +} + .selected { background-color: gray; color: #EEEEEE; diff --git a/view/style.css b/view/style.css index 87e2523..117a708 100644 --- a/view/style.css +++ b/view/style.css @@ -182,6 +182,13 @@ html { background-color: lightsalmon !important; } +.grade1b, +.grade2b, +.grade3b { + padding-left: 1.5rem; + box-sizing: border-box; +} + .selected { background-color: gray; color: white;