summaryrefslogtreecommitdiffstats
path: root/codebase/sources/skins
diff options
context:
space:
mode:
authorAlexKlimenkov <shurick.klimenkov@gmail.com>2014-11-12 12:31:30 +0300
committerAlexKlimenkov <shurick.klimenkov@gmail.com>2014-11-12 12:31:30 +0300
commitb43931167c3a3229c89608fe0cac8cc6f28db9d5 (patch)
treea21af26a5b6fb026be2210d20263ae820337f99e /codebase/sources/skins
parent18d5b85296811c84235763e3b39eb6f7715e8d19 (diff)
downloadscheduler-b43931167c3a3229c89608fe0cac8cc6f28db9d5.zip
scheduler-b43931167c3a3229c89608fe0cac8cc6f28db9d5.tar.gz
scheduler-b43931167c3a3229c89608fe0cac8cc6f28db9d5.tar.bz2
[update] version 4.2.0
Diffstat (limited to 'codebase/sources/skins')
-rw-r--r--codebase/sources/skins/dhtmlxscheduler.css64
-rw-r--r--codebase/sources/skins/dhtmlxscheduler_classic.css47
-rw-r--r--codebase/sources/skins/dhtmlxscheduler_flat.css154
-rw-r--r--codebase/sources/skins/dhtmlxscheduler_glossy.css47
4 files changed, 196 insertions, 116 deletions
diff --git a/codebase/sources/skins/dhtmlxscheduler.css b/codebase/sources/skins/dhtmlxscheduler.css
index 8c5fdb5..96421dc 100644
--- a/codebase/sources/skins/dhtmlxscheduler.css
+++ b/codebase/sources/skins/dhtmlxscheduler.css
@@ -1,5 +1,5 @@
/*
-dhtmlxScheduler v.4.1.0 Stardard
+dhtmlxScheduler v.4.2.0 Stardard
This software is covered by GPL license. You also can obtain Commercial or Enterprise license to use it in non-GPL project - please contact sales@dhtmlx.com. Usage without proper license is prohibited.
@@ -219,11 +219,6 @@ div.dhx_modal_cover {
border-width: 0 1px 1px 1px;
padding: 5px;
}
-.dhx_cal_event.dhx_cal_select_menu {
- -webkit-box-shadow: 0 0 1px #FFF;
- -moz-box-shadow: 0 0 1px #FFF;
- box-shadow: 0 0 1px #FFF;
-}
.dhx_resize_denied,
.dhx_resize_denied .dhx_event_resize {
cursor: default !important;
@@ -1196,13 +1191,24 @@ div.icon_delete {
.dhx_cal_navline div,
.dhx_cal_header,
.dhx_cal_header div,
+.dhx_cal_data,
.dhx_cal_data div,
-.dhx_cal_light,
-.dhx_cal_light div {
+.dhx_cal_data table *,
+.dhx_multi_day,
+.dhx_multi_day div,
+.dhx_tooltip_line div,
+.dhx_cal_quick_info,
+.dhx_cal_quick_info div {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
+.dhx_cal_event div {
+ line-height: normal;
+}
+.dhx_cal_data table {
+ border-collapse: separate;
+}
.dhx_cal_light .dhx_cal_radio label {
margin-bottom: 0;
}
@@ -1462,7 +1468,6 @@ div.icon_delete {
.dhx_form_repeat {
overflow: hidden;
/*height:115px;*/
- height: 0px;
background-color: #FFF4B5;
/*border: 1px solid #DCC43E;*/
}
@@ -1470,31 +1475,35 @@ div.icon_delete {
background-color: transparent;
}
.dhx_repeat_center,
-.dhx_repeat_left {
+.dhx_repeat_left,
+.dhx_repeat_divider,
+.dhx_repeat_right {
height: 115px;
- padding: 10px 0 10px 10px;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+.dhx_repeat_center,
+.dhx_repeat_left {
+ padding: 10px 0 0px 10px;
float: left;
}
.dhx_repeat_left {
- width: 95px;
+ width: 105px;
}
.dhx_repeat_center {
- width: 335px;
- margin-top: 12px;
+ width: 345px;
+ padding-top: 22px;
}
.dhx_repeat_divider {
float: left;
- height: 115px;
border-left: 1px dotted #DCC43E;
/*background-color: #DCC43E;*/
width: 1px;
}
.dhx_repeat_right {
float: right;
- height: 115px;
- width: 160px;
- padding: 10px 3px 10px 10px;
- margin-top: 7px;
+ width: 173px;
+ padding: 17px 3px 0px 10px;
}
input.dhx_repeat_text {
height: 16px;
@@ -1558,18 +1567,6 @@ input.dhx_repeat_checkbox {
.dhx_cal_light_rec.dhx_cal_light_wide .dhx_cal_larea {
width: 808px;
}
-/* bootstrap CSS fix */
-.dhx_cal_navline div,
-.dhx_cal_header,
-.dhx_cal_header div,
-.dhx_cal_data div {
- -webkit-box-sizing: content-box;
- -moz-box-sizing: content-box;
- box-sizing: content-box;
-}
-.dhx_cal_event div {
- line-height: normal;
-}
/* event start */
.dhx_cal_event .dhx_title {
border-width: 1px 1px 0 1px;
@@ -1599,6 +1596,11 @@ input.dhx_repeat_checkbox {
.dhx_cal_event.dhx_cal_select_menu .dhx_footer {
display: none;
}
+.dhx_cal_event.dhx_cal_select_menu {
+ -webkit-box-shadow: 0 0 1px #FFF;
+ -moz-box-shadow: 0 0 1px #FFF;
+ box-shadow: 0 0 1px #FFF;
+}
.dhx_cal_event .dhx_footer {
height: 5px;
border: 0;
diff --git a/codebase/sources/skins/dhtmlxscheduler_classic.css b/codebase/sources/skins/dhtmlxscheduler_classic.css
index e322e05..204a96e 100644
--- a/codebase/sources/skins/dhtmlxscheduler_classic.css
+++ b/codebase/sources/skins/dhtmlxscheduler_classic.css
@@ -1,5 +1,5 @@
/*
-dhtmlxScheduler v.4.1.0 Stardard
+dhtmlxScheduler v.4.2.0 Stardard
This software is covered by GPL license. You also can obtain Commercial or Enterprise license to use it in non-GPL project - please contact sales@dhtmlx.com. Usage without proper license is prohibited.
@@ -219,11 +219,6 @@ div.dhx_modal_cover {
border-width: 0 1px 1px 1px;
padding: 5px;
}
-.dhx_cal_event.dhx_cal_select_menu {
- -webkit-box-shadow: 0 0 1px #FFF;
- -moz-box-shadow: 0 0 1px #FFF;
- box-shadow: 0 0 1px #FFF;
-}
.dhx_resize_denied,
.dhx_resize_denied .dhx_event_resize {
cursor: default !important;
@@ -1196,13 +1191,24 @@ div.icon_delete {
.dhx_cal_navline div,
.dhx_cal_header,
.dhx_cal_header div,
+.dhx_cal_data,
.dhx_cal_data div,
-.dhx_cal_light,
-.dhx_cal_light div {
+.dhx_cal_data table *,
+.dhx_multi_day,
+.dhx_multi_day div,
+.dhx_tooltip_line div,
+.dhx_cal_quick_info,
+.dhx_cal_quick_info div {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
+.dhx_cal_event div {
+ line-height: normal;
+}
+.dhx_cal_data table {
+ border-collapse: separate;
+}
.dhx_cal_light .dhx_cal_radio label {
margin-bottom: 0;
}
@@ -1462,7 +1468,6 @@ div.icon_delete {
.dhx_form_repeat {
overflow: hidden;
/*height:115px;*/
- height: 0px;
background-color: #FFF4B5;
/*border: 1px solid #DCC43E;*/
}
@@ -1470,31 +1475,35 @@ div.icon_delete {
background-color: transparent;
}
.dhx_repeat_center,
-.dhx_repeat_left {
+.dhx_repeat_left,
+.dhx_repeat_divider,
+.dhx_repeat_right {
height: 115px;
- padding: 10px 0 10px 10px;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+.dhx_repeat_center,
+.dhx_repeat_left {
+ padding: 10px 0 0px 10px;
float: left;
}
.dhx_repeat_left {
- width: 95px;
+ width: 105px;
}
.dhx_repeat_center {
- width: 335px;
- margin-top: 12px;
+ width: 345px;
+ padding-top: 22px;
}
.dhx_repeat_divider {
float: left;
- height: 115px;
border-left: 1px dotted #DCC43E;
/*background-color: #DCC43E;*/
width: 1px;
}
.dhx_repeat_right {
float: right;
- height: 115px;
- width: 160px;
- padding: 10px 3px 10px 10px;
- margin-top: 7px;
+ width: 173px;
+ padding: 17px 3px 0px 10px;
}
input.dhx_repeat_text {
height: 16px;
diff --git a/codebase/sources/skins/dhtmlxscheduler_flat.css b/codebase/sources/skins/dhtmlxscheduler_flat.css
index c2b8ee3..f9504a7 100644
--- a/codebase/sources/skins/dhtmlxscheduler_flat.css
+++ b/codebase/sources/skins/dhtmlxscheduler_flat.css
@@ -1,5 +1,5 @@
/*
-dhtmlxScheduler v.4.1.0 Stardard
+dhtmlxScheduler v.4.2.0 Stardard
This software is covered by GPL license. You also can obtain Commercial or Enterprise license to use it in non-GPL project - please contact sales@dhtmlx.com. Usage without proper license is prohibited.
@@ -219,11 +219,6 @@ div.dhx_modal_cover {
border-width: 0 1px 1px 1px;
padding: 5px;
}
-.dhx_cal_event.dhx_cal_select_menu {
- -webkit-box-shadow: 0 0 1px #FFF;
- -moz-box-shadow: 0 0 1px #FFF;
- box-shadow: 0 0 1px #FFF;
-}
.dhx_resize_denied,
.dhx_resize_denied .dhx_event_resize {
cursor: default !important;
@@ -1196,13 +1191,24 @@ div.icon_delete {
.dhx_cal_navline div,
.dhx_cal_header,
.dhx_cal_header div,
+.dhx_cal_data,
.dhx_cal_data div,
-.dhx_cal_light,
-.dhx_cal_light div {
+.dhx_cal_data table *,
+.dhx_multi_day,
+.dhx_multi_day div,
+.dhx_tooltip_line div,
+.dhx_cal_quick_info,
+.dhx_cal_quick_info div {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
+.dhx_cal_event div {
+ line-height: normal;
+}
+.dhx_cal_data table {
+ border-collapse: separate;
+}
.dhx_cal_light .dhx_cal_radio label {
margin-bottom: 0;
}
@@ -1462,7 +1468,6 @@ div.icon_delete {
.dhx_form_repeat {
overflow: hidden;
/*height:115px;*/
- height: 0px;
background-color: #FFF4B5;
/*border: 1px solid #DCC43E;*/
}
@@ -1470,31 +1475,35 @@ div.icon_delete {
background-color: transparent;
}
.dhx_repeat_center,
-.dhx_repeat_left {
+.dhx_repeat_left,
+.dhx_repeat_divider,
+.dhx_repeat_right {
height: 115px;
- padding: 10px 0 10px 10px;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+.dhx_repeat_center,
+.dhx_repeat_left {
+ padding: 10px 0 0px 10px;
float: left;
}
.dhx_repeat_left {
- width: 95px;
+ width: 105px;
}
.dhx_repeat_center {
- width: 335px;
- margin-top: 12px;
+ width: 345px;
+ padding-top: 22px;
}
.dhx_repeat_divider {
float: left;
- height: 115px;
border-left: 1px dotted #DCC43E;
/*background-color: #DCC43E;*/
width: 1px;
}
.dhx_repeat_right {
float: right;
- height: 115px;
- width: 160px;
- padding: 10px 3px 10px 10px;
- margin-top: 7px;
+ width: 173px;
+ padding: 17px 3px 0px 10px;
}
input.dhx_repeat_text {
height: 16px;
@@ -1603,11 +1612,16 @@ input.dhx_repeat_checkbox {
border-color: transparent;
color: white;
}
-.dhx_cal_event .dhx_body,
-.dhx_cal_event.dhx_cal_select_menu .dhx_body {
- border-bottom: 1px solid white;
- border-bottom-left-radius: 2px;
- border-bottom-right-radius: 2px;
+.dhx_cal_event_line,
+.dhx_cal_event {
+ -webkit-box-shadow: 0 0 1px #FFF;
+ -moz-box-shadow: 0 0 1px #FFF;
+ box-shadow: 0 0 1px #FFF;
+}
+.dhx_cal_event.dhx_cal_editor {
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
}
.dhx_cal_event.dhx_cal_editor {
border: 1px solid transparent;
@@ -1821,11 +1835,14 @@ div.dhx_menu_icon {
/* navigation end */
/* month view start */
.dhx_month_head,
+.dhx_month_body {
+ background-color: white;
+}
.dhx_after .dhx_month_head,
.dhx_before .dhx_month_head,
.dhx_after .dhx_month_body,
.dhx_before .dhx_month_body {
- background-color: white;
+ background-color: #F7F7F7;
}
.dhx_month_head {
height: 21px;
@@ -1876,7 +1893,7 @@ div.dhx_menu_icon {
.dhx_cal_light_wide .dhx_cal_lsection .dhx_fullday,
.dhx_cal_lsection .dhx_fullday,
.dhx_cal_light input {
- color: #747473;
+ color: #444;
font-family: "Segoe UI", Arial;
}
.dhx_cal_light_wide .dhx_wrap_section {
@@ -1922,7 +1939,7 @@ div.dhx_menu_icon {
margin: 12px 0 0 0;
padding: 0;
font-size: 13px;
- color: #454544;
+ color: #444;
font-weight: normal;
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
@@ -1944,8 +1961,8 @@ div.dhx_menu_icon {
color: #FFF;
}
.dhx_delete_btn_set {
- border: 1px solid #A4A4A4;
- color: #747473;
+ border: 1px solid #888;
+ color: #444;
}
.dhx_cal_ltitle {
height: 30px;
@@ -2008,27 +2025,29 @@ div.dhx_menu_icon {
color: #444;
background: white;
box-shadow: none;
- border: none;
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
border-radius: 0px;
}
-.dhtmlx_popup_button.dhtmlx_ok_button {
- border: none;
- background-color: #5B9BE0;
+.dhtmlx_popup_button {
+ border: 1px solid #888;
}
-.dhtmlx_popup_button.dhtmlx_ok_button div {
- background: #5B9BE0;
+.dhtmlx_popup_button div {
border: none;
+}
+.dhtmlx_popup_button.dhtmlx_ok_button {
+ border-color: #5B9BE0;
+ background-color: #5B9BE0;
color: #FFF;
}
.dhtmlx_popup_button.dhtmlx_cancel_button {
- border: none;
+ border-color: #FE7510;
background-color: #FE7510;
+ color: #FFF;
}
+.dhtmlx_popup_button.dhtmlx_ok_button div,
.dhtmlx_popup_button.dhtmlx_cancel_button div {
- background: #FE7510;
- border: none;
+ background: transparent;
color: #FFF;
}
/* mobdal box end */
@@ -2097,9 +2116,6 @@ div.dhx_menu_icon {
.dhx_matrix_scell {
font-size: 13px;
}
-.dhx_matrix_scell.folder {
- border-right: 0;
-}
.dhx_second_scale_bar {
border-bottom: 1px solid #CECECE;
}
@@ -2110,8 +2126,9 @@ div.dhx_menu_icon {
}
.dhx_custom_button {
background-color: white;
- border: 1px solid #CECECE;
- color: #747473;
+ border: 1px solid #a4a4a4;
+ border-radius: 0;
+ color: #444;
}
.dhx_cal_light_wide .dhx_custom_button {
margin-top: 6px;
@@ -2119,6 +2136,9 @@ div.dhx_menu_icon {
.dhx_custom_button_recurring {
background-image: url(imgs_flat/but_repeat.gif);
}
+input.dhx_repeat_date {
+ border-color: #a8a8a8;
+}
.dhx_form_repeat {
background-color: transparent;
}
@@ -2128,14 +2148,25 @@ div.dhx_menu_icon {
.dhx_agenda_line div {
border-right: 1px solid #CECECE;
}
-.dhx_cal_header .dhx_agenda_line {
- height: 100%;
- line-height: 35px;
-}
+.dhx_cal_header .dhx_agenda_line,
.dhx_cal_header .dhx_agenda_line div {
height: 100%;
line-height: 35px;
}
+.dhx_scheduler_agenda .dhx_cal_data,
+.dhx_agenda_area {
+ background-image: url(imgs_flat/agenda_bg.gif);
+}
+.dhx_agenda_line {
+ height: 26px;
+}
+.dhx_agenda_line div,
+.dhx_agenda_line span {
+ line-height: 26px;
+}
+.dhx_agenda_line .dhx_event_icon {
+ background-position: 5px 6px;
+}
/* agenda end */
/* year */
.dhx_year_month {
@@ -2178,6 +2209,9 @@ div.dhx_menu_icon {
.dhx_map_line .headline_date {
border-right: 1px solid #CECECE;
}
+.dhx_map_line.highlight {
+ background-color: #b3daff;
+}
.dhx_cal_header .dhx_map_line {
height: 100%;
}
@@ -2186,6 +2220,28 @@ div.dhx_menu_icon {
height: 100%;
line-height: 35px;
}
+.dhx_map_area {
+ background-image: url(imgs_flat/agenda_bg.gif);
+}
+.dhx_map_line {
+ height: 26px;
+}
+.dhx_map_line div,
+.dhx_map_line .line_description,
+.dhx_map_line .line_description {
+ line-height: 26px;
+ height: 26px;
+}
+.dhx_map_line .dhx_event_icon {
+ background-position: 5px 6px;
+}
+.dhx_cal_header div.dhx_map_line,
+.dhx_cal_data div.dhx_map_area {
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+ border-right: 1px solid #cecece;
+}
/* map view end */
/* tooltip start */
.dhtmlXTooltip.tooltip {
@@ -2237,6 +2293,10 @@ div.dhx_menu_icon {
height: 100%;
line-height: 35px;
}
+.dhx_cal_header .dhx_grid_line div.dhx_grid_view_sort {
+ height: 10px;
+ top: 12px;
+}
/* grid view end*/
/* left border support */
.dhx_scale_hour_border,
diff --git a/codebase/sources/skins/dhtmlxscheduler_glossy.css b/codebase/sources/skins/dhtmlxscheduler_glossy.css
index 1bd718c..fc3484c 100644
--- a/codebase/sources/skins/dhtmlxscheduler_glossy.css
+++ b/codebase/sources/skins/dhtmlxscheduler_glossy.css
@@ -1,5 +1,5 @@
/*
-dhtmlxScheduler v.4.1.0 Stardard
+dhtmlxScheduler v.4.2.0 Stardard
This software is covered by GPL license. You also can obtain Commercial or Enterprise license to use it in non-GPL project - please contact sales@dhtmlx.com. Usage without proper license is prohibited.
@@ -219,11 +219,6 @@ div.dhx_modal_cover {
border-width: 0 1px 1px 1px;
padding: 5px;
}
-.dhx_cal_event.dhx_cal_select_menu {
- -webkit-box-shadow: 0 0 1px #FFF;
- -moz-box-shadow: 0 0 1px #FFF;
- box-shadow: 0 0 1px #FFF;
-}
.dhx_resize_denied,
.dhx_resize_denied .dhx_event_resize {
cursor: default !important;
@@ -1196,13 +1191,24 @@ div.icon_delete {
.dhx_cal_navline div,
.dhx_cal_header,
.dhx_cal_header div,
+.dhx_cal_data,
.dhx_cal_data div,
-.dhx_cal_light,
-.dhx_cal_light div {
+.dhx_cal_data table *,
+.dhx_multi_day,
+.dhx_multi_day div,
+.dhx_tooltip_line div,
+.dhx_cal_quick_info,
+.dhx_cal_quick_info div {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}
+.dhx_cal_event div {
+ line-height: normal;
+}
+.dhx_cal_data table {
+ border-collapse: separate;
+}
.dhx_cal_light .dhx_cal_radio label {
margin-bottom: 0;
}
@@ -1462,7 +1468,6 @@ div.icon_delete {
.dhx_form_repeat {
overflow: hidden;
/*height:115px;*/
- height: 0px;
background-color: #FFF4B5;
/*border: 1px solid #DCC43E;*/
}
@@ -1470,31 +1475,35 @@ div.icon_delete {
background-color: transparent;
}
.dhx_repeat_center,
-.dhx_repeat_left {
+.dhx_repeat_left,
+.dhx_repeat_divider,
+.dhx_repeat_right {
height: 115px;
- padding: 10px 0 10px 10px;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
+.dhx_repeat_center,
+.dhx_repeat_left {
+ padding: 10px 0 0px 10px;
float: left;
}
.dhx_repeat_left {
- width: 95px;
+ width: 105px;
}
.dhx_repeat_center {
- width: 335px;
- margin-top: 12px;
+ width: 345px;
+ padding-top: 22px;
}
.dhx_repeat_divider {
float: left;
- height: 115px;
border-left: 1px dotted #DCC43E;
/*background-color: #DCC43E;*/
width: 1px;
}
.dhx_repeat_right {
float: right;
- height: 115px;
- width: 160px;
- padding: 10px 3px 10px 10px;
- margin-top: 7px;
+ width: 173px;
+ padding: 17px 3px 0px 10px;
}
input.dhx_repeat_text {
height: 16px;