Skip to content

Commit

Permalink
Merge pull request #7 from creativetimofficial/feature/update-to-v1.1.0
Browse files Browse the repository at this point in the history
Feature: change date and fix broken links
  • Loading branch information
einazare authored Feb 14, 2020
2 parents 5c002e4 + 24f3505 commit ec72c90
Show file tree
Hide file tree
Showing 38 changed files with 48 additions and 47 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- Changes to match [Argon Design System](https://www.creative-tim.com/product/argon-design-system?ref=adsr-changelog) by Creative Tim
- - `src/components/Footers/CardsFooter.js`
- - `src/views/IndexSections/Datepicker.js`
- Solved build issue
### Major style changes
- 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
### Deleted components
Expand Down
12 changes: 6 additions & 6 deletions Documentation/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down Expand Up @@ -53,7 +53,7 @@
<!-- Argon CSS -->
<link
type="text/css"
href="../src/assets/css/argon-design-system-react.css?v=1.0.1"
href="../src/assets/css/argon-design-system-react.css?v=1.1.0"
rel="stylesheet"
/>
</head>
Expand Down Expand Up @@ -117,7 +117,7 @@
<div class="dropdown-menu dropdown-menu-xl">
<div class="dropdown-menu-inner">
<a
href="https://demos.creative-tim.com/argon-design-system-react/documentation/#/overview?ref=adsr-static-docs"
href="https://demos.creative-tim.com/argon-design-system-react/#/documentation/overview?ref=adsr-static-docs"
class="media d-flex align-items-center"
>
<div
Expand All @@ -136,7 +136,7 @@ <h6 class="heading text-primary mb-md-1">
</div>
</a>
<a
href="https://demos.creative-tim.com/argon-design-system-react/documentation/colors?ref=adsr-static-docs"
href="https://demos.creative-tim.com/argon-design-system-react/#/documentation/colors?ref=adsr-static-docs"
class="media d-flex align-items-center"
>
<div
Expand All @@ -153,7 +153,7 @@ <h6 class="heading text-primary mb-md-1">Foundation</h6>
</div>
</a>
<a
href="https://demos.creative-tim.com/argon-design-system-react/documentation/alerts?ref=adsr-static-docs"
href="https://demos.creative-tim.com/argon-design-system-react/#/documentation/alerts?ref=adsr-static-docs"
class="media d-flex align-items-center"
>
<div
Expand Down Expand Up @@ -293,7 +293,7 @@ <h5 class="heading text-warning mb-md-1">Components</h5>
</p>
<div class="btn-wrapper mt-5">
<a
href="https://demos.creative-tim.com/argon-design-system-react/documentation/#/overview?ref=adsr-static-docs"
href="https://demos.creative-tim.com/argon-design-system-react/#/documentation/overview?ref=adsr-static-docs"
class="btn btn-lg btn-white btn-icon mb-3 mb-sm-0"
>
<span class="btn-inner--icon"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 Creative Tim
Copyright (c) 2020 Creative Tim

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ We use GitHub Issues as the official bug tracker for the Argon Design System Rea

## Licensing

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

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

Expand Down
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/assets/css/argon-design-system-react.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/assets/css/argon-design-system-react.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/assets/scss/argon-design-system/icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}

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

.icon-lg {
Expand All @@ -35,7 +35,7 @@
}

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

.icon-sm {
Expand All @@ -48,7 +48,7 @@
}

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

// Extra Small icon
Expand All @@ -62,7 +62,7 @@
}

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

Expand Down
2 changes: 1 addition & 1 deletion src/assets/scss/react/react-differences.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2018 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by www.creative-tim.com
Expand Down
2 changes: 1 addition & 1 deletion src/components/Footers/CardsFooter.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/components/Footers/SimpleFooter.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/components/Navbars/DemoNavbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand All @@ -21,7 +21,7 @@ import { BrowserRouter, Route, Switch, Redirect } from "react-router-dom";

import "assets/vendor/nucleo/css/nucleo.css";
import "assets/vendor/font-awesome/css/font-awesome.min.css";
import "assets/scss/argon-design-system-react.scss";
import "assets/scss/argon-design-system-react.scss?v1.1.0";

import Index from "views/Index.js";
import Landing from "views/examples/Landing.js";
Expand Down
2 changes: 1 addition & 1 deletion src/views/Index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Alerts.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Buttons.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Carousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/CustomControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Datepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Download.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Hero.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Inputs.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Labels.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Login.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Menus.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Modals.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Navbars.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Pagination.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Pills.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Progress.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/TooltipPopover.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
2 changes: 1 addition & 1 deletion src/views/IndexSections/Typography.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-design-system-react
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-design-system-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
Loading

0 comments on commit ec72c90

Please sign in to comment.