Skip to content

Commit 200952e

Browse files
mrholekmrholek
committed
- update: Bootstrap version to v4.0.0-beta.2
- refactor: Remove old SCSS variables - refactor: Breadcrumb Menu styles - fix: External links issue - fix: Mobile sidebar-nav height issue
1 parent d915b2f commit 200952e

File tree

146 files changed

+2281
-1794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+2281
-1794
lines changed

Diff for: ‎Angular4_CLI_Full_Project/.angular-cli.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"project": {
4-
"version": "1.0.2",
4+
"version": "1.0.3",
55
"name": "@coreui/angular"
66
},
77
"apps": [

Diff for: ‎Angular4_CLI_Full_Project/package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/angular",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"description": "",
55
"author": "",
66
"url": "http://coreui.io",
@@ -28,7 +28,6 @@
2828
"chart.js": "2.7.0",
2929
"core-js": "2.5.1",
3030
"font-awesome": "^4.7.0",
31-
"is-url-external": "^1.0.3",
3231
"moment": "2.19.1",
3332
"ng2-charts": "1.6.0",
3433
"ngx-bootstrap": "1.9.3",

Diff for: ‎Angular4_CLI_Full_Project/src/app/components/app-header/app-header.component.html

-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@
185185
<li class="nav-item dropdown" dropdown placement="bottom right">
186186
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false" dropdownToggle (click)="false">
187187
<img src="assets/img/avatars/6.jpg" class="img-avatar" alt="[email protected]"/>
188-
<span class="d-md-down-none">admin</span>
189188
</a>
190189
<div class="dropdown-menu dropdown-menu-right" *dropdownMenu aria-labelledby="simple-dropdown">
191190
<div class="dropdown-header text-center"><strong>Account</strong></div>

Diff for: ‎Angular4_CLI_Full_Project/src/app/components/app-sidebar-nav/app-sidebar-nav.component.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ export class AppSidebarNavItemComponent {
7676

7777
}
7878

79-
import isExternal from 'is-url-external'
80-
8179
@Component({
8280
selector: 'app-sidebar-nav-link',
8381
template: `
@@ -110,7 +108,7 @@ export class AppSidebarNavLinkComponent {
110108
}
111109

112110
public isExternalLink() {
113-
return isExternal(this.link.url)
111+
return this.link.url.substring(0, 4) === 'http' ? true : false
114112
}
115113

116114
public isIcon() {

Diff for: ‎Angular4_CLI_Full_Project/src/app/directives/replace/replace.directive.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Directive, ElementRef, OnInit } from '@angular/core';
22

33
@Directive({
44
// tslint:disable-next-line:max-line-length
5-
selector: '[appHostReplace], app-aside, app-footer, app-header, app-sidebar, app-sidebar-footer, app-sidebar-form, app-sidebar-header, app-sidebar-minimizer, app-sidebar-nav, app-sidebar-nav-dropdown, app-sidebar-nav-item, app-sidebar-nav-link, app-sidebar-nav-title'
5+
selector: '[appHostReplace], app-aside, app-breadcrumbs, app-footer, app-header, app-sidebar, app-sidebar-footer, app-sidebar-form, app-sidebar-header, app-sidebar-minimizer, app-sidebar-nav, app-sidebar-nav-dropdown, app-sidebar-nav-item, app-sidebar-nav-link, app-sidebar-nav-title'
66
})
77
export class ReplaceDirective implements OnInit {
88

Diff for: ‎Angular4_CLI_Full_Project/src/app/views/components/forms.component.html

+33-33
Original file line numberDiff line numberDiff line change
@@ -114,46 +114,46 @@
114114
<div class="card-body">
115115
<form action="" method="post" enctype="multipart/form-data" class="form-horizontal">
116116
<div class="form-group row">
117-
<label class="col-md-3 form-control-label">Static</label>
117+
<label class="col-md-3 col-form-label">Static</label>
118118
<div class="col-md-9">
119119
<p class="form-control-static">Username</p>
120120
</div>
121121
</div>
122122
<div class="form-group row">
123-
<label class="col-md-3 form-control-label" for="text-input">Text Input</label>
123+
<label class="col-md-3 col-form-label" for="text-input">Text Input</label>
124124
<div class="col-md-9">
125125
<input type="text" id="text-input" name="text-input" class="form-control" placeholder="Text">
126126
<span class="help-block">This is a help text</span>
127127
</div>
128128
</div>
129129
<div class="form-group row">
130-
<label class="col-md-3 form-control-label" for="email-input">Email Input</label>
130+
<label class="col-md-3 col-form-label" for="email-input">Email Input</label>
131131
<div class="col-md-9">
132132
<input type="email" id="email-input" name="email-input" class="form-control" placeholder="Enter Email">
133133
<span class="help-block">Please enter your email</span>
134134
</div>
135135
</div>
136136
<div class="form-group row">
137-
<label class="col-md-3 form-control-label" for="password-input">Password</label>
137+
<label class="col-md-3 col-form-label" for="password-input">Password</label>
138138
<div class="col-md-9">
139139
<input type="password" id="password-input" name="password-input" class="form-control" placeholder="Password">
140140
<span class="help-block">Please enter a complex password</span>
141141
</div>
142142
</div>
143143
<div class="form-group row">
144-
<label class="col-md-3 form-control-label" for="disabled-input">Disabled Input</label>
144+
<label class="col-md-3 col-form-label" for="disabled-input">Disabled Input</label>
145145
<div class="col-md-9">
146146
<input type="text" id="disabled-input" name="disabled-input" class="form-control" placeholder="Disabled" disabled>
147147
</div>
148148
</div>
149149
<div class="form-group row">
150-
<label class="col-md-3 form-control-label" for="textarea-input">Textarea</label>
150+
<label class="col-md-3 col-form-label" for="textarea-input">Textarea</label>
151151
<div class="col-md-9">
152152
<textarea id="textarea-input" name="textarea-input" rows="9" class="form-control" placeholder="Content.."></textarea>
153153
</div>
154154
</div>
155155
<div class="form-group row">
156-
<label class="col-md-3 form-control-label" for="select">Select</label>
156+
<label class="col-md-3 col-form-label" for="select">Select</label>
157157
<div class="col-md-9">
158158
<select id="select" name="select" class="form-control">
159159
<option value="0">Please select</option>
@@ -164,7 +164,7 @@
164164
</div>
165165
</div>
166166
<div class="form-group row">
167-
<label class="col-md-3 form-control-label" for="select">Select Large</label>
167+
<label class="col-md-3 col-form-label" for="select">Select Large</label>
168168
<div class="col-md-9">
169169
<select id="select" name="select" class="form-control form-control-lg">
170170
<option value="0">Please select</option>
@@ -175,7 +175,7 @@
175175
</div>
176176
</div>
177177
<div class="form-group row">
178-
<label class="col-md-3 form-control-label" for="select">Select Small</label>
178+
<label class="col-md-3 col-form-label" for="select">Select Small</label>
179179
<div class="col-md-9">
180180
<select id="select" name="select" class="form-control form-control-sm">
181181
<option value="0">Please select</option>
@@ -186,7 +186,7 @@
186186
</div>
187187
</div>
188188
<div class="form-group row">
189-
<label class="col-md-3 form-control-label" for="select">Disabled Select</label>
189+
<label class="col-md-3 col-form-label" for="select">Disabled Select</label>
190190
<div class="col-md-9">
191191
<select id="disabledSelect" class="form-control" disabled>
192192
<option value="0">Please select</option>
@@ -197,7 +197,7 @@
197197
</div>
198198
</div>
199199
<div class="form-group row">
200-
<label class="col-md-3 form-control-label" for="multiple-select">Multiple select</label>
200+
<label class="col-md-3 col-form-label" for="multiple-select">Multiple select</label>
201201
<div class="col-md-9">
202202
<select id="multiple-select" name="multiple-select" class="form-control" size="5" multiple>
203203
<option value="1">Option #1</option>
@@ -214,7 +214,7 @@
214214
</div>
215215
</div>
216216
<div class="form-group row">
217-
<label class="col-md-3 form-control-label">Radios</label>
217+
<label class="col-md-3 col-form-label">Radios</label>
218218
<div class="col-md-9">
219219
<div class="radio">
220220
<label for="radio1">
@@ -234,7 +234,7 @@
234234
</div>
235235
</div>
236236
<div class="form-group row">
237-
<label class="col-md-3 form-control-label">Inline Radios</label>
237+
<label class="col-md-3 col-form-label">Inline Radios</label>
238238
<div class="col-md-9">
239239
<label class="radio-inline" for="inline-radio1">
240240
<input type="radio" id="inline-radio1" name="inline-radios" value="option1"> One
@@ -248,7 +248,7 @@
248248
</div>
249249
</div>
250250
<div class="form-group row">
251-
<label class="col-md-3 form-control-label">Checkboxes</label>
251+
<label class="col-md-3 col-form-label">Checkboxes</label>
252252
<div class="col-md-9">
253253
<div class="checkbox">
254254
<label for="checkbox1">
@@ -268,7 +268,7 @@
268268
</div>
269269
</div>
270270
<div class="form-group row">
271-
<label class="col-md-3 form-control-label">Inline Checkboxes</label>
271+
<label class="col-md-3 col-form-label">Inline Checkboxes</label>
272272
<div class="col-md-9">
273273
<label class="checkbox-inline" for="inline-checkbox1">
274274
<input type="checkbox" id="inline-checkbox1" name="inline-checkbox1" value="option1">One
@@ -282,13 +282,13 @@
282282
</div>
283283
</div>
284284
<div class="form-group row">
285-
<label class="col-md-3 form-control-label" for="file-input">File input</label>
285+
<label class="col-md-3 col-form-label" for="file-input">File input</label>
286286
<div class="col-md-9">
287287
<input type="file" id="file-input" name="file-input">
288288
</div>
289289
</div>
290290
<div class="form-group row">
291-
<label class="col-md-3 form-control-label" for="file-multiple-input">Multiple File input</label>
291+
<label class="col-md-3 col-form-label" for="file-multiple-input">Multiple File input</label>
292292
<div class="col-md-9">
293293
<input type="file" id="file-multiple-input" name="file-multiple-input" multiple>
294294
</div>
@@ -330,14 +330,14 @@
330330
<div class="card-body">
331331
<form action="" method="post" class="form-horizontal">
332332
<div class="form-group row">
333-
<label class="col-md-3 form-control-label" for="hf-email">Email</label>
333+
<label class="col-md-3 col-form-label" for="hf-email">Email</label>
334334
<div class="col-md-9">
335335
<input type="email" id="hf-email" name="hf-email" class="form-control" placeholder="Enter Email..">
336336
<span class="help-block">Please enter your email</span>
337337
</div>
338338
</div>
339339
<div class="form-group row">
340-
<label class="col-md-3 form-control-label" for="hf-password">Password</label>
340+
<label class="col-md-3 col-form-label" for="hf-password">Password</label>
341341
<div class="col-md-9">
342342
<input type="password" id="hf-password" name="hf-password" class="form-control" placeholder="Enter Password..">
343343
<span class="help-block">Please enter your password</span>
@@ -445,19 +445,19 @@
445445
<div class="card-body">
446446
<form action="" method="post" class="form-horizontal">
447447
<div class="form-group row">
448-
<label class="col-sm-5 form-control-label" for="input-small">Small Input</label>
448+
<label class="col-sm-5 col-form-label" for="input-small">Small Input</label>
449449
<div class="col-sm-6">
450450
<input type="text" id="input-small" name="input-small" class="form-control form-control-sm" placeholder=".form-control-sm">
451451
</div>
452452
</div>
453453
<div class="form-group row">
454-
<label class="col-sm-5 form-control-label" for="input-normal">Normal Input</label>
454+
<label class="col-sm-5 col-form-label" for="input-normal">Normal Input</label>
455455
<div class="col-sm-6">
456456
<input type="text" id="input-normal" name="input-normal" class="form-control" placeholder="Normal">
457457
</div>
458458
</div>
459459
<div class="form-group row">
460-
<label class="col-sm-5 form-control-label" for="input-large">Large Input</label>
460+
<label class="col-sm-5 col-form-label" for="input-large">Large Input</label>
461461
<div class="col-sm-6">
462462
<input type="text" id="input-large" name="input-large" class="form-control form-control-lg" placeholder=".form-control-lg">
463463
</div>
@@ -479,15 +479,15 @@
479479
</div>
480480
<div class="card-body">
481481
<div class="form-group has-success">
482-
<label class="form-form-control-label" for="inputSuccess1">Input with success</label>
482+
<label class="form-col-form-label" for="inputSuccess1">Input with success</label>
483483
<input type="text" class="form-control" id="inputSuccess1">
484484
</div>
485485
<div class="form-group has-warning">
486-
<label class="form-form-control-label" for="inputWarning1">Input with warning</label>
486+
<label class="form-col-form-label" for="inputWarning1">Input with warning</label>
487487
<input type="text" class="form-control" id="inputWarning1">
488488
</div>
489489
<div class="form-group has-danger">
490-
<label class="form-form-control-label" for="inputError1">Input with error</label>
490+
<label class="form-col-form-label" for="inputError1">Input with error</label>
491491
<input type="text" class="form-control" id="inputError1">
492492
</div>
493493
</div>
@@ -500,15 +500,15 @@
500500
</div>
501501
<div class="card-body">
502502
<div class="form-group has-success">
503-
<label class="form-form-control-label" for="inputSuccess2">Input with success</label>
503+
<label class="form-col-form-label" for="inputSuccess2">Input with success</label>
504504
<input type="text" class="form-control form-control-success" id="inputSuccess2">
505505
</div>
506506
<div class="form-group has-warning">
507-
<label class="form-form-control-label" for="inputWarning2">Input with warning</label>
507+
<label class="form-col-form-label" for="inputWarning2">Input with warning</label>
508508
<input type="text" class="form-control form-control-warning" id="inputWarning2">
509509
</div>
510510
<div class="form-group has-danger has-feedback">
511-
<label class="form-form-control-label" for="inputError2">Input with error</label>
511+
<label class="form-col-form-label" for="inputError2">Input with error</label>
512512
<input type="text" class="form-control form-control-danger" id="inputError2">
513513
</div>
514514
</div>
@@ -934,7 +934,7 @@
934934
<div class="card-body">
935935
<form class="form-horizontal">
936936
<div class="form-group">
937-
<label class="form-control-label" for="prependedInput">Prepended text</label>
937+
<label class="col-form-label" for="prependedInput">Prepended text</label>
938938
<div class="controls">
939939
<div class="input-prepend input-group">
940940
<span class="input-group-addon">@</span>
@@ -944,7 +944,7 @@
944944
</div>
945945
</div>
946946
<div class="form-group">
947-
<label class="form-control-label" for="appendedInput">Appended text</label>
947+
<label class="col-form-label" for="appendedInput">Appended text</label>
948948
<div class="controls">
949949
<div class="input-group">
950950
<input id="appendedInput" class="form-control" size="16" type="text">
@@ -954,7 +954,7 @@
954954
</div>
955955
</div>
956956
<div class="form-group">
957-
<label class="form-control-label" for="appendedPrependedInput">Append and prepend</label>
957+
<label class="col-form-label" for="appendedPrependedInput">Append and prepend</label>
958958
<div class="controls">
959959
<div class="input-prepend input-group">
960960
<span class="input-group-addon">$</span>
@@ -964,7 +964,7 @@
964964
</div>
965965
</div>
966966
<div class="form-group">
967-
<label class="form-control-label" for="appendedInputButton">Append with button</label>
967+
<label class="col-form-label" for="appendedInputButton">Append with button</label>
968968
<div class="controls">
969969
<div class="input-group">
970970
<input id="appendedInputButton" class="form-control" size="16" type="text">
@@ -975,7 +975,7 @@
975975
</div>
976976
</div>
977977
<div class="form-group">
978-
<label class="form-control-label" for="appendedInputButtons">Two-button append</label>
978+
<label class="col-form-label" for="appendedInputButtons">Two-button append</label>
979979
<div class="controls">
980980
<div class="input-group">
981981
<input id="appendedInputButtons" size="16" class="form-control" type="text">

Diff for: ‎Angular4_CLI_Full_Project/src/app/views/dashboard/dashboard.component.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -695,9 +695,9 @@ <h4 class="card-title mb-0">Traffic</h4>
695695
</div><!--/.col-->
696696
</div><!--/.row-->
697697
<br>
698-
<div class="table-responsive"></div>
699-
<table class="table table-responsive table-hover table-outline mb-0">
700-
<thead class="thead-default">
698+
<div class="table-responsive-sm"></div>
699+
<table class="table table-responsive-sm table-hover table-outline mb-0">
700+
<thead class="thead-light">
701701
<tr>
702702
<th class="text-center"><i class="icon-people"></i></th>
703703
<th>User</th>

Diff for: ‎Angular4_CLI_Full_Project/src/app/views/pages/login.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="container">
33
<div class="row justify-content-center">
44
<div class="col-md-8">
5-
<div class="card-group mb-0">
5+
<div class="card-group">
66
<div class="card p-4">
77
<div class="card-body">
88
<h1>Login</h1>

Diff for: ‎Angular4_CLI_Full_Project/src/app/views/widgets/widgets.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ <h4 class="mb-0">9.823</h4>
736736
</div><!--/.col-->
737737
</div><!--/.row-->
738738

739-
<div class="card-group">
739+
<div class="card-group mb-4">
740740
<div class="card">
741741
<div class="card-body">
742742
<div class="h1 text-muted text-right mb-4">

Diff for: ‎Angular4_CLI_Full_Project/src/scss/_bootstrap-variables.scss

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ $font-size-base: 0.875rem;
7676
// Breadcrumbs
7777

7878
$breadcrumb-bg: #fff;
79+
$breadcrumb-margin-bottom: 1.5rem;
7980

8081
// Cards
8182

Diff for: ‎Angular4_CLI_Full_Project/src/scss/bootstrap/_alert.scss

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
//
44

55
.alert {
6+
position: relative;
67
padding: $alert-padding-y $alert-padding-x;
78
margin-bottom: $alert-margin-bottom;
89
border: $alert-border-width solid transparent;
@@ -28,9 +29,9 @@
2829
.alert-dismissible {
2930
// Adjust close link position
3031
.close {
31-
position: relative;
32-
top: -$alert-padding-y;
33-
right: -$alert-padding-x;
32+
position: absolute;
33+
top: 0;
34+
right: 0;
3435
padding: $alert-padding-y $alert-padding-x;
3536
color: inherit;
3637
}

Diff for: ‎Angular4_CLI_Full_Project/src/scss/bootstrap/_badge.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@
99
font-size: $badge-font-size;
1010
font-weight: $badge-font-weight;
1111
line-height: 1;
12-
color: $badge-color;
1312
text-align: center;
1413
white-space: nowrap;
1514
vertical-align: baseline;
16-
@include border-radius();
15+
@include border-radius($badge-border-radius);
1716

1817
// Empty badges collapse automatically
1918
&:empty {

0 commit comments

Comments
 (0)