Skip to content

Commit bc9a0d9

Browse files
author
Martin Meier
committed
Update to version 1.9.7
1 parent 188a53d commit bc9a0d9

File tree

17 files changed

+4274
-3532
lines changed

17 files changed

+4274
-3532
lines changed

Rakefile

+10-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ desc "Change css url calls to use sass-rails' asset-url"
44
task :change_css_url do
55
Dir.chdir('vendor/assets/stylesheets/zebra-datepicker/')
66
Dir.glob('*.scss').each do |filename|
7-
content = File.read(filename).gsub!(" url('../images/", " asset-url('zebra-datepicker/")
7+
template = File.basename(filename, '.scss')
8+
content = File.read(filename).gsub!(' url("', ' asset-url("zebra-datepicker/' + template + '/')
89
file = File.open(filename, 'w')
910
file.write(content)
1011
file.close
@@ -14,17 +15,17 @@ end
1415
desc 'Copy Assets from Zebra_Datepicker'
1516
task :copy do
1617
{
17-
'public/css/bootstrap.css' => 'vendor/assets/stylesheets/zebra-datepicker/bootstrap.scss',
18-
'public/css/default.css' => 'vendor/assets/stylesheets/zebra-datepicker/default.scss',
19-
'public/css/metallic.css' => 'vendor/assets/stylesheets/zebra-datepicker/metallic.scss',
18+
'dist/css/bootstrap/zebra_datepicker.css' => 'vendor/assets/stylesheets/zebra-datepicker/bootstrap.scss',
19+
'dist/css/default/zebra_datepicker.css' => 'vendor/assets/stylesheets/zebra-datepicker/default.scss',
20+
'dist/css/metallic/zebra_datepicker.css' => 'vendor/assets/stylesheets/zebra-datepicker/metallic.scss',
2021

21-
'public/images/metallic/' => 'vendor/assets/images/zebra-datepicker/',
22-
'public/images/calendar-disabled.png' => 'vendor/assets/images/zebra-datepicker/',
23-
'public/images/calendar.png' => 'vendor/assets/images/zebra-datepicker/',
22+
'dist/css/bootstrap/icons.png' => 'vendor/assets/images/zebra-datepicker/bootstrap/icons.png',
23+
'dist/css/default/icons.png' => 'vendor/assets/images/zebra-datepicker/default/icons.png',
24+
'dist/css/metallic/icons.png' => 'vendor/assets/images/zebra-datepicker/metallic/icons.png',
2425

25-
'public/javascript/zebra_datepicker.js' => 'vendor/assets/javascripts/zebra-datepicker/',
26-
'public/javascript/zebra_datepicker.src.js' => 'vendor/assets/javascripts/zebra-datepicker/'
26+
'dist/zebra_datepicker.src.js' => 'vendor/assets/javascripts/zebra-datepicker/zebra_datepicker.js'
2727
}.each do |src, dest|
28+
FileUtils.mkdir_p File.dirname(dest)
2829
FileUtils.cp_r("Zebra_Datepicker/#{src}", dest)
2930
end
3031
end

Zebra_Datepicker

Submodule Zebra_Datepicker updated 73 files

lib/zebra-datepicker-rails/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module ZebraDatepickerRails
22
module Rails
3-
VERSION = "1.9.5"
3+
VERSION = "1.9.7"
44
end
55
end
Loading
Binary file not shown.
-154 Bytes
Binary file not shown.
Loading
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Binary file not shown.

vendor/assets/javascripts/zebra-datepicker/zebra_datepicker.js

100755100644
+3,690-1
Large diffs are not rendered by default.

vendor/assets/javascripts/zebra-datepicker/zebra_datepicker.src.js

-3,229
This file was deleted.
+168-91
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,173 @@
1-
/*
2-
3-
Zebra_DatePicker: a lightweight jQuery date picker plugin
4-
5-
Twitter Bootstrap theme
6-
7-
copyright (c) 2011 - 2014 Stefan Gabos
8-
http://stefangabos.ro/jquery/zebra-datepicker/
9-
10-
*/
1+
.Zebra_DatePicker {
2+
background: #fff;
3+
border: 1px solid #aaa;
4+
border-radius: 4px;
5+
box-shadow: 0px 0px 10px #ccc;
6+
color: #222;
7+
font: 13px Tahoma, Arial, Helvetica, sans-serif;
8+
padding: 5px 5px;
9+
position: absolute;
10+
display: table;
11+
z-index: 1200;
12+
}
1113

