fixed issue with filter()

2 files changed, 28 insertions, 0 deletions

diff --git a/css/contacts.scss b/css/contacts.scss
index 8c5f9ba6..bd4e57f0 100644
--- a/css/contacts.scss
+++ b/css/contacts.scss
@@ -15,6 +15,7 @@ $grid-input-height-with-margin: #{$grid-height-unit - $grid-input-margin * 2};
 }
 
 
+@import 'settings';
 @import 'settings-section';
 @import 'settings/settings-addressbook';
 @import 'settings/settings-addressbook-shares';
diff --git a/css/contacts.scss.orig b/css/contacts.scss.orig
new file mode 100644
index 00000000..2e0f4e71
--- /dev/null
+++ b/css/contacts.scss.orig
@@ -0,0 +1,27 @@
+$grid-height-unit: 40px;
+$grid-input-padding: 7px;
+$grid-input-margin: 3px;
+$grid-column-width: 380px;
+$grid-input-height-with-margin: #{$grid-height-unit - $grid-input-margin * 2};
+
+@mixin generate-grid-span($default-unit) {
+	// we only supports 10 props of the same type
+	@for $i from 1 through 10 {
+		&.grid-span-#{$i} {
+			// default unit + title + bottom padding
+			grid-row-start: span #{$i * $default-unit};
+		}
+	}
+}
+
+<<<<<<< HEAD
+
+=======
+>>>>>>> fixed issue with filter()
+@import 'settings-section';
+@import 'settings/settings-addressbook';
+@import 'settings/settings-addressbook-shares';
+@import 'settings/settings-addressbook-sharee';
+@import 'ContactDetails';
+@import './Properties/Properties';
+@import './Properties/PropertyTitle';