diff options
author | Phil Hughes <me@iamphill.com> | 2017-07-24 14:01:03 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-07-24 14:01:03 +0000 |
commit | c2c8d7ffabaeb6514f7bf15fb5330c8402d80333 (patch) | |
tree | cafd1a8ff124c6e39e83c1c2d88c5721c6b01181 | |
parent | 157e5d0c3a9e73bdd42f08785e7197853e8144a7 (diff) | |
parent | ff3d3ccb3ff00b7801c8a506453ca3f9d8ccf2ec (diff) | |
download | gitlab-ce-c2c8d7ffabaeb6514f7bf15fb5330c8402d80333.tar.gz |
Merge branch 'dz-fix-calendar-today' into 'master'
Fix today day highlight in calendar
Closes #32169
See merge request !13048
-rw-r--r-- | app/assets/stylesheets/framework/calendar.scss | 2 | ||||
-rw-r--r-- | changelogs/unreleased/dz-fix-calendar-today.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/calendar.scss b/app/assets/stylesheets/framework/calendar.scss index 759401a7806..0ac095f7d8f 100644 --- a/app/assets/stylesheets/framework/calendar.scss +++ b/app/assets/stylesheets/framework/calendar.scss @@ -93,7 +93,7 @@ .is-selected .pika-day, .pika-day:hover, - .is-today .pika-day:hover { + .is-today .pika-day { background: $gl-primary; color: $white-light; box-shadow: none; diff --git a/changelogs/unreleased/dz-fix-calendar-today.yml b/changelogs/unreleased/dz-fix-calendar-today.yml new file mode 100644 index 00000000000..5320d8b26b5 --- /dev/null +++ b/changelogs/unreleased/dz-fix-calendar-today.yml @@ -0,0 +1,4 @@ +--- +title: Fix today day highlight in calendar +merge_request: 13048 +author: |