wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Redesign jQuery UI datepicker

Browse source 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
This commit is contained in:
Marin Treselj 2017-07-13 15:15:29 +02:00 committed by Roeland Jago Douma
parent 46332b0d8e
commit 586eb3ed0a
No known key found for this signature in database
GPG key ID: F941078878347C0C
6 changed files with 87 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/css/apps.scss
View file

@ -595,7 +595,8 @@ kbd {
.bubble,
.app-navigation-entry-menu,
.popovermenu {
.popovermenu,
.ui-datepicker {
position: absolute;
background-color: $color-main-background;
color: nc-lighten($color-main-text, 20%);

5
core/css/inputs.scss
View file

@ -492,8 +492,9 @@ input {
}
.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {
border: none;
background: nc-darken($color-main-background, 3%);
border: 1px solid transparent;
background: inherit;
color: $color-primary;
}
/* Animation */

79
core/css/styles.scss
View file

@ -964,6 +964,85 @@ code {
background-image: url('../img/actions/play-previous.svg?v=1');
}
/* ---- jQuery UI datepicker ---- */
.ui-widget.ui-datepicker {
margin-left: -110px !important;
margin-top: 10px;
border-radius: 3px;
.ui-state-default,
.ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default {
border: 1px solid transparent;
background: inherit;
}
.ui-state-hover,
.ui-state-focus {
background: inherit;
color: $color-primary;
}
.ui-widget-header {
margin: 3px 3px 3px 0;
padding: 7px 6px;
font-size: 13px;
border: none; // 1px solid #dbdbdb;
border-radius: 3px;
background-color: $color-main-background;
color: $color-main-text;
.ui-datepicker-title {
line-height: 1;
}
.ui-icon {
opacity: .5;
}
.ui-state-hover .ui-icon {
opacity: 1;
}
.ui-icon.ui-icon-circle-triangle-e {
background: url("../img/actions/arrow-right.svg") center center no-repeat;
}
.ui-icon.ui-icon-circle-triangle-w {
background: url("../img/actions/arrow-left.svg") center center no-repeat;
}
}
.ui-datepicker-calendar {
th.ui-datepicker-week-end {
color: $color-primary;
}
td {
padding: 0;
a {
border-radius: 3px;
text-align: center;
}
&.ui-datepicker-week-end a {
color: $color-primary;
}
&.ui-datepicker-today a {
background-color: nc-lighten($color-main-text, 86%);
}
&.ui-datepicker-current-day .ui-state-active {
background-color: $color-primary;
color: $color-primary-text;
}
}
}
}
.ui-datepicker-prev, .ui-datepicker-next {
border: nc-lighten($color-main-text, 86%);
background: $color-main-background;

1
core/img/actions/arrow-left.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16"><path d="m5.5 8 6 6v1l-7-7 7-7v1z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 140 B

1
core/img/actions/arrow-right.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16"><path d="m10.5 8-6-6v-1l7 7-7 7v-1z"/></svg>
Side by side

After

Width:  |  Height:  |  Size: 142 B

2
lib/private/legacy/template.php
View file

@ -108,9 +108,9 @@ class OC_Template extends \OC\Template\Base {
}
}
OC_Util::addStyle('server', null, true);
OC_Util::addStyle('jquery-ui-fixes',null,true);
OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui',null,true);
OC_Util::addStyle('server', null, true);
OC_Util::addVendorStyle('select2/select2', null, true);
OC_Util::addStyle('jquery.ocdialog');
OC_Util::addTranslations("core", null, true);