Skip to content
Snippets Groups Projects
Commit 4bc664f3 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#400 - set default account font color to appropriate text color

parent 89957757
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,8 @@ import java.util.Objects; ...@@ -15,7 +15,8 @@ import java.util.Objects;
@Entity @Entity
public class Account implements ProvidesID, Iconizable public class Account implements ProvidesID, Iconizable
{ {
private static final String ACCOUNT_FONT_COLOR = "#2E79B9"; private static final String FONT_COLOR_LIGHT_THEME = "#212121";
private static final String FONT_COLOR_DARK_THEME = "#FFFFFF";
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
...@@ -162,13 +163,13 @@ public class Account implements ProvidesID, Iconizable ...@@ -162,13 +163,13 @@ public class Account implements ProvidesID, Iconizable
final Icon icon = getIconReference(); final Icon icon = getIconReference();
if(icon == null) if(icon == null)
{ {
return ACCOUNT_FONT_COLOR; return getDefaultFontColor(isDarkTheme);
} }
final String fontColor = icon.getFontColor(); final String fontColor = icon.getFontColor();
if(fontColor == null) if(fontColor == null)
{ {
return ACCOUNT_FONT_COLOR; return getDefaultFontColor(isDarkTheme);
} }
return fontColor; return fontColor;
...@@ -177,7 +178,12 @@ public class Account implements ProvidesID, Iconizable ...@@ -177,7 +178,12 @@ public class Account implements ProvidesID, Iconizable
@Override @Override
public String getDefaultFontColor(boolean isDarkTheme) public String getDefaultFontColor(boolean isDarkTheme)
{ {
return ACCOUNT_FONT_COLOR; if(isDarkTheme)
{
return FONT_COLOR_DARK_THEME;
}
return FONT_COLOR_LIGHT_THEME;
} }
@Override @Override
......
...@@ -28,6 +28,6 @@ ...@@ -28,6 +28,6 @@
} }
.account-square-border { .account-square-border {
border: 3px solid var(--color-blue); border: 3px solid var(--color-text);
line-height: 28px !important; line-height: 32px !important;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment