summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-09-04 09:52:38 +0000
committerPhil Hughes <me@iamphill.com>2017-09-04 09:52:38 +0000
commitc03f7825a2ec8fd1d966d65fc664a55ae59916cc (patch)
tree83ee34c1f390a84aa34bec56e284c03b52ce734e
parent09fc850541ac4c4c176d44b7ad088250218f3b05 (diff)
parenteb4c3f41c03ddeb4634b61ced3ce09291aa428ea (diff)
downloadgitlab-ce-c03f7825a2ec8fd1d966d65fc664a55ae59916cc.tar.gz
Merge branch 'winh-pikaday-dropdowns' into 'master'
Make Pikaday dropdowns style consistent See merge request !13426
-rw-r--r--app/assets/stylesheets/framework/calendar.scss4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/calendar.scss b/app/assets/stylesheets/framework/calendar.scss
index 4ce767e4cc4..c165ec0b94b 100644
--- a/app/assets/stylesheets/framework/calendar.scss
+++ b/app/assets/stylesheets/framework/calendar.scss
@@ -95,8 +95,8 @@
.is-selected .pika-day,
.pika-day:hover,
.is-today .pika-day {
- background: $gl-primary;
- color: $white-light;
+ background: $gray-darker;
+ color: $gl-text-color;
box-shadow: none;
}
}