Skip to content

Commit 15f1c56

Browse files
committed
Adjusted css for uninitialized events block to accommodate droppable div detection changes, added back calendar-icon click registration (lost in translation to new template 'HereDoc' system)
1 parent 38ff1a0 commit 15f1c56

File tree

4 files changed

+35
-22
lines changed

4 files changed

+35
-22
lines changed

css/rc_calendar.css

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
width: 99%;
1414
max-width: 118px;
1515
height: 66px;
16-
border: 1px solid #888888;
16+
border: 1px solid #888;
1717
font-family: metrophobic,arial; }
1818
.rc_event .rc_event_head {
1919
width: 100%;
@@ -35,7 +35,7 @@
3535
.rc_event #sgrip {
3636
width: 20px;
3737
height: 10px;
38-
border: 1px solid #888888;
38+
border: 1px solid #888;
3939
border-top: none;
4040
-webkit-border-bottom-right-radius: 6px;
4141
-webkit-border-bottom-left-radius: 6px;
@@ -69,48 +69,48 @@
6969
.col_5dayweek {
7070
float: left;
7171
width: 118px;
72-
border: 1px solid #cccccc;
72+
border: 1px solid #ccc;
7373
border-left: none;
7474
overflow: hidden;
7575
position: relative; }
7676

7777
.col_7dayweek {
7878
float: left;
7979
width: 84px;
80-
border: 1px solid #cccccc;
80+
border: 1px solid #ccc;
8181
border-left: none;
8282
overflow: hidden;
8383
position: relative; }
8484

8585
.rc_gutter {
8686
float: left;
8787
width: 48px;
88-
border: 1px solid #cccccc; }
88+
border: 1px solid #ccc; }
8989

9090
.rc_hour_slot {
9191
height: 71px;
92-
border-bottom: 1px solid #cccccc; }
92+
border-bottom: 1px solid #ccc; }
9393

9494
.rc_quarters_slot {
9595
height: 17px;
9696
width: 100%;
97-
border-bottom: 1px dotted #cccccc; }
97+
border-bottom: 1px dotted #ccc; }
9898

9999
.rc_quarters_slot:nth-child(even) {
100-
border-bottom: 1px solid #cccccc; }
100+
border-bottom: 1px solid #ccc; }
101101

102102
.rc_thirds_slot {
103103
height: 23px;
104104
width: 100%;
105-
border-bottom: 1px dotted #cccccc; }
105+
border-bottom: 1px dotted #ccc; }
106106

107107
.rc_thirds_slot:nth-child(3n-3) {
108-
border-bottom: 1px solid #cccccc; }
108+
border-bottom: 1px solid #ccc; }
109109

110110
.rc_halves_slot {
111111
height: 35px;
112112
width: 100%;
113-
border-bottom: 1px dotted #cccccc; }
113+
border-bottom: 1px dotted #ccc; }
114114

115115
.rc_quarters_slot:nth-child(even) {
116-
border-bottom: 1px solid #cccccc; }
116+
border-bottom: 1px solid #ccc; }

css/test.css

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,22 @@
1111
margin-left: 180px; }
1212

1313
.event_palette {
14-
border-right: 1px solid #888888;
14+
border-right: 1px solid #888;
1515
position: fixed;
16-
top: 10px;
1716
left: 10px;
1817
width: 160px; }
1918

19+
#new_events {
20+
top: 10px; }
21+
22+
#unassigned_event_resource {
23+
top: 310px; }
24+
2025
.unassigned {
21-
top: 330px;
2226
background: #FFD;
2327
width: 160px;
2428
min-height: 180px;
25-
border-right: 1px solid #888800;
29+
border-right: 1px solid #880;
2630
text-align: center; }
2731
.unassigned h2 {
2832
font-size: 18px;
@@ -62,7 +66,7 @@
6266
float: right;
6367
font-size: 50%;
6468
color: #A00;
65-
border: 1px solid #aa0000;
69+
border: 1px solid #A00;
6670
border-radius: 12px;
6771
-moz-border-radius: 12px;
6872
text-align: center;

sass/test.scss

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,21 @@
1414
.event_palette {
1515
border-right:1px solid #888;
1616
position: fixed;
17-
top: 10px;
1817
left: 10px;
1918
width:160px;
2019
}
2120

21+
#new_events{
22+
top: 10px;
23+
}
24+
25+
26+
#unassigned_event_resource{
27+
top: 310px;
28+
}
29+
30+
2231
.unassigned {
23-
top: 330px;
2432
h2 { font-size:18px; margin:0; padding:0; }
2533
background: #FFD;
2634
width:160px;

test.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ <h1>Resource Calendar Demo Page</h1>
1616
This layout is just one possible way to use the Resource Calendar system; it is fully customizable.</p>
1717
<p>Source code for the Resource Calendar jquery plugin, and a description of functionality implemented so far, can be found at: <a href="https://github.com/geekbrit/ResCal">https://github.com/geekbrit/ResCal</a></p>
1818
</div>
19-
<div class='event_palette'>
19+
<div id='new_events' class='event_palette'>
2020
<p>Drag these to a calendar<br>to create a meeting</p>
2121
<div class='ip_spacing'><div class='rc_event client event in_palette' data-evtype='client' ><p>Client Meeting</p></div></div>
2222
<div class='ip_spacing'><div class='rc_event internal event in_palette' data-evtype='internal' ><p>Internal Meeting</p></div></div>
2323
<div class='ip_spacing'><div class='rc_event vendor event in_palette' data-evtype='vendor' ><p>Vendor Meeting</p></div></div>
2424
</div>
2525

26-
<div id='unassigned_event_resource' data-validate ='void' data-params ='{}' data-attr ='{}';>
27-
<div class='event_palette rc_day_target unassigned' id='unassigned_events' data-date='unassigned'>
26+
<div id='unassigned_event_resource' class='event_palette' data-validate ='void' data-params ='{}' data-attr ='{}';>
27+
<div class='rc_day_target unassigned' id='unassigned_events' data-date='unassigned'>
2828
<h2>Unassigned Events</h2>
2929
<p>You can drag events here to save them until room, date, and time have been finalized.</p>
3030
</div>
@@ -165,6 +165,7 @@ <h3>Resource Calendar</h3>
165165
{{ } }}
166166
</div>
167167
</div>
168+
{{ $('.calimg').click(function(){ $(this).datepicker( "dialog", {{= it.baseDate }}, dateSelect ) }); }}
168169
</script>
169170

170171
<script id='render_week_event' type='text/plain'>

0 commit comments

Comments
 (0)