Skip to content

Commit

Permalink
Fixes issues mentioned in comments.
Browse files Browse the repository at this point in the history
- [x] Highlight for selected date should be bold text.
- [x] Hover highlight for day should be the same as for the selected date.
- [x] Remove hover effect on the week.
- [x] Row for days of the week should indeed stay, but non-bold and at 50% opacity so it doesn't take away the focus.
- [x] Dates of previous and next months a bit lighter.
- [x] Remove marking the weekend blue.
- [x] The box centered below the date field, with triangle in the middle.

Signed-off-by: Marin Treselj <marin@pixelipo.com>
  • Loading branch information
pixelipo authored and rullzer committed Jul 23, 2017
1 parent 586eb3e commit 82a52a8
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 15 deletions.
3 changes: 2 additions & 1 deletion core/css/header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ nav {
margin-left: -54px;
}

#navigation {
#navigation,
.ui-datepicker {
position: relative;
left: -100%;

This comment has been minimized.

Copy link
@skjnldsv

skjnldsv Oct 26, 2017

Member

This now applies on all datepicker over nextcloud.
@pixelipo where you thinking at a specific use for this datepicker? Currently it's broken in various places (the sharing file to user popovermenu for ex)

capture d ecran_2017-10-26_18-08-51

This comment has been minimized.

Copy link
@pixelipo

pixelipo Oct 31, 2017

Author Contributor

@skjnldsv datepicker should be global (core). If there is a related bug please create and issue (I don't understand it from your screenshot) :)

width: 160px;
Expand Down
31 changes: 17 additions & 14 deletions core/css/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -966,9 +966,7 @@ code {

/* ---- 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,
Expand All @@ -977,12 +975,6 @@ code {
background: inherit;
}

.ui-state-hover,
.ui-state-focus {
background: inherit;
color: $color-primary;
}

.ui-widget-header {
margin: 3px 3px 3px 0;
padding: 7px 6px;
Expand Down Expand Up @@ -1014,8 +1006,13 @@ code {
}

.ui-datepicker-calendar {
th.ui-datepicker-week-end {
color: $color-primary;
th {
font-weight: normal;
color: nc-lighten($color-main-text, 33%);
}

tr:hover {
background-color: inherit;
}

td {
Expand All @@ -1024,19 +1021,25 @@ code {
a {
border-radius: 3px;
text-align: center;
font-weight: normal;
color: $color-main-text;
}

&.ui-datepicker-week-end a {
color: $color-primary;
&.ui-datepicker-week-end a:not(.ui-state-hover),
.ui-priority-secondary {
color: nc-lighten($color-main-text, 33%);
}

&.ui-datepicker-today a {
&.ui-datepicker-today a:not(.ui-state-hover) {
background-color: nc-lighten($color-main-text, 86%);
}

&.ui-datepicker-current-day .ui-state-active {
&.ui-datepicker-current-day .ui-state-active,
.ui-state-hover,
.ui-state-focus {
background-color: $color-primary;
color: $color-primary-text;
font-weight: bold;
}
}
}
Expand Down

0 comments on commit 82a52a8

Please sign in to comment.