Skip to content

Commit 6ffd4b3

Browse files
BlariBlari
committed
- ECommerce: fix dropdowns;
- Inbox: fix links; - Profile: fix outline button and links; - UI -> Buttons: fix justify content; - UI -> modal: fix close buttons; - Charts: fix colors
1 parent d74f73c commit 6ffd4b3

File tree

13 files changed

+104
-91
lines changed

13 files changed

+104
-91
lines changed

‎src/app/pages/ecommerce/product-grid/components/filter/filter.template.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="filters">
22
<div class="filters-group" *ngFor="let filter of filters.mainFilters">
33
{{filter.name}}
4-
<filter-dropdown [dropdown]="filter.items"></filter-dropdown>
4+
<filter-dropdown [dropdown]="filter.items" class="ml-2"></filter-dropdown>
55
</div>
66
<div class="filters-group">
77
{{filters.sortFilter.name}}
8-
<filter-dropdown [dropdown]="filters.sortFilter.items"></filter-dropdown>
8+
<filter-dropdown [dropdown]="filters.sortFilter.items" class="ml-2"></filter-dropdown>
99
</div>
1010
</div>

‎src/app/pages/inbox/inbox.template.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ <h1 class="page-title">Email - <span class="fw-semi-bold">Inbox</span></h1>
3232
</ul>
3333
<h6 class="mt text-white">QUICK VIEW</h6>
3434
<ul class="nav nav-pills flex-column nav-stacked nav-email-folders mb-lg fs-mini">
35-
<li class="nav-item"><a class="nav-link" href="#"><i class="fa fa-circle text-danger float-right"></i> Work </a>
35+
<li class="nav-item"><a class="nav-link" ><i class="fa fa-circle text-danger float-right"></i> Work </a>
3636
</li>
37-
<li class="nav-item"><a class="nav-link" href="#"><i class="fa fa-circle text-white float-right"></i> Private </a>
37+
<li class="nav-item"><a class="nav-link" ><i class="fa fa-circle text-white float-right"></i> Private </a>
3838
</li>
39-
<li class="nav-item"><a class="nav-link" href="#"><i class="fa fa-circle text-gray-light float-right"></i> Saved
39+
<li class="nav-item"><a class="nav-link" ><i class="fa fa-circle text-gray-light float-right"></i> Saved
4040
</a></li>
4141
</ul>
4242
</div>

‎src/app/pages/main/analytics/analytics.style.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@
1212
th {
1313
font-weight: $font-weight-normal;
1414
}
15-
15+
thead th {
16+
color: $white-dark;
17+
}
1618
tbody tr {
1719
td {
1820
min-width: 100px;
1921
border: none;
22+
color: $panel-opened-color;
2023
}
2124
}
2225
}

‎src/app/pages/main/analytics/analytics.template.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ <h5 *widgsterTitle>Support <span class='fw-semi-bold'>Requests</span></h5>
148148
<div class="table-responsive">
149149
<table class="table table-striped table-lg requests-table">
150150
<thead>
151-
<tr class="text-muted">
151+
<tr>
152152
<th>NAME</th>
153153
<th>EMAIL</th>
154154
<th>PRODUCT</th>

‎src/app/pages/main/widgets/widgets.style.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,11 @@
238238

