Skip to content

Commit ec72c90

Browse files
einazareeinazare
authored
Merge pull request #7 from creativetimofficial/feature/update-to-v1.1.0
Feature: change date and fix broken links
2 parents 5c002e4 + 24f3505 commit ec72c90

38 files changed

+48
-47
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
- Changes to match [Argon Design System](https://www.creative-tim.com/product/argon-design-system?ref=adsr-changelog) by Creative Tim
66
- - `src/components/Footers/CardsFooter.js`
77
- - `src/views/IndexSections/Datepicker.js`
8+
- Solved build issue
89
### Major style changes
910
- Changed the whole scss/css files and folders to match those of [Argon Design System](https://www.creative-tim.com/product/argon-design-system?ref=adsr-changelog) by Creative Tim
1011
### Deleted components

‎Documentation/documentation.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
9-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
9+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
1010
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
1111
1212
* Coded by Creative Tim
@@ -53,7 +53,7 @@
5353
<!-- Argon CSS -->
5454
<link
5555
type="text/css"
56-
href="../src/assets/css/argon-design-system-react.css?v=1.0.1"
56+
href="../src/assets/css/argon-design-system-react.css?v=1.1.0"
5757
rel="stylesheet"
5858
/>
5959
</head>
@@ -117,7 +117,7 @@
117117
<div class="dropdown-menu dropdown-menu-xl">
118118
<div class="dropdown-menu-inner">
119119
<a
120-
href="https://demos.creative-tim.com/argon-design-system-react/documentation/#/overview?ref=adsr-static-docs"
120+
href="https://demos.creative-tim.com/argon-design-system-react/#/documentation/overview?ref=adsr-static-docs"
121121
class="media d-flex align-items-center"
122122
>
123123
<div
@@ -136,7 +136,7 @@ <h6 class="heading text-primary mb-md-1">
136136
</div>
137137
</a>
138138
<a
139-
href="https://demos.creative-tim.com/argon-design-system-react/documentation/colors?ref=adsr-static-docs"
139+
href="https://demos.creative-tim.com/argon-design-system-react/#/documentation/colors?ref=adsr-static-docs"
140140
class="media d-flex align-items-center"
141141
>
142142
<div
@@ -153,7 +153,7 @@ <h6 class="heading text-primary mb-md-1">Foundation</h6>
153153
</div>
154154
</a>
155155
<a
156-
href="https://demos.creative-tim.com/argon-design-system-react/documentation/alerts?ref=adsr-static-docs"
156+
href="https://demos.creative-tim.com/argon-design-system-react/#/documentation/alerts?ref=adsr-static-docs"
157157
class="media d-flex align-items-center"
158158
>
159159
<div
@@ -293,7 +293,7 @@ <h5 class="heading text-warning mb-md-1">Components</h5>
293293
</p>
294294
<div class="btn-wrapper mt-5">
295295
<a
296-
href="https://demos.creative-tim.com/argon-design-system-react/documentation/#/overview?ref=adsr-static-docs"
296+
href="https://demos.creative-tim.com/argon-design-system-react/#/documentation/overview?ref=adsr-static-docs"
297297
class="btn btn-lg btn-white btn-icon mb-3 mb-sm-0"
298298
>
299299
<span class="btn-inner--icon"

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019 Creative Tim
3+
Copyright (c) 2020 Creative Tim
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ We use GitHub Issues as the official bug tracker for the Argon Design System Rea
200200

201201
## Licensing
202202

203-
- Copyright 2018 Creative Tim (https://www.creative-tim.com/?ref=adsr-github-readme)
203+
- Copyright 2020 Creative Tim (https://www.creative-tim.com/?ref=adsr-github-readme)
204204

205205
- Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md?ref=creativetim)
206206

‎public/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
=========================================================
77
88
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
9-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
9+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
1010
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
1111
1212
* Coded by Creative Tim

‎src/assets/css/argon-design-system-react.css‎

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

‎src/assets/css/argon-design-system-react.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/assets/scss/argon-design-system/icons.scss‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323

2424
.icon-xl + .icon-text {
25-
width: calc(100% - $icon-size-xl - 1);
25+
width: calc(100% - #{$icon-size-xl} - 1);
2626
}
2727

2828
.icon-lg {
@@ -35,7 +35,7 @@
3535
}
3636

3737
.icon-lg + .icon-text {
38-
width: calc(100% - $icon-size-lg - 1);
38+
width: calc(100% - #{$icon-size-lg} - 1);
3939
}
4040

4141
.icon-sm {
@@ -48,7 +48,7 @@
4848
}
4949

5050
.icon-sm + .icon-text {
51-
width: calc(100% - $icon-size-sm - 1);
51+
width: calc(100% - #{$icon-size-sm} - 1);
5252
}
5353

5454
// Extra Small icon
@@ -62,7 +62,7 @@
6262
}
6363

6464
+ .icon-text {
65-
width: calc(100% - $icon-size-xs - 1);
65+
width: calc(100% - #{$icon-size-xs} - 1);
6666
}
6767
}
6868

‎src/assets/scss/react/react-differences.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
8-
* Copyright 2018 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
1010
1111
* Coded by www.creative-tim.com

‎src/components/Footers/CardsFooter.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
=========================================================
66
77
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
8-
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
8+
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
99
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
1010
1111
* Coded by Creative Tim

0 commit comments

Comments
 (0)