Skip to content

Commit 6f90969

Browse files
PekoPPTPetar Todorov
andauthored
chore: improve the coffee warehouse implementation (#308)
* chore: update GitHub Dashboard app * chor: update Themes version * chor: update the width of the Engagement component to fit in all themes * chore: remove margin in the Menu in Bootstrap theme * chore: make the Dashboard datePickers fully visible in all themes * chore: update package-lock.json * chore: remove duplicate CSS * chore: make the header DDL the same height * chore: update the checkbox selection handling and cell sizing based on selected theme * chore: update filterin logic. Update Grid column widths Co-authored-by: Petar Todorov <petar.todorov@progre>
1 parent b21efbe commit 6f90969

File tree

12 files changed

+5826
-23663
lines changed

12 files changed

+5826
-23663
lines changed

examples-standalone/coffee-warehouse/package-lock.json

Lines changed: 2298 additions & 19758 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples-standalone/coffee-warehouse/public/static/themes/kendo-theme-bootstrap/all.css

Lines changed: 1129 additions & 1192 deletions
Large diffs are not rendered by default.

examples-standalone/coffee-warehouse/public/static/themes/kendo-theme-default/all.css

Lines changed: 1372 additions & 1437 deletions
Large diffs are not rendered by default.

examples-standalone/coffee-warehouse/public/static/themes/kendo-theme-material/all.css

Lines changed: 948 additions & 1090 deletions
Large diffs are not rendered by default.

examples-standalone/coffee-warehouse/src/App.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<div class="card-container">
1313
<router-view
1414
:localization-language="localizationLanguage"
15+
:current-theme="currentTheme"
1516
></router-view>
1617
</div>
1718
</div>

examples-standalone/coffee-warehouse/src/assets/styles/app.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,3 +239,8 @@ $container-max-widths: (
239239
background-color: #f5f5f5;
240240
border-radius: 2px;
241241
}
242+
243+
244+
.k-menu.k-menu-vertical:not(.k-context-menu){
245+
padding:0;
246+
}

examples-standalone/coffee-warehouse/src/assets/styles/common.scss

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -184,89 +184,6 @@ a {
184184
}
185185
}
186186

187-
// Header
188-
.header-bg {
189-
background-image: url('./assets/images/header-bg.png');
190-
}
191-
192-
.header {
193-
height: 80px;
194-
position: sticky;
195-
top: 0;
196-
z-index: 3;
197-
198-
.nav-container {
199-
display: flex;
200-
flex-direction: row;
201-
align-items: center;
202-
justify-content: space-between;
203-
height: 100%;
204-
color: $white;
205-
}
206-
207-
.menu-button {
208-
flex: 0 0 50px;
209-
text-align: center;
210-
}
211-
212-
.hamburger-icon {
213-
background-image: url('./assets/images/hamburger-icon.svg');
214-
background-repeat: no-repeat;
215-
width: 20px;
216-
cursor: pointer;
217-
}
218-
219-
.title {
220-
display: flex;
221-
flex: 1 0 auto;
222-
flex-direction: column;
223-
align-items: flex-start;
224-
margin-left: 25px;
225-
}
226-
227-
.k-avatar {
228-
display: block;
229-
width: 40px;
230-
height: 40px;
231-
flex-basis: 40px;
232-
margin: 0 25px;
233-
box-shadow: 0 0 0px 1px $white;
234-
}
235-
236-
.settings {
237-
display: none;
238-
}
239-
}
240-
241-
@media (min-width: 480px) {
242-
.header {
243-
.title {
244-
flex-direction: row;
245-
align-items: center;
246-
}
247-
.vl {
248-
border-left: 1px solid $white;
249-
height: 25px;
250-
margin: 6px 15px;
251-
}
252-
}
253-
}
254-
255-
@media (min-width: 768px) {
256-
.header {
257-
.settings {
258-
display: flex;
259-
flex: 0 0 auto;
260-
align-items: center;
261-
}
262-
263-
.k-dropdown {
264-
max-width: 90px;
265-
margin-left: 15px;
266-
}
267-
}
268-
}
269-
270187
// Dashboard page
271188
.dashboard-page {
272189
.k-grid-toolbar .k-textbox {

examples-standalone/coffee-warehouse/src/components/Dashboard.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
</buttongroup>
2121
<div class="card-ranges">
2222
<datepicker
23-
style="width: 120px"
23+
style="width: 130px"
2424
:value="dateRange.start"
2525
@change="onFromDateChange"
2626
>
2727
</datepicker>
2828
<span> - </span>
2929
<datepicker
30-
style="width: 120px"
30+
style="width: 130px"
3131
:value="dateRange.end"
3232
@change="onToDateChange"
3333
>

examples-standalone/coffee-warehouse/src/components/GridComponents/EngagementComponent.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
:type="'bar'"
66
:series-defaults="seriesDefaults"
77
>
8-
<ChartArea :opacity="0" :width="200" :height="40" />
8+
<ChartArea :opacity="0" :width="180" :height="40" />
99
<ChartValueAxis>
1010
<ChartValueAxisItem :max="max" :min="min" />
1111
</ChartValueAxis>

examples-standalone/coffee-warehouse/src/components/Header.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<span class="vl"></span>
77
<h2>{{ teamMessage }}</h2>
88
</div>
9-
<DropDownList :style="{ width: '230px' }" class="localeDropDownList" :value="currentLocale"
9+
<DropDownList :style="{ width: '230px', height: '30px' }" class="localeDropDownList" :value="currentLocale"
1010
:text-field="'language'" @change="localeChange" :data-items="locales">
1111
</DropDownList>
1212
<DropDownList :data-items="themes" :text-field="'text'" :popup-settings="themesPopupSettings"

0 commit comments

Comments
 (0)