summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Ambas <jon@jonambas.com>2017-08-16 10:00:12 -0400
committerJon Ambas <jon@jonambas.com>2017-08-16 10:00:12 -0400
commit7d0750f5a6d092f8bd08f338a184beab6f0c46ee (patch)
tree0ec0f3d030917fe5912f5156c7990bc7b39fc7c7
parentf32b1f5ef98d5ec7d35af70b5f1ff90a3fab68ae (diff)
downloadmatchbox-7d0750f5a6d092f8bd08f338a184beab6f0c46ee.zip
matchbox-7d0750f5a6d092f8bd08f338a184beab6f0c46ee.tar.gz
matchbox-7d0750f5a6d092f8bd08f338a184beab6f0c46ee.tar.bz2
Fix styles around datepickers inside popovers
-rw-r--r--src/components/Connect/Connect.module.scss2
-rw-r--r--src/components/Datepicker/Datepicker.module.scss12
-rw-r--r--src/components/Popover/Popover.module.scss2
3 files changed, 9 insertions, 7 deletions
diff --git a/src/components/Connect/Connect.module.scss b/src/components/Connect/Connect.module.scss
index 3e1a655..5249064 100644
--- a/src/components/Connect/Connect.module.scss
+++ b/src/components/Connect/Connect.module.scss
@@ -5,7 +5,7 @@
}
.Primary {
- flex: 1 0 auto;
+ flex: 1 0;
*:focus {
position: relative;
z-index: 1;
diff --git a/src/components/Datepicker/Datepicker.module.scss b/src/components/Datepicker/Datepicker.module.scss
index 95e2464..d8ccc21 100644
--- a/src/components/Datepicker/Datepicker.module.scss
+++ b/src/components/Datepicker/Datepicker.module.scss
@@ -74,13 +74,13 @@
flex: 0 0 auto;
flex-grow: 1;
flex-basis: 0;
- min-width: rem(42);
+ min-width: rem(24);
- padding: rem(6) rem(14);
+ padding: rem(3) rem(7);
margin-bottom: -1px;
margin-right: -1px;
- border: 1px solid color(gray, 8);
+ border: 1px solid color(gray, 9);
font-size: rem(12);
font-weight: 400;
text-align: center;
@@ -119,9 +119,11 @@
.outside {
color: color(gray, 8);
pointer-events: none;
+
&.selected {
- background: transparent;
- border: 1px solid color(gray, 8);
+ background: rgba(color(blue), 0.12) !important;
+ color: color(gray, 7) !important;
+ border: 1px solid rgba(color(blue), 0.15);
}
}
diff --git a/src/components/Popover/Popover.module.scss b/src/components/Popover/Popover.module.scss
index 87227c7..5409ef7 100644
--- a/src/components/Popover/Popover.module.scss
+++ b/src/components/Popover/Popover.module.scss
@@ -48,7 +48,7 @@
.Content {
position: relative;
z-index: 1;
- padding: 1px;
+ padding: 2px;
border-radius: border-radius(large);
overflow: hidden;
}