Skip to content

Commit 1816342

Browse files
authored
Add theme variables (#1661)
1 parent e0e0f0a commit 1816342

File tree

12 files changed

+76
-51
lines changed

12 files changed

+76
-51
lines changed

base/src/main/resources/web/community-app/theme.scss

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212

1313
--textColor: white;
1414

15+
--mainTitleFontWeight: 100;
16+
--mainTitleTextTransform: uppercase;
17+
1518
--primary: #71aeef;
1619
--secondary: #4695eb;
1720
--tertiary: #be9100;
@@ -28,6 +31,7 @@
2831

2932
--buttonBorderColor: var(--primary);
3033

34+
3135
// Top container
3236
--topContainerTextColor: var(--textColor);
3337
--topContainerBg: var(--background);
@@ -56,6 +60,7 @@
5660
--mainContainerTextColor: var(--textColor);;
5761
--mainContainerBg: var(--background);
5862

63+
--mainContainerControlBarTextColor: white;
5964
--mainContainerControlBarBg: #06101A;
6065

6166
// Next steps Modal
@@ -81,6 +86,7 @@
8186
// Extensions picker
8287
--originPlatformColor: #cd54e1;
8388

89+
8490
--extensionsPickerTextColor: var(--mainContainerTextColor);
8591
--extensionsPickerIdTextColor: var(--primary);
8692
--extensionsPickerListBg: var(--background3);
@@ -96,29 +102,35 @@
96102
--extensionsPickerDescriptionTextColorOnTablet: #ccc;
97103

98104
--dropdownMenuBg: #363a50;
105+
--dropdownMenuShadow: 0 4px 12px rgba(0, 0, 0, 1);
99106
--dropdownMenuTextColor: var(--textColor);;
100107

101-
108+
--extensionsPickerSearchBg: transparent;
102109
--extensionsPickerSearchTextColor: var(--mainContainerTextColor);
103110
--extensionsPickerSearchBorderColor: var(--extensionsPickerSearchTextColor);
104111
--extensionsPickerSearchBorderColorOnFocus: var(--secondary);
105112
--extensionsPickerSearchPlaceholderColor: #bebebe;
106113
--extensionsPickerSearchClearButtonBg: #404955;
114+
--extensionsPickerSearchIconColor: var(--extensionsPickerSearchTextColor);
107115
--extensionsPickerSearchIconBg: var(--mainContainerControlBarBg);
108116

117+
--selectedExtensionAlertInfoBg: black;
118+
--selectedExtensionAlertInfoTextColor: white;
109119
--clearSelectedExtensionButtonBorderColor: var(--warningColor);
110120
--clearSelectedExtensionButtonTextColor: var(--mainContainerTextColor);
111121

112122
// Presets
123+
--presetsPanelBg: var(--extensionsPickerListBg);
113124
--presetsTitleTextColor: var(--mainContainerTextColor);
114125
--presetsCardBorderColor: var(--background);
115126
--presetsCardTextColor: var(--textColor);
116127
--presetsCardBackgroundColor: transparent;
128+
--presetsCardHoverBackgroundColor: #09141F;
117129

118130
// Copy to clipboard
119-
--copyToClipboardBackgroundColor: #1f1f1f;
120-
--copyToClipboardBodyBackgroundColor: #1f1f1f;
121-
--copyToClipboardHeaderTextColor: #b4b4b4;
131+
--copyToClipboardBackgroundColor: var(--dropdownMenuBg);
132+
--copyToClipboardBodyBackgroundColor: var(--background3);
133+
--copyToClipboardHeaderTextColor: var(--dropdownMenuTextColor);
122134
--copyToClipboardBodyTextColor: var(--tertiary);
123135

124136
// Header

base/src/main/resources/web/lib/components/code-quarkus.scss

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ code {
1414
monospace;
1515
}
1616

17+
.main-title, .main-title * {
18+
font-weight: var(--mainTitleFontWeight) !important;
19+
text-transform: var(--mainTitleTextTransform) !important;
20+
}
21+
1722
.responsive-container {
1823
max-width: 1200px;
1924

@@ -124,6 +129,7 @@ button.btn, a.btn {
124129
}
125130

126131
&.github {
132+
color: var(--modalTextColor);
127133
background-color: transparent;
128134
}
129135
}
@@ -196,14 +202,15 @@ button.btn.btn-light {
196202

197203
.quarkus-project-edition-form .dropdown-menu {
198204
background-color: var(--dropdownMenuBg);
205+
box-shadow: var(--dropdownMenuShadow);
199206
padding: 0;
200207

201208
.dropdown-item {
202209
display: flex;
210+
align-items: center;
203211
height: 30px;
204212
border: none;
205213
line-height: 30px;
206-
font-weight: bold;
207214
width: 100%;
208215
padding: 0 0 0 20px;
209216
color: var(--dropdownMenuTextColor);
@@ -246,6 +253,7 @@ button.btn.btn-light {
246253
max-width: none;
247254
color: var(--dropdownMenuTextColor);
248255
background-color: var(--copyToClipboardBackgroundColor);
256+
box-shadow: var(--dropdownMenuShadow);
249257
margin: 9px;
250258
border: none;
251259
border-radius: 6px;
@@ -257,7 +265,6 @@ button.btn.btn-light {
257265
font-size: 1rem;
258266
padding: 10px;
259267
margin-bottom: 0;
260-
font-weight: 100;
261268
background-color: transparent;
262269
border: none;
263270
color: var(--copyToClipboardHeaderTextColor);

base/src/main/resources/web/lib/components/extensions-picker/extension-row.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,12 @@
113113
display: inline-flex;
114114
align-items: center;
115115
justify-content: center;
116-
font-size: 0.7rem;
116+
font-size: 0.8rem;
117117
line-height: 20px;
118118
margin: 5px 5px;
119119
padding: 0 7px;
120120
height: 20px;
121121
vertical-align: middle;
122-
font-family: var(--monospaceFontFamily), monospace;
123122
white-space: nowrap;
124123
text-transform: lowercase;
125124
border-radius: 20px;
@@ -157,7 +156,6 @@
157156
cursor: pointer;
158157

159158
display: flex;
160-
font-weight: 400;
161159
align-items: center;
162160
justify-content: space-between;
163161
}

base/src/main/resources/web/lib/components/extensions-picker/extension-search-bar.scss

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,15 @@
2626
}
2727

2828
.button-toggle-list {
29-
font-weight: 100;
30-
text-transform: uppercase;
3129
height: 40px;
3230
background: none;
3331
border: none;
3432
display: flex;
3533
cursor: pointer;
3634
align-items: center;
3735
appearance: none;
38-
color: var(--textColor);
36+
color: inherit;
37+
font-size: 1.1rem;
3938

4039
svg {
4140
margin: 0 !important;
@@ -57,12 +56,15 @@
5756
justify-content: center;
5857
height: 42px;
5958
gap: 5px;
59+
background-color: var(--extensionsPickerSearchBg);
60+
6061
.search-icon {
6162
flex-basis: 40px;
6263
height: 100%;
6364
display: flex;
6465
align-items: center;
6566
justify-content: center;
67+
color: var(--extensionsPickerSearchIconColor);
6668
background-color: var(--extensionsPickerSearchIconBg);
6769
}
6870

@@ -108,6 +110,7 @@
108110

109111
margin: 20px 0 0;
110112
background-color: var(--mainContainerControlBarBg);
113+
color: var(--mainContainerControlBarTextColor);
111114
display: flex;
112115

113116
padding: 0 5px;
@@ -129,8 +132,6 @@
129132
display: none;
130133
align-items: center;
131134
height: 100%;
132-
font-weight: 100;
133-
text-transform: uppercase;
134135
}
135136

136137
svg {
@@ -141,7 +142,7 @@
141142
.search-results-info {
142143
display: flex;
143144
align-items: center;
144-
padding: 0 5px;
145+
padding: 0 10px;
145146

146147
.result-count {
147148

@@ -151,8 +152,6 @@
151152
margin-right: 5px;
152153
cursor: pointer;
153154
font-weight: bold;
154-
color: var(--mainContainerTextColor);
155-
156155
}
157156

158157
}
@@ -167,13 +166,11 @@
167166
padding: 0px 10px;
168167

169168
&[aria-expanded="true"], &:hover {
170-
font-weight: bold;
171169
background-color: var(--extensionsPickerSearchBorderColorOnFocus);
172170
}
173171
}
174172

175173
.dropdown-menu {
176-
padding: 10px;
177174

178175
.filter-combo-actions {
179176
display: flex;
@@ -182,6 +179,7 @@
182179
}
183180

184181
button {
182+
height: 35px;
185183
cursor: pointer;
186184
color: var(--extensionsPickerSearchTextColor);
187185
display: flex;
@@ -191,15 +189,22 @@
191189
background-color: transparent;
192190
border: none;
193191
margin-right: 5px;
192+
outline: none;
194193

195194
svg {
196195
color: var(--primary);
197196
}
197+
198+
&:hover {
199+
background-color: rgba(0, 0, 0, 0.1);
200+
background-blend-mode: multiply;
201+
}
198202
}
199203
}
200204

201205
.dropdown-item {
202-
padding-left: 5px;
206+
padding: 0 10px;
207+
height: 35px;
203208
}
204209

205210
.dropdown-item.special-filter {

base/src/main/resources/web/lib/components/extensions-picker/extension-search-bar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function FiltersBar(props: ExtensionSearchBarProps) {
5151
) : (props.showList ? (
5252
<Button className='button-toggle-list' aria-label="Toggle full list of extensions"
5353
onClick={props.toggleShowList}><FaCaretUp/>Hide the full list</Button>) : (
54-
<div className="toggle-list"><Button className='button-toggle-list'
54+
<div className="toggle-list"><Button className='button-toggle-list main-title'
5555
aria-label="Toggle full list of extensions"
5656
onClick={props.toggleShowList}><FaCaretDown/>Toggle the full list of
5757
extensions</Button></div>

base/src/main/resources/web/lib/components/extensions-picker/presets-panel.tsx

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ interface PresetsProps {
1212

1313

1414
const PresetsPanelDiv = styled.div`
15-
background-color: var(--background3);
15+
background-color: var(--presetsPanelBg);
1616
1717
.panel-title {
18-
font-weight: 100;
19-
text-transform: uppercase;
20-
font-size: 1rem;
18+
font-size: 1.1rem;
2119
margin: 10px 0 0 0;
2220
height: 40px;
2321
display: flex;
2422
align-items: center;
2523
padding: 10px;
24+
background-color: var(--presetsPanelBg);
25+
color: var(--presetsTitleTextColor);
2626
2727
svg {
2828
margin-right: 5px;
@@ -47,8 +47,7 @@ const PresetsPanelDiv = styled.div`
4747
}
4848
4949
.preset-card:hover {
50-
background-color: rgba(0, 0, 0, 0.1);
51-
background-blend-mode: multiply;
50+
background-color: var(--presetsCardHoverBackgroundColor);
5251
}
5352
5453
.preset-title {
@@ -90,7 +89,7 @@ export const PresetsPanel = (props: PresetsProps) => {
9089
};
9190
return (
9291
<PresetsPanelDiv className="presets-panel">
93-
<div className="panel-title"><FaRocket />&nbsp;Start with a preset of extensions</div>
92+
<div className="panel-title main-title"><FaRocket />&nbsp;Start with a preset of extensions</div>
9493
<div className="presets-list">
9594
{presets.map(p => (
9695
<PresetCard key={p.key} preset={p} onClick={() => selectPreset(p)}/>

0 commit comments

Comments
 (0)