Skip to content

Commit f3befa5

Browse files
committed
Update color theme to align with new typedb.com design
1 parent 5fd98ab commit f3befa5

File tree

2 files changed

+31
-38
lines changed

2 files changed

+31
-38
lines changed

framework/common/theme/Color.kt

Lines changed: 29 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -70,64 +70,57 @@ object Color {
7070

7171
private object DarkPalette {
7272
val Black = Color(0xFF09022F)
73-
val Blue1 = Color(0xFF5CA8FF)
74-
val Blue2 = Color(0xFF92E4FC)
73+
val Blue1 = Color(0xFF7BA0FF)
7574
val Green = Color(0xFF02DAC9)
76-
val Orange1 = Color(0xFFA98119)
77-
val Orange2 = Color(0xFFD68E11)
78-
val Orange3 = Color(0xFFF6C94C)
79-
val Pink1 = Color(0xFFF28DD7)
80-
val Pink2 = Color(0xFFFFA9E8)
81-
val Pink3 = Color(0xFFE69CFF)
82-
val Purple0 = Color(0xFF080226)
83-
val Purple1 = Color(0xFF0E053F)
84-
val Purple2 = Color(0xFF180F49)
85-
val Purple3 = Color(0xFF1D1354)
86-
val Purple4 = Color(0xFF261C5E)
87-
val Purple5 = Color(0xFF372E6A)
88-
val Purple6 = Color(0xFF392D7F)
89-
val Purple7 = Color(0xFF544899)
90-
val Purple8 = Color(0xFF888DCA)
75+
val Orange = Color(0xFFB0740C)
76+
val Yellow = Color(0xFFF6C94C)
77+
val Pink = Color(0xFFFF87DC)
78+
val Purple1 = Color(0xFF0E0D17)
79+
val Purple2 = Color(0xFF14121F)
80+
val Purple3 = Color(0xFF151322)
81+
val Purple4 = Color(0xFF1A182A)
82+
val Purple5 = Color(0xFF232135)
83+
val Purple6 = Color(0xFF2D2A46)
9184
val Red1 = Color(0xFFCF4A55)
92-
val Red2 = Color(0xFFF66B65)
85+
val Red2 = Color(0xFFFF8080)
9386
val White = Color(0xFFFFFFFF)
9487
val White2 = Color(0xFFd5ccff)
9588
}
9689

9790
object Themes {
9891
val DARK_STUDIO = StudioTheme(
99-
primary = DarkPalette.Purple4,
92+
primary = DarkPalette.Purple5,
10093
secondary = DarkPalette.Green,
101-
tertiary = DarkPalette.Pink1,
102-
backgroundDark = DarkPalette.Purple0,
103-
backgroundMedium = DarkPalette.Purple1,
104-
backgroundLight = DarkPalette.Purple2,
105-
surface = DarkPalette.Purple3,
94+
tertiary = DarkPalette.Pink,
95+
backgroundDark = DarkPalette.Purple1,
96+
backgroundMedium = DarkPalette.Purple2,
97+
backgroundLight = DarkPalette.Purple3,
98+
surface = DarkPalette.Purple4,
10699
border = DarkPalette.Purple6,
107-
scrollbar = DarkPalette.Purple8,
108-
icon = DarkPalette.Purple8,
109-
warningStroke = DarkPalette.Orange3,
110-
warningBackground = DarkPalette.Orange1,
100+
scrollbar = DarkPalette.Purple6,
101+
icon = DarkPalette.White,
102+
warningStroke = DarkPalette.Yellow,
103+
warningBackground = DarkPalette.Orange,
111104
errorStroke = DarkPalette.Red2,
112105
errorBackground = DarkPalette.Red1,
113106
onPrimary = DarkPalette.White2,
114-
onSecondary = DarkPalette.Purple0,
107+
onSecondary = DarkPalette.Purple1,
115108
onBackground = DarkPalette.White2,
116109
onSurface = DarkPalette.White2,
117110
onError = DarkPalette.White,
118111
indicationBase = DarkPalette.White,
119112
isLight = false
120113
)
121114
val DARK_GRAPH = GraphTheme(
122-
background = DarkPalette.Purple0,
115+
background = DarkPalette.Purple1,
123116
vertex = GraphTheme.Vertex(
124-
thingType = DarkPalette.Pink1,
125-
entityType = DarkPalette.Pink1,
126-
relationType = DarkPalette.Orange2,
117+
thingType = DarkPalette.Pink,
118+
entityType = DarkPalette.Pink,
119+
relationType = DarkPalette.Yellow,
127120
attributeType = DarkPalette.Blue1,
128-
entity = DarkPalette.Pink3,
129-
relation = DarkPalette.Orange3,
130-
attribute = DarkPalette.Blue2,
121+
entity = DarkPalette.Pink,
122+
relation = DarkPalette.Yellow,
123+
attribute = DarkPalette.Blue1,
131124
),
132125
vertexLabel = DarkPalette.Black,
133126
edge = DarkPalette.Blue1,

framework/common/theme/Theme.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ object Theme {
5959
val TOOLBAR_SEPARATOR_HEIGHT = 20.dp
6060
val ROUNDED_CORNER_RADIUS = 4.dp
6161
val ROUNDED_CORNER_SHAPE = RoundedCornerShape(ROUNDED_CORNER_RADIUS)
62-
const val TARGET_SELECTION_ALPHA = 0.35f
63-
const val FIND_SELECTION_ALPHA = 0.3f
62+
const val TARGET_SELECTION_ALPHA = 0.25f
63+
const val FIND_SELECTION_ALPHA = 0.25f
6464
const val INDICATION_HOVER_ALPHA = 0.1f
6565
private const val INDICATION_PRESSED_ALPHA = 0.2f
6666
private val StudioColorsState = staticCompositionLocalOf { Color.Themes.DARK_STUDIO }

0 commit comments

Comments
 (0)