From e638928a11a467b31df085a94e5f7b07bbadcf1c Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 22 Mar 2016 16:39:52 +0000 Subject: [PATCH] Change datepicker icons --- calendar/templates/pixelegg/app.css | 33 +++++++++++++++++++++++++--- calendar/templates/pixelegg/app.less | 33 ++++++++++++++++++++++++++-- pixelegg/css/mobile.css | 24 ++++++++++++++++++-- pixelegg/css/pixelegg.css | 22 ++++++++++++++++++- pixelegg/less/etemplate2.less | 24 +++++++++++++++++++- pixelegg/mobile/fw_mobile.css | 24 ++++++++++++++++++-- 6 files changed, 149 insertions(+), 11 deletions(-) diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index 01343e92b6..263354085a 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -11,7 +11,7 @@ * @package calendar * @version $Id$ */ -/* $Id: app.css 55127 2016-02-23 22:23:01Z nathangray $ */ +/* $Id: app.css 55492 2016-03-22 15:09:39Z nathangray $ */ /*Media print classes*/ @media print { .th td, @@ -2483,15 +2483,42 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { padding-right: 5px !important; } #calendar-sidebox_date .ui-datepicker-header a span { - background-image: url('../../../phpgwapi/js/jquery/jquery-ui/redmond/images/ui-icons_217bc0_256x240.png'); + width: 20px; + height: 20px; } #calendar-sidebox_date .ui-datepicker-header a.ui-state-hover { top: 3px; } #calendar-sidebox_date .ui-datepicker-header a.ui-state-hover span { - background-image: url('../../../pixelegg/images/ui-icons_egw_color_2_256x240_0C5DA5.png'); transition: none; } +#calendar-sidebox_header_go { + width: 20px; + height: 20px; + background-image: url('../../../pixelegg/images/check.png'); + text-indent: 140%; + border: none; + border-radius: 0px; + background-size: contain; + background-color: transparent; +} +#calendar-sidebox_header_go:hover { + background-color: transparent; +} +#calendar-sidebox_header_today { + width: 20px; + height: 20px; + background-image: url('../../../pixelegg/images/bullet.png'); + text-indent: 140%; + border: none; + border-radius: 0px; + margin-left: 7px; + background-size: contain; + background-color: transparent; +} +#calendar-sidebox_header_today:hover { + background-color: transparent; +} #calendar_cat_id, #calendar_filter, #uical_select_owner, diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less index fb97107da5..f18ed3f2ee 100755 --- a/calendar/templates/pixelegg/app.less +++ b/calendar/templates/pixelegg/app.less @@ -1266,16 +1266,45 @@ div#calendar-container { padding-right: 5px !important; } .ui-datepicker-header a span { - background-image: url('../../../phpgwapi/js/jquery/jquery-ui/redmond/images/ui-icons_217bc0_256x240.png') + width: 20px; + height: 20px; } .ui-datepicker-header a.ui-state-hover { top: 3px; span { - background-image: url('../../../pixelegg/images/ui-icons_egw_color_2_256x240_0C5DA5.png'); transition: none; } } } +#calendar-sidebox_header_go { + width: 20px; + height: 20px; + + background-image: url('../../../pixelegg/images/check.png'); + text-indent: 140%; + border: none; + border-radius: 0px; + background-size: contain; + background-color: transparent; + &:hover { + background-color: transparent; + } +} +#calendar-sidebox_header_today { + width: 20px; + height: 20px; + + background-image: url('../../../pixelegg/images/bullet.png'); + text-indent: 140%; + border: none; + border-radius: 0px; + margin-left: 7px; + background-size: contain; + background-color: transparent; + &:hover { + background-color: transparent; + } +} // Select Fields in Sidemenu #calendar_cat_id, diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index c2e7c8ba23..19a1cce0ae 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -221,7 +221,27 @@ color: #ffffff; } .ui-datepicker .ui-datepicker-buttonpane button[data-handler="today"] { - background-image: url(../images/today.png); + background-image: url(../images/bullet.svg); + background-color: transparent; + background-size: contain; + border: none; + } + .ui-datepicker .ui-datepicker-prev:hover, + .ui-datepicker .ui-datepicker-next:hover { + border: none; + } + .ui-datepicker .ui-datepicker-prev span { + background-image: url(../images/back.png) !important; + background-position: 0px 0px !important; + background-size: contain; + } + .ui-datepicker .ui-datepicker-next span { + background-image: url(../images/forward.png) !important; + background-position: 0px 0px !important; + background-size: contain; + } + .ui-datepicker .ui-datepicker-next span:hover { + border: none; } .et2_file .progress li:hover div.remove { width: 16px; @@ -792,7 +812,7 @@ text-align: left; position: relative; right: 1px; - top: 3px; + top: 1px; } .et2_dropdown button.ui-corner-left:active, .et2_dropdown button.ui-state-default:active { diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index 3b2e6da198..41d48d2470 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -210,7 +210,27 @@ color: #ffffff; } .ui-datepicker .ui-datepicker-buttonpane button[data-handler="today"] { - background-image: url(../images/today.png); + background-image: url(../images/bullet.svg); + background-color: transparent; + background-size: contain; + border: none; + } + .ui-datepicker .ui-datepicker-prev:hover, + .ui-datepicker .ui-datepicker-next:hover { + border: none; + } + .ui-datepicker .ui-datepicker-prev span { + background-image: url(../images/back.png) !important; + background-position: 0px 0px !important; + background-size: contain; + } + .ui-datepicker .ui-datepicker-next span { + background-image: url(../images/forward.png) !important; + background-position: 0px 0px !important; + background-size: contain; + } + .ui-datepicker .ui-datepicker-next span:hover { + border: none; } .et2_file .progress li:hover div.remove { width: 16px; diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index 72c061b50c..e87a9455bc 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -168,7 +168,29 @@ span.et2_date span { } .ui-datepicker .ui-datepicker-buttonpane button[data-handler="today"] { - background-image: url(../images/today.png); + background-image: url(../images/bullet.svg); + background-color: transparent; + background-size: contain; + border: none; +} +.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { + &:hover{ + border: none; + } +} +.ui-datepicker .ui-datepicker-prev span { + background-image: url(../images/back.png) !important; + background-position: 0px 0px !important; + background-size: contain; +} +.ui-datepicker .ui-datepicker-next span { + background-image: url(../images/forward.png) !important; + background-position: 0px 0px !important; + background-size: contain; + + &:hover { + border: none; + } } .et2_file .progress li:hover div.remove { diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css index 85437a3d7a..3d519a1368 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -232,7 +232,27 @@ color: #ffffff; } .ui-datepicker .ui-datepicker-buttonpane button[data-handler="today"] { - background-image: url(../images/today.png); + background-image: url(../images/bullet.svg); + background-color: transparent; + background-size: contain; + border: none; + } + .ui-datepicker .ui-datepicker-prev:hover, + .ui-datepicker .ui-datepicker-next:hover { + border: none; + } + .ui-datepicker .ui-datepicker-prev span { + background-image: url(../images/back.png) !important; + background-position: 0px 0px !important; + background-size: contain; + } + .ui-datepicker .ui-datepicker-next span { + background-image: url(../images/forward.png) !important; + background-position: 0px 0px !important; + background-size: contain; + } + .ui-datepicker .ui-datepicker-next span:hover { + border: none; } .et2_file .progress li:hover div.remove { width: 16px; @@ -803,7 +823,7 @@ text-align: left; position: relative; right: 1px; - top: 3px; + top: 1px; } .et2_dropdown button.ui-corner-left:active, .et2_dropdown button.ui-state-default:active {