Skip to content
This repository was archived by the owner on Nov 21, 2024. It is now read-only.

Commit ab37f17

Browse files
EndyKaufmanEndyKaufman
committed
fix(styles): Remove custom styles like "app-grid-...." and others
1 parent 10b985a commit ab37f17

3 files changed

Lines changed: 44 additions & 85 deletions

File tree

‎srcgen/web-app-empty/apps/%app.name%/src/app/controls/navbar/navbar.component.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
<!-- Fixed navbar -->
2-
<nav class="app-navbar navbar navbar-default navbar-fixed-top">
2+
<nav class="navbar navbar-default navbar-fixed-top">
33
<div class="container-fluid">
44
<div class="navbar-header">
5-
<button type="button" class="navbar-toggle collapsed pointer" data-toggle="collapse" data-target="#navbar" aria-expanded="false"
5+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false"
66
aria-controls="navbar" (click)="isCollapsed = !isCollapsed">
77
<span class="sr-only" translate>Menu</span>
88
<span class="icon-bar"></span>
99
<span class="icon-bar"></span>
1010
<span class="icon-bar"></span>
1111
</button>
12-
<a class="navbar-brand pointer">
12+
<a class="navbar-brand" href="javascript:void(0)">
1313
<span (click)="go(['/'])" translate><%=app.title%></span>
1414
<span class="badge" (click)="showChangeLog()">{{version}}</span>
1515
</a>
1616
</div>
1717
<div id="navbar" class="navbar-collapse collapse" [collapse]="isCollapsed">
1818
<ul class="nav navbar-nav navbar-right">
19-
<li *ngFor="let item of childrenRoutes" [class.active]="router.isActive(item.url)" class="pointer">
19+
<li *ngFor="let item of childrenRoutes" [class.active]="router.isActive(item.url)">
2020
<a [routerLink]="[item.name]">{{item.title | translate}}</a>
2121
</li>
22-
<li class="dropdown pointer">
22+
<li class="dropdown">
2323
<a (click)="languagesIsCollapsed = !languagesIsCollapsed" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
2424
aria-expanded="false">{{'Language' | translate}} <span class="caret"></span></a>
2525
<ul class="dropdown-menu" [collapse]="languagesIsCollapsed">
2626
<li *ngFor="let lang of languages" [class.active]="currentLanguage==lang.code"><a (click)="currentLanguage=lang.code">{{lang.title | translate}}</a></li>
2727
</ul>
2828
</li>
29-
<li *ngIf="account" class="pointer">
29+
<li *ngIf="account">
3030
<a (click)="showLogoutModal()" translate>Logout</a>
3131
</li>
32-
<li *ngIf="!account" class="pointer">
32+
<li *ngIf="!account">
3333
<a (click)="showLoginModal()" translate>Login</a>
3434
</li>
3535
</ul>

‎srcgen/web-app-empty/apps/%app.name%/src/styles.scss‎

