Skip to content

Commit

Permalink
Merge pull request #78 from maisamaf/feature/v1.2.4
Browse files Browse the repository at this point in the history
update dependencies
  • Loading branch information
sajadevo authored Jan 1, 2024
2 parents 97aa096 + 2786ea9 commit 1a9e473
Show file tree
Hide file tree
Showing 31 changed files with 69 additions and 65 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## [1.2.4] 2024-01-01

- Update dependencies

## [1.2.3] 2023-05-23

- Update dependencies
Expand Down
4 changes: 2 additions & 2 deletions Documentation/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# [Argon Dashboard React](https://demos.creative-tim.com/argon-dashboard-react?ref=adr-github-readme) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Argon%20Dashboard%20is%20a%20Free%20Bootstrap%204,%20React%20and%20Reactstrap%20Dashboard%20made%20using%20create-react-app%20%E2%9D%A4%EF%B8%8F%0Ahttps%3A//demos.creative-tim.com/argon-dashboard-react%20%23react%20%23reactstrap%20%23createreactapp%20%23argon%20%23argondesign%20%23reactdashboard%20%23argonreact%20%23reactdesign%20%23bootstrap%20%23material%20%23design%20%23uikit%20%23freebie%20%20via%20%40CreativeTim)

![version](https://img.shields.io/badge/version-1.2.3-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/argon-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/argon-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-react/issues?q=is%3Aissue+is%3Aclosed) [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim-general/Lobby) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
![version](https://img.shields.io/badge/version-1.2.4-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/argon-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/argon-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/argon-dashboard-react/issues?q=is%3Aissue+is%3Aclosed) [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim-general/Lobby) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)

![Product Gif](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/argon-dashboard-react/argon-dashboard-react.gif)

Expand Down Expand Up @@ -213,7 +213,7 @@ We use GitHub Issues as the official bug tracker for the Material Kit. Here are

## Licensing

- Copyright 2023 Creative Tim (https://www.creative-tim.com/?ref=adr-github-readme)
- Copyright 2024 Creative Tim (https://www.creative-tim.com/?ref=adr-github-readme)

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

Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "argon-dashboard-react",
"version": "1.2.3",
"version": "1.2.4",
"description": "React version of Argon Dashboard by Creative Tim",
"main": "index.js",
"repository": {
Expand Down Expand Up @@ -43,7 +43,7 @@
"not op_mini all"
],
"dependencies": {
"@fortawesome/fontawesome-free": "6.4.0",
"@fortawesome/fontawesome-free": "6.5.1",
"bootstrap": "4.6.2",
"chart.js": "2.9.4",
"classnames": "2.3.2",
Expand All @@ -54,18 +54,18 @@
"react-copy-to-clipboard": "5.1.0",
"react-datetime": "3.2.0",
"react-dom": "18.2.0",
"react-router-dom": "6.11.1",
"react-router-dom": "6.21.1",
"react-scripts": "5.0.1",
"reactstrap": "8.10.0",
"sass": "1.62.1"
"sass": "1.69.5"
},
"peerDependencies": {
"react": ">=16.0.0",
"react-dom": ">=16.0.0"
"devDependencies": {
"gulp": "4.0.2",
"gulp-append-prepend": "1.0.9"
},
"optionalDependencies": {
"eslint-plugin-flowtype": "8.0.3",
"typescript": "5.0.4"
"typescript": "5.3.3"
},
"overrides": {
"svgo": "3.0.2",
Expand Down
4 changes: 2 additions & 2 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/assets/css/argon-dashboard-react.css

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

4 changes: 2 additions & 2 deletions src/assets/css/argon-dashboard-react.min.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/assets/scss/argon-dashboard-react.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/assets/scss/argon-dashboard/custom/_content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
// Container
.container-fluid {
@include media-breakpoint-up(md) {
padding-left: ($main-content-padding-x + $grid-gutter-width / 2) !important;
padding-right: ($main-content-padding-x + $grid-gutter-width / 2) !important;
padding-left: ($main-content-padding-x + calc($grid-gutter-width / 2)) !important;
padding-right: ($main-content-padding-x + calc($grid-gutter-width / 2)) !important;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/assets/scss/argon-dashboard/custom/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ $h5-font-size: $font-size-base * .8125 !default;
$h6-font-size: $font-size-base * .625 !default;


$headings-margin-bottom: ($spacer / 2);
$headings-margin-bottom: calc($spacer / 2);
$headings-font-family: inherit !default;
$headings-font-weight: $font-weight-bold !default;
$headings-line-height: 1.5 !default;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
border: none;

.dropdown-menu {
margin-left: $dropdown-item-padding-x / 2;
margin-left: calc($dropdown-item-padding-x / 2);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/assets/scss/argon-dashboard/docs/_component-examples.scss
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@

.ct-example {
position: relative;
margin: 1rem (-$grid-gutter-width / 2) 0;
margin: 1rem -calc($grid-gutter-width / 2) 0;
@include clearfix();

@include media-breakpoint-up(sm) {
Expand Down Expand Up @@ -420,8 +420,8 @@
}

.ct-content .highlight {
margin-right: (-$grid-gutter-width / 2);
margin-left: (-$grid-gutter-width / 2);
margin-right: -calc($grid-gutter-width / 2);
margin-left: -calc($grid-gutter-width / 2);

@include media-breakpoint-up(sm) {
margin-right: 0;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Footers/AdminFooter.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/components/Footers/AuthFooter.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/components/Headers/Header.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/components/Headers/UserHeader.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/components/Navbars/AdminNavbar.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/components/Navbars/AuthNavbar.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/components/Sidebar/Sidebar.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-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
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/layouts/Admin.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/layouts/Auth.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/routes.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/variables/charts.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/views/Index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/views/examples/Icons.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/views/examples/Login.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Argon Dashboard React - v1.2.3
* Argon Dashboard React - v1.2.4
=========================================================
* Product Page: https://www.creative-tim.com/product/argon-dashboard-react
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Copyright 2024 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard-react/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand Down
Loading

0 comments on commit 1a9e473

Please sign in to comment.