From 9bf812b8d93ba387432ef31fdc255557e309726b Mon Sep 17 00:00:00 2001 From: devin Date: Thu, 1 Nov 2012 15:21:42 +0800 Subject: [PATCH 1/3] calendar "edit calendar" update --- .../app/assets/stylesheets/calendar.css | 15 +++++++ .../calendar/back_end/cals/_calendar.html.erb | 5 ++- .../calendar/back_end/cals/edit.html.erb | 43 +++++++++---------- .../panel/calendar/back_end/cals/new.html.erb | 3 +- 4 files changed, 40 insertions(+), 26 deletions(-) diff --git a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css index 8fa88b91..fd25b10e 100644 --- a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css +++ b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css @@ -338,6 +338,21 @@ margin: 4px 0 0 0; } +/* category edit */ +.edit_cal { + margin: -8px; + background-color: whitesmoke; +} + +.edit_cal .table td, .edit_cal .table { + border: 0 !important; + background-color: transparent !important; + margin: 0 !important; +} +.main-list td { + border-top: solid 1px #ddd; +} + /* create / edit event panel */ #tags_panel { top: auto; diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/_calendar.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/_calendar.html.erb index c03b0d18..bc554c6d 100644 --- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/_calendar.html.erb +++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/_calendar.html.erb @@ -1,8 +1,6 @@ -
-