calendar update
- delete unwanted style in bootstrap-responsive.css - yet start repeat panel - please just refer how google works (functionality)
This commit is contained in:
devin
Christophe Vilayphiou
parent
f1485556bd
commit
af19f11668
File diff suppressed because it is too large
Load Diff
|
|
@ -249,8 +249,6 @@
|
|||
margin: 0 8px 0 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* agenda view */
|
||||
#calendar_agenda {
|
||||
border-bottom: solid 1px #ddd;
|
||||
|
|
@ -258,6 +256,11 @@
|
|||
#calendar_agenda .table {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
#calendar_agenda .event {
|
||||
-webkit-box-shadow: none;
|
||||
-moz-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
.event_time {
|
||||
font-family: Tahoma, sans-serif;
|
||||
}
|
||||
|
|
@ -285,52 +288,61 @@
|
|||
#calendar_day .event_list td {
|
||||
padding: 0;
|
||||
}
|
||||
#calendar_day .event_list .day_time {
|
||||
height: 30px;
|
||||
border-bottom: solid 1px #ddd;
|
||||
border-left: solid 1px #ddd;
|
||||
text-align: right;
|
||||
padding: 4px;
|
||||
}
|
||||
#calendar_day .event_list .cell {
|
||||
height: 38px;
|
||||
border: solid 1px #ddd;
|
||||
border-top: 0;
|
||||
}
|
||||
#calendar_day .event_list .divide {
|
||||
height: 18px;
|
||||
margin-bottom: 18px;
|
||||
border-bottom: solid 1px #eee;
|
||||
}
|
||||
#calendar_day .event_holder {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
}
|
||||
#calendar_day .event_holder .event {
|
||||
padding: 0px;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
}
|
||||
#calendar_day .event_holder .event.half {
|
||||
|
||||
/* week view */
|
||||
#calendar_week {
|
||||
|
||||
}
|
||||
#calendar_day .event_holder .event.over {
|
||||
outline: solid 1px #fff;
|
||||
#calendar_week .cell_wrapper {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
}
|
||||
#calendar_day .event dl, #calendar_day .event dt, #calendar_day .event dd {
|
||||
margin: 0;
|
||||
#calendar_week td {
|
||||
padding: 0;
|
||||
}
|
||||
#calendar_day .event dl {
|
||||
padding: 3px;
|
||||
#calendar_week .table {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
#calendar_day .event dt {
|
||||
font-size: 11px;
|
||||
font-weight: normal;
|
||||
line-height: 12px;
|
||||
#calendar_week .header {
|
||||
margin-bottom: 12px;
|
||||
border-top: 0;
|
||||
table-layout: fixed;
|
||||
}
|
||||
#calendar_week .header th {
|
||||
text-align: center;
|
||||
font-size: 12px;
|
||||
}
|
||||
#calendar_week .header td {
|
||||
border: solid 1px #ddd;
|
||||
background-color: #eee;
|
||||
}
|
||||
#calendar_week .week_day {
|
||||
padding: 0 2px;
|
||||
border: solid 1px #ddd;
|
||||
}
|
||||
#calendar_week .header .week_day {
|
||||
padding: 1px 2px 10px 2px;
|
||||
}
|
||||
#calendar_week .event_list .event {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
#calendar_week .cell_map {
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
#calendar_week .cell_map td {
|
||||
border-top: 0;
|
||||
border-bottom: 0;
|
||||
}
|
||||
#calendar_week .cell_map tr:first-child td {
|
||||
border-top: solid 1px #ddd;
|
||||
}
|
||||
#calendar_week .event_holder .inner {
|
||||
margin: 0 8px 0 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/* calendars(category) */
|
||||
|
|
|
|||
|
|
@ -117,6 +117,7 @@
|
|||
<div class="divide"></div>
|
||||
</div>
|
||||
<div class="event_holder">
|
||||
<div class="inner">
|
||||
<div class="event" style="background-color: #66cc00; top: 0;">
|
||||
<dl>
|
||||
<dt>10:30am - 11:00am</dt>
|
||||
|
|
@ -141,13 +142,14 @@
|
|||
<dd>template</dd>
|
||||
</dl>
|
||||
</div>
|
||||
<div class="event over" style="background-color: #00ffee; top: 214px; left: 50%; width: 50%;">
|
||||
<div class="event over" style="background-color: #00ccee; top: 214px; left: 50%; width: 50%;">
|
||||
<dl>
|
||||
<dt>10:30am - 11:00am</dt>
|
||||
<dd>template</dd>
|
||||
</dl>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
</div>
|
||||
<div id="orbit_calendar" class="month_view">
|
||||
<div class="row-fluid">
|
||||
<div class="span2">
|
||||
<div class="span3">
|
||||
<div class="btn-toolbar" style="margin:0;">
|
||||
<div class="btn-group">
|
||||
<button class="btn">Today</button>
|
||||
|
|
@ -39,10 +39,10 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="span7">
|
||||
<div class="span5">
|
||||
<h4 class="current_day_title">Semptember 2012</h4>
|
||||
</div>
|
||||
<div class="span3">
|
||||
<div class="span4">
|
||||
<div class="btn-group calendar_mode" data-toggle="buttons-radio">
|
||||
<button class="btn mode_switch">day</button>
|
||||
<button class="btn mode_switch">week</button>
|
||||
|
|
|
|||
|
|
@ -87,11 +87,7 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td colspan="3"></td>
|
||||
<<<<<<< HEAD
|
||||
<td><div class="event single" style="color: #ffcc00;">7pm - 9pm test event</div></td>
|
||||
=======
|
||||
<td><div class="event" style="color: #ffcc00;">7pm - 9pm test event</div></td>
|
||||
>>>>>>> calendar update
|
||||
<td colspan="3"></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
|
|||
Loading…
Reference in New Issue