Lines changed: 26 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,72 @@
1-
body
2-
{
3-
//min-height: 2000px;
1+
body {
42
padding-top: 70px;
53
}
6-
.app-navbar
7-
{
8-
&__item
9-
{
10-
&.active
11-
{
12-
font-weight: 700;
13-
}
14-
}
15-
}
16-
.app-sidebar
17-
{
18-
&__item
19-
{
20-
&.active
21-
{
22-
font-weight: 700;
23-
}
24-
}
25-
}
26-
.app-grid
27-
{
28-
&__toolbar
29-
{
30-
&--header
31-
{
4+
5+
.grid {
6+
&__toolbar {
7+
&--header {
328
padding-bottom: 5px;
339
}
34-
&--footer
35-
{
10+
&--footer {
3611
padding-top: 5px;
3712
}
3813
}
39-
&__table
40-
{
14+
&__table {
4115
margin-bottom: 0px;
42-
43-
tr{
44-
td{
45-
cursor:pointer;
16+
tr {
17+
td {
18+
cursor: pointer;
4619
}
47-
th{
20+
th {
4821
vertical-align: top!important;
4922
position: relative;
5023
padding-right: 18px !important;
51-
button{
24+
button {
5225
position: absolute;
5326
top: 6px;
5427
right: -0px;
5528
}
5629
}
5730
}
58-
&__col-key
59-
{
31+
&__col-key {
6032
width: 100px;
61-
6233
text-align: left;
6334
}
64-
&__col-id
65-
{
35+
&__col-id {
6636
width: 70px;
67-
6837
text-align: right;
6938
}
70-
&__col-icon
71-
{
39+
&__col-icon {
7240
width: 70px;
73-
7441
text-align: center;
7542
}
76-
&__col-action
77-
{
43+
&__col-action {
7844
width: 100px;
79-
8045
text-align: center;
8146
}
82-
&__col-status-message
83-
{
47+
&__col-status-message {
8448
text-align: center;
8549
}
8650
}
8751
}
88-
.input-group{
89-
.dropdown-menu
90-
{
91-
>li{
92-
>a{
52+
53+
.input-group {
54+
.dropdown-menu {
55+
>li {
56+
>a {
9357
line-height: 0;
9458
}
9559
}
96-
.divider{
60+
.divider {
9761
margin: 0px 0;
9862
}
9963
}
10064
}
101-
.pointer{
102-
cursor:pointer;
103-
}
104-
.page-header
105-
{
65+
66+
.page-header {
10667
margin: 0 0 20px;
10768
}
108-
tabset>.nav-tabs{
109-
margin-bottom: 10px;
110-
}
69+
11170
.pagination-compressed {
11271
margin-top: 0px;
11372
}

‎srcgen/web-grid/%libs.platformFolder%/src/grids/%grid.list.name.kebab%-grid/%grid.list.name.kebab%-grid.component.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<div class="app-grid <%=grid.list.name.kebab%>-grid" *ngIf="account">
2-
<div class="app-grid__toolbar--header">
1+
<div class="grid <%=grid.list.name.kebab%>-grid" *ngIf="account">
2+
<div class="grid__toolbar--header">
33
<div class="row">
44
<div class="col-md-3">
55
<button type="button" class="btn btn-primary" aria-label="Create" (click)="showCreateModal()" *ngIf="hardReadonly !== true && accessToAdd">
@@ -13,36 +13,36 @@
1313
</div>
1414
</div>
1515
</div>
16-
<table class="app-grid__table table table-bordered table-hover">
16+
<table class="grid__table table table-bordered table-hover">
1717
<thead>
1818
<tr>
19-
<th class="app-grid__table__col-<%=grid.table.pk.name%>">
19+
<th class="grid__table__col-<%=grid.table.pk.name%>">
2020
<table-column [title]="modelMeta.titles.<%=grid.table.pk.name%>" name="<%=grid.table.pk.name%>" [(columns)]="columns"></table-column>
2121
</th>
22-
<%for (var i=0; i<grid.table.fields.names.length; i++) {%> <th class="app-grid__table__col-<%=grid.table.fields.names[i]%>">
22+
<%for (var i=0; i<grid.table.fields.names.length; i++) {%> <th class="grid__table__col-<%=grid.table.fields.names[i]%>">
2323
<table-column [title]="modelMeta.titles.<%=grid.table.fields.names[i]%>" name="<%=grid.table.fields.names[i]%>" [(columns)]="columns"></table-column>
2424
</th>
25-
<%}%> <th class="app-grid__table__col-action" *ngIf="hardReadonly !== true && (accessToChange || accessToDelete)" translate>Actions</th>
25+
<%}%> <th class="grid__table__col-action" *ngIf="hardReadonly !== true && (accessToChange || accessToDelete)" translate>Actions</th>
2626
</tr>
2727
</thead>
2828
<tbody>
2929
<tr *ngIf="statusListMessage">
30-
<td class="app-grid__table__col-status-message" [attr.colspan]="<%=parseInt(grid.table.fields.names.length+2)-1%>+(hardReadonly !== true && (accessToChange || accessToDelete)?1:0)">
30+
<td class="grid__table__col-status-message" [attr.colspan]="<%=parseInt(grid.table.fields.names.length+2)-1%>+(hardReadonly !== true && (accessToChange || accessToDelete)?1:0)">
3131
{{statusListMessage | translate}}
3232
</td>
3333
</tr>
3434
<tr *ngFor="let item of items | slice:0:meta.perPage" (click)="selectItem(item, $event)" [ngClass]="{'info':isSelectedItem(item)}" (dblclick)="showEditModal(item)"
3535
[hidden]="statusListMessage">
36-
<td class="app-grid__table__col-<%=grid.table.pk.name%>">{{item.pk}}</td>
37-
<%for (var i=0; i<grid.table.fields.names.length; i++) {%> <td class="app-grid__table__col-<%=grid.table.fields.names[i]%>">{{item.<%=grid.table.fields.names[i]%>}}</td>
38-
<%}%> <td class="app-grid__table__col-action" *ngIf="hardReadonly !== true && (accessToChange || accessToDelete)">
36+
<td class="grid__table__col-<%=grid.table.pk.name%>">{{item.pk}}</td>
37+
<%for (var i=0; i<grid.table.fields.names.length; i++) {%> <td class="grid__table__col-<%=grid.table.fields.names[i]%>">{{item.<%=grid.table.fields.names[i]%>}}</td>
38+
<%}%> <td class="grid__table__col-action" *ngIf="hardReadonly !== true && (accessToChange || accessToDelete)">
3939
<grid-row-buttons (onEdit)="showEditModal(item)" (onRemove)="showRemoveModal(item)" [showEdit]="hardReadonly !== true && accessToChange"
4040
[showRemove]="hardReadonly !== true && accessToDelete"></grid-row-buttons>
4141
</td>
4242
</tr>
4343
</tbody>
4444
</table>
45-
<div class="app-grid__toolbar--footer" [hidden]="statusListMessage">
45+
<div class="grid__toolbar--footer" [hidden]="statusListMessage">
4646
<div class="row">
4747
<div class="col-md-3">
4848
</div>

0 commit comments

Comments
 (0)