239239
.post-user {
240240
position: relative;
241+
&.sing {
242+
margin-top: -5.1rem;
243+
margin-bottom: 2rem;
244+
}
245+
241246
@include clearfix();
242247

243248
img {

‎src/app/pages/main/widgets/widgets.template.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,18 +245,18 @@ <h6 class="text-muted mb-xs">Last Updated</h6>
245245
<section class="widget-chart-stats-simple" widgster [optionsControl]="false" [fullscreenControl]="false"
246246
[collapseControl]="false" bodyClass="mt-0" footerClass="bg-widget-transparent">
247247
<div class="widget-top-overflow widget-padding-md clearfix bg-warning text-dark-light">
248-
<h3 class="mt-lg mb-lg">Sing - <span class="fw-semi-bold">Next Generation</span> Admin Dashboard
248+
<h3 class="mt-lg mb-5">Sing - <span class="fw-semi-bold">Next Generation</span> Admin Dashboard
249249
Template</h3>
250250
<ul class="tags text-dark-light pull-right">
251251
<li><a href="#">features</a></li>
252252
</ul>
253253
</div>
254-
<div class="post-user mt-negative-lg">
254+
<div class="post-user sing">
255255
<span class="thumb-lg pull-left mr mt-n-sm">
256256
<img class="rounded-circle" src="assets/img/people/a4.jpg" alt="...">
257257
</span>
258258
<h6 class="my-2 fw-normal text-dark-light">Jeremy <small class="text-dark-light">@sing</small></h6>
259-
<p class="fs-mini text-muted"><time>25 mins</time> &nbsp; <i class="fa fa-map-marker"></i> &nbsp; near
259+
<p class="fs-mini"><time>25 mins</time> &nbsp; <i class="fa fa-map-marker"></i> &nbsp; near
260260
Amsterdam</p>
261261
</div>
262262
<p class="text-light fs-mini m">Lots of cool stuff is happening around you. Just calm down for a sec and listen.

‎src/app/pages/profile/profile.template.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@ <h6 class="author fs-sm fw-semi-bold">Ignacio Abad <small>6 mins ago</small></h6
151151
</div>
152152
<div class="btn-toolbar">
153153
<div class="btn-group">
154-
<a href="#" class="btn btn-sm btn-default">
154+
<a class="btn btn-sm btn-default">
155155
<i class="fa fa-camera fa-lg"></i>
156156
</a>
157-
<a href="#" class="btn btn-sm btn-default">
157+
<a class="btn btn-sm btn-default">
158158
<i class="fa fa-map-marker fa-lg"></i>
159159
</a>
160160
</div>

‎src/app/pages/ui-elements/buttons/buttons.template.html

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,29 @@ <h5 *widgsterTitle>
1313
Use any of the available button classes to quickly create a styled button.
1414
Semantically distinguishable beauty.
1515
</p>
16-
<p class="text-center">
17-
<button class="btn btn-secondary width-100 mb-xs" role="button">
16+
<p class="">
17+
<button class="btn btn-secondary width-100 mb-xs mr-3 mb-3" role="button">
1818
Secondary
1919
</button>
20-
<button class="btn btn-primary width-100 mb-xs" role="button">
20+
<button class="btn btn-primary width-100 mb-xs mr-3 mb-3" role="button">
2121
Primary
2222
</button>
23-
<button class="btn btn-info width-100 mb-xs" role="button">
23+
<button class="btn btn-info width-100 mb-xs mr-3 mb-3" role="button">
2424
Info
2525
</button>
26-
<button class="btn btn-success width-100 mb-xs" role="button">
26+
<button class="btn btn-success width-100 mr-3 mb-3" role="button">
2727
Success
2828
</button>
29-
<button class="btn btn-warning width-100 mb-xs" role="button">
29+
<button class="btn btn-warning width-100 mr-3 mb-3" role="button">
3030
Warning
3131
</button>
32-
<button class="btn btn-danger width-100 mb-xs" role="button">
32+
<button class="btn btn-danger width-100 mr-3 mb-3" role="button">
3333
Danger
3434
</button>
35-
<button class="btn btn-gray width-100 mb-xs" role="button">
35+
<button class="btn btn-gray width-100 mr-3 mb-3" role="button">
3636
Gray
3737
</button>
38-
<button class="btn btn-inverse width-100 mb-xs" role="button">
38+
<button class="btn btn-inverse width-100 mb-3" role="button">
3939
Inverse
4040
</button>
4141
</p>
@@ -50,10 +50,10 @@ <h5 *widgsterTitle>
5050
Fancy larger or smaller buttons? Four separate sizes available for all use cases: from
5151
tiny 10px button to large one.
5252
</p>
53-
<button type="button" class="btn btn-default btn-lg">Large button</button>
54-
<button type="button" class="btn btn-primary">Default button</button>
55-
<button type="button" class="btn btn-info btn-sm">Small button</button>
56-
<button type="button" class="btn btn-success btn-xs">Tiny button</button>
53+
<button type="button" class="btn btn-default btn-lg mr-3">Large button</button>
54+
<button type="button" class="btn btn-primary mr-3">Default button</button>
55+
<button type="button" class="btn btn-info btn-sm mr-3">Small button</button>
56+
<button type="button" class="btn btn-success btn-xs mr-3">Tiny button</button>
5757
</section>
5858
</div>
5959
<div class="col-md-6 col-12">
@@ -65,29 +65,29 @@ <h5 *widgsterTitle>
6565
In need of a button, but not the hefty background colors they bring? Use property to remove all background
6666
images and colors on any button.
6767
</p>
68-
<p class="text-center">
69-
<button class="btn btn-outline-secondary width-100 mb-xs" role="button">
68+
<p class="">
69+
<button class="btn btn-outline-secondary width-100 mr-3 mb-3" role="button">
7070
Secondary
7171
</button>
72-
<button class="btn btn-outline-primary width-100 mb-xs" role="button">
72+
<button class="btn btn-outline-primary width-100 mr-3 mb-3" role="button">
7373
Primary
7474
</button>
75-
<button class="btn btn-outline-info width-100 mb-xs" role="button">
75+
<button class="btn btn-outline-info width-100 mr-3 mb-3" role="button">
7676
Info
7777
</button>
78-
<button class="btn btn-outline-success width-100 mb-xs" role="button">
78+
<button class="btn btn-outline-success width-100 mr-3 mb-3" role="button">
7979
Success
8080
</button>
81-
<button class="btn btn-outline-warning width-100 mb-xs" role="button">
81+
<button class="btn btn-outline-warning width-100 mr-3 mb-3" role="button">
8282
Warning
8383
</button>
84-
<button class="btn btn-outline-danger width-100 mb-xs" role="button">
84+
<button class="btn btn-outline-danger width-100 mr-3 mb-3" role="button">
8585
Danger
8686
</button>
87-
<button class="btn btn-outline-gray width-100 mb-xs" role="button">
87+
<button class="btn btn-outline-gray width-100 mr-3 mb-3" role="button">
8888
Gray
8989
</button>
90-
<button class="btn btn-outline-inverse width-100 mb-xs" role="button">
90+
<button class="btn btn-outline-inverse width-100 mb-3" role="button">
9191
Inverse
9292
</button>
9393
</p>
@@ -103,29 +103,29 @@ <h5 *widgsterTitle>
103103
Semantically distinguishable beauty. Use
104104
<code>.btn-rounded</code> or <code>.btn-rounded-f</code>.
105105
</p>
106-
<p class="text-center">
107-
<button class="btn btn-default btn-rounded-f width-100 mb-xs" role="button">
106+
<p class="">
107+
<button class="btn btn-default btn-rounded-f width-100 mr-3 mb-3" role="button">
108108
Default
109109
</button>
110-
<button class="btn btn-primary btn-rounded-f width-100 mb-xs" role="button">
110+
<button class="btn btn-primary btn-rounded-f width-100 mr-3 mb-3" role="button">
111111
Primary
112112
</button>
113-
<button class="btn btn-info btn-rounded-f width-100 mb-xs" role="button">
113+
<button class="btn btn-info btn-rounded-f width-100 mr-3 mb-3" role="button">
114114
Info
115115
</button>
116-
<button class="btn btn-success btn-rounded-f width-100 mb-xs" role="button">
116+
<button class="btn btn-success btn-rounded-f width-100 mr-3 mb-3" role="button">
117117
Success
118118
</button>
119-
<button class="btn btn-outline-warning btn-rounded width-100 mb-xs" role="button">
119+
<button class="btn btn-outline-warning btn-rounded width-100 mr-3 mb-3" role="button">
120120
Warning
121121
</button>
122-
<button class="btn btn-outline-danger btn-rounded width-100 mb-xs" role="button">
122+
<button class="btn btn-outline-danger btn-rounded width-100 mr-3 mb-3" role="button">
123123
Danger
124124
</button>
125-
<button class="btn btn-outline-gray btn-rounded width-100 mb-xs" role="button">
125+
<button class="btn btn-outline-gray btn-rounded width-100 mr-3 mb-3" role="button">
126126
Gray
127127
</button>
128-
<button class="btn btn-outline-inverse btn-rounded width-100 mb-xs" role="button">
128+
<button class="btn btn-outline-inverse btn-rounded width-100 mb-3" role="button">
129129
Inverse
130130
</button>
131131
</p>
@@ -142,14 +142,14 @@ <h5 *widgsterTitle>
142142
Great for menu & social buttons.
143143
</p>
144144
<p>
145-
<button type="button" class="btn btn-info btn-block">Block Button</button>
145+
<button type="button" class="btn btn-info btn-block mb-3">Block Button</button>
146146
</p>
147147
<p>
148-
<button type="button" class="btn btn-default btn-block">Show Menu &nbsp;&nbsp;&nbsp;<i
148+
<button type="button" class="btn btn-default btn-block mb-3">Show Menu &nbsp;&nbsp;&nbsp;<i
149149
class="fa fa-bars"></i></button>
150150
</p>
151151
<p>
152-
<button type="button" class="btn btn-primary btn-block"><i class="fa fa-facebook"></i> Login mit
152+
<button type="button" class="btn btn-primary btn-block mb-3"><i class="fa fa-facebook"></i> Login mit
153153
Facebook</button>
154154
</p>
155155
<p>
@@ -167,11 +167,11 @@ <h5 *widgsterTitle>
167167
Add the <code>.disabled</code> class to <code>&lt;a&gt;</code> buttons.
168168
</p>
169169
<p>
170-
<button type="button" class="btn btn-primary" disabled="disabled">Primary button</button>
170+
<button type="button" class="btn btn-primary mr-3" disabled="disabled">Primary button</button>
171171
<button type="button" class="btn btn-default" disabled="disabled">Button</button>
172172
</p>
173173
<p>
174-
<a href="#" class="btn btn-success btn-sm disabled" role="button">Primary link</a>
174+
<a href="#" class="btn btn-success btn-sm disabled mr-3" role="button">Primary link</a>
175175
<a href="#" class="btn btn-default btn-sm disabled" role="button">Link</a>
176176
</p>
177177
</section>
@@ -185,7 +185,7 @@ <h5 *widgsterTitle>
185185
Group a series of buttons together on a single line with the button group.
186186
Add on optional JavaScript radio and checkbox style behavior with Bootstrap buttons plugin.
187187
</p>
188-
<div class="btn-group mb-2">
188+
<div class="btn-group mb-3">
189189
<button type="button" class="btn btn-default">Left</button>
190190
<button type="button" class="btn btn-default">Middle</button>
191191
<button type="button" class="btn btn-default">Right</button>
@@ -217,8 +217,8 @@ <h5 *widgsterTitle>
217217
navbar, tabs, and pills.
218218
Both solid & segmented dropdown options available.
219219
</p>
220-
<div class="mb-sm">
221-
<div class="btn-group dropdown" dropdown>
220+
<div class="mb-3">
221+
<div class="btn-group dropdown mr-3" dropdown>
222222
<button id="dropdown-btn-one" class="btn btn-danger dropdown-toggle" dropdownToggle>
223223
&nbsp; One &nbsp;
224224
</button>
@@ -231,7 +231,7 @@ <h5 *widgsterTitle>
231231
</ul>
232232
</div>
233233

234-
<div class="btn-group dropdown" dropdown>
234+
<div class="btn-group dropdown mr-3" dropdown>
235235
<button id="dropdown-btn-two" class="btn btn-default btn-sm dropdown-toggle" dropdownToggle>
236236
&nbsp; One &nbsp;
237237
<i class="fa fa-caret-down"></i>
@@ -246,7 +246,7 @@ <h5 *widgsterTitle>
246246
</div>
247247
</div>
248248
<div>
249-
<div class="btn-group dropdown" dropdown>
249+
<div class="btn-group dropdown mr-3" dropdown>
250250
<button id="dropdown-btn-three" class="btn btn-default">Gray</button>
251251
<button class="btn btn-default dropdown-toggle" dropdownToggle>
252252
</button>
@@ -287,7 +287,7 @@ <h4>
287287
Do more with buttons. Control button states or create groups of buttons for more components like toolbars.
288288
Add <code>data-toggle="buttons"</code> to a group of checkboxes for checkbox style toggling on btn-group.
289289
</p>
290-
<div class="mb-sm">
290+
<div class="mb-3">
291291
<div class="btn-group">
292292
<label class="btn btn-default" btnCheckbox [(ngModel)]="checkboxModel.left">
293293
Left way
@@ -322,7 +322,7 @@ <h4>
322322
Do more with buttons. Control button states or create groups of buttons for more components like toolbars.
323323
Add <code>data-toggle="buttons"</code> to a group of radio inputs for radio style toggling on btn-group.
324324
</p>
325-
<div class="mb-sm">
325+
<div class="mb-3">
326326
<div class="btn-group">
327327
<label class="btn btn-default" btnRadio="'Left'" [(ngModel)]="radioModel">
328328
Left way
@@ -358,30 +358,30 @@ <h4>
358358
inputs.
359359
Let your buttons shine!
360360
</p>
361-
<p class="text-center">
362-
<button class="btn btn-default width-100 mb-xs" role="button">
361+
<p class="mb-0">
362+
<button class="btn btn-default width-100 mr-3 mb-3" role="button">
363363
<i class="glyphicon glyphicon-tree-conifer text-success"></i>
364364
Forest
365365
</button>
366-
<button class="btn btn-default width-100 mb-xs" role="button">
366+
<button class="btn btn-default width-100 mr-3 mb-3" role="button">
367367
<i class="fa fa-check text-danger"></i>
368368
Submit
369369
</button>
370-
<button class="btn btn-default width-100 mb-xs" role="button">
370+
<button class="btn btn-default width-100 mr-3 mb-3" role="button">
371371
<i class="fa fa-facebook text-primary"></i>
372372
Login
373373
</button>
374374
</p>
375-
<p class="text-center">
376-
<button class="btn btn-default width-100 mb-xs" role="button">
375+
<p class="">
376+
<button class="btn btn-default width-100 mr-3 mb-3" role="button">
377377
<i class="fa fa-exclamation text-warning"></i>
378378
Error
379379
</button>
380-
<button class="btn btn-default width-100 mb-xs" role="button">
380+
<button class="btn btn-default width-100 mr-3 mb-3" role="button">
381381
<i class="glyphicon glyphicon-globe text-info"></i>
382382
<span class="text-info">Globe</span>
383383
</button>
384-
<button class="btn btn-default width-100 mb-xs" role="button">
384+
<button class="btn btn-default width-100 mb-3" role="button">
385385
<span class="circle bg-white">
386386
<i class="fa fa-map-marker text-gray"></i>
387387
</span>

0 commit comments

Comments
 (0)