diff options
| author | Mirta <mirta@twine-s.com> | 2020-08-26 15:29:41 +0300 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2020-08-26 15:29:41 +0300 |
| commit | 5b62ede4ce233b17205b54281130d19f846535b7 (patch) | |
| tree | 60ea44080389075e58276ae86ceb90ddb9a1f57e /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common | |
| parent | 3b59a9e2207d7eb10900ecce478688f55bb44d93 (diff) | |
| parent | e4df56a8e019cafbea89e3bdb93c1b4199c75258 (diff) | |
| download | Tango-5b62ede4ce233b17205b54281130d19f846535b7.tar.gz Tango-5b62ede4ce233b17205b54281130d19f846535b7.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml index 007712d87..ffa5a229b 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Resources/MaterialDesign.xaml @@ -1002,7 +1002,7 @@ <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true"> <DockPanel> <CheckBox x:Name="SelectAllCheckBox" DockPanel.Dock="Top" VerticalAlignment="Center" IsChecked="{Binding AllSelected, Mode=TwoWay,RelativeSource={RelativeSource AncestorType=controls:AllSelectedCheckboxList}}" Margin="5"> - <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" Text="SelectAll"></TextBlock> + <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" Text="SelectAll" FontSize="{TemplateBinding FontSize}" FontFamily="{TemplateBinding FontFamily}"></TextBlock> </CheckBox> <ScrollViewer DockPanel.Dock="Bottom" Focusable="false" Padding="{TemplateBinding Padding}"> <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/> |