diff --git a/styleguide/src/system/components/data-display/Avatar/style.scss b/styleguide/src/system/components/data-display/Avatar/style.scss index a4019a5f2..d6932d85e 100644 --- a/styleguide/src/system/components/data-display/Avatar/style.scss +++ b/styleguide/src/system/components/data-display/Avatar/style.scss @@ -19,7 +19,7 @@ height: 100%; top: 0px; left: 0px; - box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 0 0 1px rgba($color-neutral-0, .1); border-radius: 50%; } diff --git a/styleguide/src/system/components/data-display/Table/Table.vue b/styleguide/src/system/components/data-display/Table/Table.vue index ddc204677..3d21532de 100644 --- a/styleguide/src/system/components/data-display/Table/Table.vue +++ b/styleguide/src/system/components/data-display/Table/Table.vue @@ -5,7 +5,11 @@ + class="ds-table" + :class="[ + condensed && 'ds-table-condensed', + bordered && 'ds-table-bordered' + ]"> + :key="row.key || index"> @@ -75,6 +79,20 @@ export default { default() { return null } + }, + /** + * Should the table be more condense? + */ + condensed: { + type: Boolean, + default: false + }, + /** + * Should the table have borders? + */ + bordered: { + type: Boolean, + default: true } }, computed: { diff --git a/styleguide/src/system/components/data-display/Table/style.scss b/styleguide/src/system/components/data-display/Table/style.scss index bdebc8d23..7d59a6e9d 100644 --- a/styleguide/src/system/components/data-display/Table/style.scss +++ b/styleguide/src/system/components/data-display/Table/style.scss @@ -11,19 +11,34 @@ .ds-table-col { @include reset; - border-bottom: $border-color-softer solid $border-size-base; vertical-align: top; padding: $space-small $space-xx-small; - - &:last-child { - padding-right: 0; - } } .ds-table-head-col { @include reset; - border-bottom: $border-color-softer solid $border-size-base; padding: $space-small $space-xx-small; text-align: left; font-weight: $font-weight-bold; -} \ No newline at end of file +} + +// bordered +.ds-table-bordered { + .ds-table-col, + .ds-table-head-col { + border-bottom: $border-color-softer dotted $border-size-base; + } + + tr:last-child .ds-table-col { + border-bottom: none; + } +} + +// condensed +.ds-table-condensed { + .ds-table-col, + .ds-table-head-col { + padding-top: $space-x-small; + padding-bottom: $space-x-small; + } +} diff --git a/styleguide/src/system/components/data-input/FormItem/FormItem.vue b/styleguide/src/system/components/data-input/FormItem/FormItem.vue old mode 100644 new mode 100755 index 235a3dc46..44ffc1813 --- a/styleguide/src/system/components/data-input/FormItem/FormItem.vue +++ b/styleguide/src/system/components/data-input/FormItem/FormItem.vue @@ -1,10 +1,9 @@