Skip to content
This repository was archived by the owner on Jan 24, 2023. It is now read-only.

Commit ddbf2bb

Browse files
committed
feat: New Style
1 parent 9dc1bec commit ddbf2bb

23 files changed

Lines changed: 1436 additions & 537 deletions

File tree

packages/@simpli/cli-scaffold/generator/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ module.exports = (api, options) => {
6363
'normalize-scss': '7.0.1',
6464
'register-service-worker': '1.1.1',
6565
'simple-line-icons': '2.4.1',
66-
'simpli-ts-vue': '^1.7.1',
66+
'simpli-ts-vue': '^1.8.2',
6767
'vue': '2.5.17',
6868
'vue-chartjs': '3.2.1',
6969
'vue-chartkick': '0.2.1',

packages/@simpli/cli-scaffold/generator/injected/src/views/list/ListTemplateView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<section>
1212
<adap-table :collection="collection">
13-
<div slot="options" slot-scope="props">
13+
<div slot="options" slot-scope="props" class="horiz nowrap">
1414
<a @click="openPersist(props.item)" class="icon icon-pencil"></a>
1515
<%_ if (model.resource.deletable) { _%>
1616
<a @click="openRemoveModal(props.item)" class="icon icon-trash"></a>

packages/@simpli/cli-scaffold/generator/injected/src/views/persist/PersistTemplateView.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<template>
22
<%_ var kebabCase = rootOptions.scaffoldSetup.kebabCase _%>
3-
<div class="verti">
4-
<h1 class="header px-30 py-10 m-0">
3+
<div>
4+
<h1 class="adap-header px-30 py-10 m-0">
55
{{ $t("classes.<%-origin.name%>.title") }}
66
</h1>
77

8-
<await name="get" class="verti scroll weight-1 items-center-top p-30">
9-
<form @submit.prevent="$await.run(persist, 'persist')" class="elevated w-full max-w-650 p-20">
8+
<await name="get" class="weight-1 items-center p-20">
9+
<form @submit.prevent="$await.run(persist, 'persist')" class="elevated padded w-full max-w-650">
1010
<%_ for (var i in origin.attrs) { var attr = origin.attrs[i] _%>
1111
<%-attr.buildPersist(origin.name, model.resp.originAttr)-%>
1212
<%_ } _%>
1313
<hr class="mb-20"/>
1414

1515
<await name="persist" class="verti items-center">
16-
<button type="submit" class="accent">{{ $t("persist.submit") }}</button>
16+
<button type="submit" class="primary">{{ $t("persist.submit") }}</button>
1717
</await>
1818
</form>
1919
</await>

packages/@simpli/cli-scaffold/generator/template/src/App.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<template>
22
<div>
3-
<transition name="fade-y" mode="out-in">
3+
<transition name="blur" mode="out-in">
44
<router-view/>
55
</transition>
66
<vue-snotify :class="toastStyle"/>
77
</div>
88
</template>
99

1010
<style lang="scss">
11-
@import './scss/main.scss';
11+
@import './scss/app.scss';
1212
</style>
1313

1414
<script lang="ts">
Binary file not shown.

packages/@simpli/cli-scaffold/generator/template/src/bootstrap/setting.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ $.await.defaultSpinnerPadding = '0'
4141
$.await.defaultSpinnerScale = 1
4242

4343
$.modal.defaultBody = document.body
44-
$.modal.defaultTransition = 'fade-y'
44+
$.modal.defaultTransition = 'blur'
4545
$.modal.defaultBackgroundTransition = 'fade'
4646
$.modal.defaultClosable = true
4747
$.modal.defaultCloseOutside = true

packages/@simpli/cli-scaffold/generator/template/src/components/Sidebar.vue

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
<template>
2-
<div class="des-w-200 tab-w-200 w-full des-h-window">
3-
<aside class="menu verti des-w-200 tab-w-200 w-full des-h-window tab-h-window des-fixed tab-fixed y-scroll">
2+
<div class="sidebar des-w-200 tab-w-200 w-full des-h-window">
3+
<aside class="verti des-w-200 tab-w-200 w-full des-h-window tab-h-window des-fixed tab-fixed y-scroll">
4+
45
<div class="horiz items-center">
5-
<a class="mobile icon icon-menu" @click="toggleMenu"></a>
6-
<h1 class="horiz weight-1 accent truncate">
7-
<img src="@/assets/img/logo.png"
8-
class="ml-10"
9-
width="32"
10-
height="32"
11-
alt="Logo"
12-
style="vertical-align: middle;">
13-
<span class="weight-1 truncate mr-10">
14-
<%- rootOptions.scaffoldSetup.appName %>
6+
<div class="brand">
7+
<img src="@/assets/img/logo.png" alt="Logo">
8+
<span>
9+
<%- rootOptions.scaffoldSetup.appName %>
1510
</span>
16-
</h1>
11+
</div>
12+
13+
<a class="mobile icon icon-menu" @click="toggleMenu"></a>
1714
</div>
15+
1816
<!--<div class="horiz items-center">-->
1917
<!--<h3 class="truncate">-->
2018
<!--{{user.email}}-->
2119
<!--</h3>-->
2220
<!--</div>-->
21+
2322
<div class="weight-1" :class="{ 'desktop-tablet': !menu }">
24-
<ul class="verti h-full p-0 py-10">
23+
<ul>
2524

2625
<li>
27-
<router-link to="/dashboard" @click.native="menuOff">
28-
<i class="icon icon-home mr-3"></i>
26+
<router-link to="/dashboard" @click.native="menuOff" class="btn fluid flat contrast">
27+
<i class="icon icon-home"></i>
2928
{{ $t('view.dashboard.title') }}
3029
</router-link>
3130
</li>
@@ -34,7 +33,7 @@
3433
<%_ var resources = rootOptions.scaffoldSetup.resourceModels _%>
3534
<%_ for (var i in resources) { var resource = resources[i] _%>
3635
<li>
37-
<router-link to="/<%-kebabCase(resource.name)%>/list" @click.native="menuOff">
36+
<router-link to="/<%-kebabCase(resource.name)%>/list" @click.native="menuOff" class="btn fluid flat contrast">
3837
{{ $t('classes.<%-resource.name%>.title') }}
3938
</router-link>
4039
</li>
@@ -44,8 +43,8 @@
4443
<%_ if (rootOptions.scaffoldSetup.useAuth) { _%>
4544

4645
<li>
47-
<a @click="signOut(false)">
48-
<i class="icon icon-logout mr-3"/>
46+
<a @click="signOut(false)" class="btn fluid flat contrast">
47+
<i class="icon icon-logout"/>
4948
{{$t('app.logout')}}
5049
</a>
5150
</li>
@@ -54,7 +53,7 @@
5453

5554
</div>
5655

57-
<footer class="p-10 desktop-tablet">
56+
<footer class="p-10 desktop-tablet text-light">
5857
<small>
5958
<b>Version</b>
6059
{{version}}

packages/@simpli/cli-scaffold/generator/template/src/components/modals/ModalRemove.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<template>
22
<modal :name="name">
3-
<div class="verti">
3+
<div class="verti text-center">
44
<div class="horiz">
55
<h4 class="weight-1 mt-0 mr-10">
66
{{ $t("system.question.confirmRemove") }}
77
</h4>
88
</div>
9-
<p class="text-center">{{ text }}</p>
9+
10+
<p>{{ text }}</p>
11+
1012
<div class="horiz items-center">
11-
<button type="button" @click="cancelEvent">{{ $t("app.cancel") }}</button>
12-
<button type="button" class="danger ml-10" @click="confirmEvent">{{ $t("app.remove") }}</button>
13+
<button type="button" class="mr-10" @click="cancelEvent">{{ $t("app.cancel") }}</button>
14+
<button type="button" class="danger" @click="confirmEvent">{{ $t("app.remove") }}</button>
1315
</div>
1416
</div>
1517
</modal>

0 commit comments

Comments
 (0)