mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-25 18:38:27 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix html labels colors issue (#1516) (#1603)

Browse source
This commit is contained in:
Federico Maccaroni 2021-10-25 16:28:14 -03:00 committed by GitHub
parent 99ccd62bcd
commit a07ef1a1d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/App/Pages/Generator/GeneratorHistoryPage.xaml
View file

@ -68,8 +68,7 @@
<controls:MonoLabel LineBreakMode="CharacterWrap" <controls:MonoLabel LineBreakMode="CharacterWrap"
Grid.Column="0" Grid.Column="0"
Grid.Row="0" Grid.Row="0"
StyleClass="list-title, list-title-platform" StyleClass="list-title, list-title-platform, text-html"
TextType="Html"
Text="{Binding Password, Mode=OneWay, Converter={StaticResource coloredPassword}}" /> Text="{Binding Password, Mode=OneWay, Converter={StaticResource coloredPassword}}" />
<Label LineBreakMode="TailTruncation" <Label LineBreakMode="TailTruncation"
Grid.Column="0" Grid.Column="0"

3
src/App/Pages/Generator/GeneratorPage.xaml
View file

@ -63,10 +63,9 @@
</Frame> </Frame>
</Grid> </Grid>
<controls:MonoLabel <controls:MonoLabel
StyleClass="text-lg, text-html"
Text="{Binding ColoredPassword, Mode=OneWay}" Text="{Binding ColoredPassword, Mode=OneWay}"
TextType="Html"
Margin="0, 20" Margin="0, 20"
StyleClass="text-lg"
HorizontalTextAlignment="Center" HorizontalTextAlignment="Center"
HorizontalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand"
LineBreakMode="CharacterWrap" /> LineBreakMode="CharacterWrap" />

3
src/App/Pages/Vault/PasswordHistoryPage.xaml
View file

@ -59,8 +59,7 @@
<controls:MonoLabel LineBreakMode="CharacterWrap" <controls:MonoLabel LineBreakMode="CharacterWrap"
Grid.Column="0" Grid.Column="0"
Grid.Row="0" Grid.Row="0"
StyleClass="list-title, list-title-platform" StyleClass="list-title, list-title-platform, text-html"
TextType="Html"
Text="{Binding Password, Mode=OneWay, Converter={StaticResource coloredPassword}}" /> Text="{Binding Password, Mode=OneWay, Converter={StaticResource coloredPassword}}" />
<Label LineBreakMode="TailTruncation" <Label LineBreakMode="TailTruncation"
Grid.Column="0" Grid.Column="0"

3
src/App/Pages/Vault/ViewPage.xaml
View file

@ -120,8 +120,7 @@
IsVisible="{Binding ShowPassword, Converter={StaticResource inverseBool}}" /> IsVisible="{Binding ShowPassword, Converter={StaticResource inverseBool}}" />
<controls:MonoLabel <controls:MonoLabel
Text="{Binding ColoredPassword, Mode=OneWay}" Text="{Binding ColoredPassword, Mode=OneWay}"
TextType="Html" StyleClass="box-value, text-html"
StyleClass="box-value"
Grid.Row="1" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
LineBreakMode="CharacterWrap" LineBreakMode="CharacterWrap"

8
src/App/Styles/Base.xaml
View file

@ -59,6 +59,14 @@
<Setter Property="FontAttributes" <Setter Property="FontAttributes"
Value="Bold" /> Value="Bold" />
</Style> </Style>
<Style TargetType="Label"
Class="text-html"
ApplyToDerivedTypes="True">
<Setter Property="TextColor"
Value="Default" />
<Setter Property="TextType"
Value="Html" />
</Style>
<!-- Pages --> <!-- Pages -->
<Style TargetType="TabbedPage" <Style TargetType="TabbedPage"