Skip to content

Commit 472196e

Browse files
committed
merge eventRegistration
2 parents 5174a7c + 5ccb09d commit 472196e

15 files changed

+18496
-6
lines changed

Zenergy/Zenergy/App_Start/BundleConfig.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ public class BundleConfig
99
public static void RegisterBundles(BundleCollection bundles)
1010
{
1111
bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
12-
"~/Scripts/Lib/jquery-{version}.js"));
12+
"~/Scripts/Lib/jquery-{version}.js",
13+
"~/Scripts/Lib/jquery-ui.js"));
1314

1415
// Utilisez la version de développement de Modernizr pour développer et apprendre. Puis, lorsque vous êtes
1516
// prêt pour la production, utilisez l’outil de génération sur http://modernizr.com pour sélectionner uniquement les tests dont vous avez besoin.
@@ -40,6 +41,7 @@ public static void RegisterBundles(BundleCollection bundles)
4041

4142
bundles.Add(new StyleBundle("~/Content/css").Include(
4243
"~/Content/bootstrap.css",
44+
"~/Content/angular-date-picker.css",
4345
"~/Content/site.css"));
4446
}
4547
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
.angular-date-picker {
2+
color: #333;
3+
font: normal 14px sans-serif;
4+
border: 1px solid #ddd;
5+
display: inline-block;
6+
background: #fff;
7+
}
8+
.angular-date-picker > ._month {
9+
text-align: center;
10+
line-height: 22px;
11+
padding: 10px;
12+
background: #fcfcfc;
13+
text-transform: uppercase;
14+
font-weight: bold;
15+
border-bottom: 1px solid #ddd;
16+
position: relative;
17+
}
18+
.angular-date-picker > ._month > button {
19+
color: #555;
20+
font: normal 14px sans-serif;
21+
outline: none;
22+
position: absolute;
23+
background: transparent;
24+
border: none;
25+
cursor: pointer;
26+
}
27+
.angular-date-picker > ._month > button:hover {
28+
color: #333;
29+
}
30+
.angular-date-picker > ._month > button._previous {
31+
left: 10px;
32+
}
33+
.angular-date-picker > ._month > button._next {
34+
right: 10px;
35+
}
36+
.angular-date-picker > ._days {
37+
width: 210px; /* 30 x 7 */
38+
margin: 10px;
39+
text-align: center;
40+
}
41+
.angular-date-picker > ._days > ._day-of-week, .angular-date-picker > ._days > ._day {
42+
box-sizing: border-box;
43+
border: 1px solid transparent;
44+
width: 30px;
45+
line-height: 28px;
46+
float: left;
47+
}
48+
.angular-date-picker > ._days > ._day-of-week {
49+
font-weight: bold;
50+
}
51+
.angular-date-picker > ._days > ._day.-padding {
52+
opacity: .5;
53+
}
54+
.angular-date-picker > ._days > ._day {
55+
cursor: pointer;
56+
}
57+
.angular-date-picker > ._days > ._day.-selected {
58+
background: #e0e0e0;
59+
}
60+
.angular-date-picker > ._days > ._day.-today {
61+
border-color: #aaa;
62+
}
63+
.angular-date-picker > ._days > ._day:hover {
64+
background: #eee;
65+
}
66+
.angular-date-picker > ._days:after {
67+
content: '';
68+
display: block;
69+
clear: left;
70+
height: 0;
71+
}

0 commit comments

Comments
 (0)