refactor(datepicker): remove primary border (#1466)

akveo · May 27, 2019 · f722a48 · f722a48
1 parent 284c031
commit f722a48
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/framework/theme/components/datepicker/_datepicker-container.component.theme.scss b/src/framework/theme/components/datepicker/_datepicker-container.component.theme.scss
@@ -9,7 +9,9 @@
     $arrow-size: nb-theme(datepicker-arrow-size);
     $arrow-content-size: calc(#{$arrow-size} - 2px);
 
-    border: 2px solid nb-theme(datepicker-border-color);
+    border-color: nb-theme(datepicker-border-color);
+    border-style: nb-theme(datepicker-border-style);
+    border-width: nb-theme(datepicker-border-width);
     border-radius: nb-theme(datepicker-border-radius);
     background: nb-theme(datepicker-background-color);
     box-shadow: nb-theme(datepicker-shadow);
@@ -18,6 +20,10 @@
       color: nb-theme(datepicker-text-color);
     }
 
+    nb-card {
+      box-shadow: none;
+    }
+
     .arrow {
       border-left: $arrow-size solid transparent;
       border-right: $arrow-size solid transparent;

diff --git a/src/framework/theme/components/datepicker/datepicker.directive.ts b/src/framework/theme/components/datepicker/datepicker.directive.ts
@@ -234,12 +234,14 @@ export const NB_DATE_SERVICE_OPTIONS = new InjectionToken('Date service options'
  *
  * @styles
  *
- * datepicker-fg
- * datepicker-bg
- * datepicker-border
- * datepicker-border-radius
- * datepicker-shadow
- * datepicker-arrow-size
+ * datepicker-text-color:
+ * datepicker-background-color:
+ * datepicker-border-color:
+ * datepicker-border-style:
+ * datepicker-border-width:
+ * datepicker-border-radius:
+ * datepicker-shadow:
+ * datepicker-arrow-size:
  * */
 @Directive({
   selector: 'input[nbDatepicker]',

diff --git a/src/framework/theme/styles/themes/_default.scss b/src/framework/theme/styles/themes/_default.scss
@@ -1850,7 +1850,9 @@ $theme: (
 
   datepicker-text-color: text-color,
   datepicker-background-color: background-primary-color-1,
-  datepicker-border-color: color-primary-500,
+  datepicker-border-color: background-primary-color-1,
+  datepicker-border-style: solid,
+  datepicker-border-width: 0,
   datepicker-border-radius: 0.75rem,
   datepicker-shadow: shadow,
   datepicker-arrow-size: 0.6875rem,