Fixed: Added theme attribute 'divider-thickness' to wrong class when doing manual merge.

This commit is contained in:
Martin Carlberg
2013-08-20 11:22:39 +02:00
parent 7044c1cda4
commit 48d98f7ebd
+2 -2
View File
@@ -53,8 +53,7 @@
@"text-color": [CPNull null],
@"font": [CPNull null],
@"text-shadow-color": [CPNull null],
@"text-shadow-offset": CGSizeMakeZero(),
@"divider-thickness": 1.0
@"text-shadow-offset": CGSizeMakeZero()
};
}
@@ -252,6 +251,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
return @{
@"background-color": [CPNull null],
@"divider-color": [CPColor grayColor],
@"divider-thickness": 1.0
};
}