diff options
author | Jessica <jessica@Absolventas-MacBook-Pro.local> | 2018-08-29 14:57:37 +0200 |
---|---|---|
committer | Jessica <jessica@Absolventas-MacBook-Pro.local> | 2018-08-29 14:57:37 +0200 |
commit | 025edcf0397944d4b4c902597a0864c8ea7fbfaa (patch) | |
tree | 2aae1b9b7b500207a9db665b99d8087601e37e0a /css | |
parent | 7fc9ac52cf9807fc1a54316c313ecd6580c73056 (diff) | |
parent | 8850e9a3aeb637210cd4461e12b0dadc55d48857 (diff) |
merged master vue branch to this branch
Diffstat (limited to 'css')
-rw-r--r-- | css/ContactDetails.scss (renamed from css/details.scss) | 1 | ||||
-rw-r--r-- | css/Properties/Properties.scss | 4 | ||||
-rw-r--r-- | css/contacts.scss | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/css/details.scss b/css/ContactDetails.scss index c8c8a31e..78c453a3 100644 --- a/css/details.scss +++ b/css/ContactDetails.scss @@ -121,5 +121,6 @@ /* unquote is a strange hack to avoid removal of the comma by the scss compiler */ grid-template-columns: repeat(auto-fit, minmax(unquote('#{$grid-column-width}'), 1fr)); grid-column-gap: 20px; + padding: 0 20px; } }
\ No newline at end of file diff --git a/css/Properties/Properties.scss b/css/Properties/Properties.scss index 30369a80..d7f76afa 100644 --- a/css/Properties/Properties.scss +++ b/css/Properties/Properties.scss @@ -31,6 +31,10 @@ &--last { margin-bottom: $grid-height-unit; } + // no delete icon on addressbook selector + &--addressbooks .icon-delete { + display: none; + } &__delete { position: absolute; diff --git a/css/contacts.scss b/css/contacts.scss index 26f348dc..d7141cb7 100644 --- a/css/contacts.scss +++ b/css/contacts.scss @@ -14,10 +14,12 @@ $grid-input-height-with-margin: #{$grid-height-unit - $grid-input-margin * 2}; } } + @import 'settings-section'; @import 'settings/settings-addressbook'; @import 'settings/settings-addressbook-shares'; @import 'settings/settings-addressbook-sharee'; @import 'details'; +@import 'ContactDetails'; @import './Properties/Properties'; -@import './Properties/PropertyTitle';
\ No newline at end of file +@import './Properties/PropertyTitle'; |