1214
.Zebra_DatePicker *,
1315
.Zebra_DatePicker *:after,
14-
.Zebra_DatePicker *:before { -moz-box-sizing: content-box !important; -webkit-box-sizing: content-box !important; box-sizing: content-box !important }
15-
16-
.Zebra_DatePicker { position: absolute; background: #FFF; border: 1px solid #999; z-index: 1200; padding: 5px; top: 0 }
17-
18-
.Zebra_DatePicker * { margin: 0; padding: 0; color: #373737; background: transparent; border: none }
19-
20-
/* = GLOBALS
21-
----------------------------------------------------------------------------------------------------------------------*/
22-
.Zebra_DatePicker table { border-collapse: collapse; border-spacing: 0; width: auto; table-layout: auto; }
23-
24-
.Zebra_DatePicker td,
25-
.Zebra_DatePicker th { text-align: center; padding: 5px 0 }
26-
27-
.Zebra_DatePicker td { cursor: pointer }
28-
29-
.Zebra_DatePicker .dp_daypicker,
30-
.Zebra_DatePicker .dp_monthpicker,
31-
.Zebra_DatePicker .dp_yearpicker { margin-top: 3px }
16+
.Zebra_DatePicker *:before {
17+
box-sizing: content-box !important;
18+
}
19+
20+
.Zebra_DatePicker * {
21+
padding: 0;
22+
}
23+
24+
.Zebra_DatePicker table {
25+
border-collapse: collapse;
26+
border-radius: 4px;
27+
border-spacing: 0;
28+
width: 100%;
29+
}
30+
31+
.Zebra_DatePicker th, .Zebra_DatePicker td {
32+
border-radius: 4px;
33+
padding: 5px;
34+
cursor: pointer;
35+
text-align: center;
36+
min-width: 25px;
37+
width: 25px;
38+
}
39+
40+
.Zebra_DatePicker .dp_body .dp_not_in_month {
41+
color: #666;
42+
}
43+
44+
.Zebra_DatePicker .dp_body .dp_current {
45+
color: #3a87ad;
46+
}
47+
48+
.Zebra_DatePicker .dp_body .dp_selected {
49+
background: #337ab7;
50+
color: #fff;
51+
}
52+
53+
.Zebra_DatePicker .dp_body .dp_disabled {
54+
color: #bbbbbb;
55+
cursor: text;
56+
}
57+
58+
.Zebra_DatePicker .dp_body .dp_disabled.dp_current {
59+
color: #b4d5e6;
60+
}
61+
62+
.Zebra_DatePicker .dp_body .dp_hover {
63+
background: #dedede;
64+
}
65+
66+
.Zebra_DatePicker .dp_body .dp_hover.dp_time_control {
67+
background-color: #dedede;
68+
}
3269

33-
.Zebra_DatePicker .dp_daypicker td,
34-
.Zebra_DatePicker .dp_daypicker th,
3570
.Zebra_DatePicker .dp_monthpicker td,
36-
.Zebra_DatePicker .dp_yearpicker td { width: 30px }
37-
38-
.Zebra_DatePicker,
39-
.Zebra_DatePicker .dp_header .dp_hover,
40-
.Zebra_DatePicker td.dp_selected,
41-
.Zebra_DatePicker .dp_footer .dp_hover,
42-
.Zebra_DatePicker td.dp_hover { -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px }
43-
44-
/* = VISIBLE/HIDDEN STATES (USE TRANSITIONS FOR EFFECTS)
45-
----------------------------------------------------------------------------------------------------------------------*/
46-
.Zebra_DatePicker.dp_visible { visibility: visible; filter: alpha(opacity=100); -khtml-opacity: 1; -moz-opacity: 1; opacity: 1; transition: opacity 0.2s ease-in-out }
47-
.Zebra_DatePicker.dp_hidden { visibility: hidden; filter: alpha(opacity=0); -khtml-opacity: 0; -moz-opacity: 0; opacity: 0 }
48-
49-
/* = HEADER
50-
----------------------------------------------------------------------------------------------------------------------*/
51-
.Zebra_DatePicker .dp_header td { }
52-
53-
.Zebra_DatePicker .dp_header .dp_previous,
54-
.Zebra_DatePicker .dp_header .dp_next { width: 30px }
55-
56-
.Zebra_DatePicker .dp_header .dp_caption { font-weight: bold }
57-
.Zebra_DatePicker .dp_header .dp_hover { background: #DEDEDE; color: #373737 }
58-
59-
/* = DATEPICKER
60-
----------------------------------------------------------------------------------------------------------------------*/
61-
.Zebra_DatePicker .dp_daypicker th { font-weight: bold }
62-
.Zebra_DatePicker td.dp_not_in_month { color: #DEDEDE; cursor: default }
63-
.Zebra_DatePicker td.dp_not_in_month_selectable { }
64-
.Zebra_DatePicker td.dp_weekend { }
65-
.Zebra_DatePicker td.dp_weekend_disabled { color: #DEDEDE; cursor: default }
66-
.Zebra_DatePicker td.dp_selected { background: #039; color: #FFF !important }
67-
.Zebra_DatePicker td.dp_week_number { cursor: text; font-weight: bold }
68-
69-
/* = MONTHPICKER
70-
----------------------------------------------------------------------------------------------------------------------*/
71-
.Zebra_DatePicker .dp_monthpicker td { width: 33% }
72-
73-
/* = YEARPICKER
74-
----------------------------------------------------------------------------------------------------------------------*/
75-
.Zebra_DatePicker .dp_yearpicker td { width: 33% }
76-
77-
/* = FOOTER
78-
----------------------------------------------------------------------------------------------------------------------*/
79-
.Zebra_DatePicker .dp_footer { margin-top: 3px }
80-
81-
/* = SOME MORE GLOBALS (MUST BE LAST IN ORDER TO OVERWRITE PREVIOUS PROPERTIES)
82-
----------------------------------------------------------------------------------------------------------------------*/
83-
.Zebra_DatePicker td.dp_current { color: #3A87AD }
84-
.Zebra_DatePicker td.dp_disabled_current { color: #3A87AD }
85-
.Zebra_DatePicker td.dp_disabled { color: #DEDEDE; cursor: default }
86-
.Zebra_DatePicker td.dp_hover { background: #DEDEDE }
87-
88-
/* = ICON
89-
----------------------------------------------------------------------------------------------------------------------*/
90-
button.Zebra_DatePicker_Icon { display: block; position: absolute; width: 16px; height: 16px; background: asset-url('zebra-datepicker/calendar.png') no-repeat left top; text-indent: -9000px; border: none; cursor: pointer; padding: 0; line-height: 0; vertical-align: top }
91-
button.Zebra_DatePicker_Icon_Disabled { background-image: asset-url('zebra-datepicker/calendar-disabled.png') }
92-
93-
/* don't set vertical margins! */
94-
button.Zebra_DatePicker_Icon { margin: 0 0 0 3px }
95-
button.Zebra_DatePicker_Icon_Inside_Right { margin: 0 3px 0 0 }
96-
button.Zebra_DatePicker_Icon_Inside_Left { margin: 0 0 0 3px }
71+
.Zebra_DatePicker .dp_yearpicker td,
72+
.Zebra_DatePicker .dp_timepicker td {
73+
width: 33.3333%;
74+
}
75+
76+
.Zebra_DatePicker .dp_timepicker .dp_disabled {
77+
border: none;
78+
color: #222;
79+
font-size: 39px;
80+
font-weight: bold;
81+
}
82+
83+
.Zebra_DatePicker .dp_time_separator div {
84+
position: relative;
85+
}
86+
87+
.Zebra_DatePicker .dp_time_separator div:after {
88+
content: ":";
89+
color: #222;
90+
font-size: 37px;
91+
left: 100%;
92+
position: absolute;
93+
z-index: 1;
94+
}
95+
96+
.Zebra_DatePicker .dp_header {
97+
margin-bottom: 5px;
98+
}
99+
100+
.Zebra_DatePicker .dp_footer {
101+
margin-top: 5px;
102+
}
103+
104+
.Zebra_DatePicker .dp_footer .dp_icon {
105+
width: 50%;
106+
}
107+
108+
.Zebra_DatePicker .dp_actions td {
109+
border-radius: 4px;
110+
}
111+
112+
.Zebra_DatePicker .dp_actions .dp_caption {
113+
font-weight: bold;
114+
width: 100%;
115+
}
116+
117+
.Zebra_DatePicker .dp_actions .dp_hover {
118+
background-color: #dedede;
119+
}
120+
121+
.Zebra_DatePicker .dp_daypicker th {
122+
cursor: text;
123+
font-weight: bold;
124+
}
125+
126+
.Zebra_DatePicker.dp_hidden {
127+
display: none;
128+
}
129+
130+
.Zebra_DatePicker .dp_icon {
131+
height: 16px;
132+
background-image: asset-url("zebra-datepicker/bootstrap/icons.png");
133+
background-repeat: no-repeat;
134+
}
135+
136+
.Zebra_DatePicker .dp_icon.dp_confirm {
137+
background-position: center -123px;
138+
}
139+
140+
.Zebra_DatePicker .dp_icon.dp_view_toggler {
141+
background-position: center -91px;
142+
}
143+
144+
.Zebra_DatePicker .dp_icon.dp_view_toggler.dp_calendar {
145+
background-position: center -59px;
146+
}
147+
148+
button.Zebra_DatePicker_Icon {
149+
background: asset-url("zebra-datepicker/bootstrap/icons.png") no-repeat center top;
150+
border: none;
151+
cursor: pointer;
152+
display: block;
153+
height: 16px;
154+
line-height: 0;
155+
margin: 0 0 0 3px;
156+
padding: 0;
157+
position: absolute;
158+
text-indent: -9000px;
159+
width: 16px;
160+
}
161+
162+
button.Zebra_DatePicker_Icon.Zebra_DatePicker_Icon_Disabled {
163+
background-position: center -32px;
164+
cursor: default;
165+
}
166+
167+
button.Zebra_DatePicker_Icon.Zebra_DatePicker_Icon_Inside_Right {
168+
margin: 0 3px 0 0;
169+
}
170+
171+
button.Zebra_DatePicker_Icon.Zebra_DatePicker_Icon_Inside_Left {
172+
margin: 0 0 0 3px;
173+
}

0 commit comments

Comments
 (0)