diff options
| author | 藍挺瑋 <lantw44@gmail.com> | 2012-12-19 20:19:40 +0800 |
|---|---|---|
| committer | LAN-TW <lantw44@gmail.com> | 2012-12-19 20:19:40 +0800 |
| commit | 42b0acce1e50c695fd4515f3821776c600f780f0 (patch) | |
| tree | 283a59d78c32b7f9c759c1607e493466cfa67ed2 | |
| parent | 36b3ef798a63dec2e01bb41df354ea6bd90e82b2 (diff) | |
| download | inccalendar-42b0acce1e50c695fd4515f3821776c600f780f0.tar.gz inccalendar-42b0acce1e50c695fd4515f3821776c600f780f0.tar.zst inccalendar-42b0acce1e50c695fd4515f3821776c600f780f0.zip | |
修正 conflict 問題
| -rw-r--r-- | css/list.css | 2 | ||||
| -rw-r--r-- | css/month.css | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/css/list.css b/css/list.css index ec84d27..ecf1739 100644 --- a/css/list.css +++ b/css/list.css @@ -4,7 +4,7 @@ body { thead tr > td { font-size:2em; } -tbody#eventbody tr:hover{ +tbody#eventbody tr:hover { background-color: #FFFF00; } #searchingoption, #searchingcontent{ diff --git a/css/month.css b/css/month.css index 93666d8..8761c0b 100644 --- a/css/month.css +++ b/css/month.css @@ -32,12 +32,9 @@ tbody#calbody td{ width: 14.285%; color: black; } -<<<<<<< HEAD -tbody#calbody tr td:hover{ +tbody#calbody tr td:hover { background-color: #FFff00; } - -======= tbody#calbody td div{ font-size: large; } @@ -52,7 +49,6 @@ tbody#calbody td ul{ overflow-y: hidden; max-height: 150px; } ->>>>>>> c5d88cf440779de0ef728e099fb23e9a6f14642b #timeselect_year, #timeselect_month{ font-family: serif; } |