Merge pull request #22 from creativetimofficial/feature/v1.1.0

Feature/v1.1.0
creativetimofficial · Jun 9, 2021 · a90ba01 · a90ba01
2 parents 95ea17d + c113d3a
commit a90ba01
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Change Log
 
+## [1.1.0] 2021-06-10
+
+### New Features
+
+-   Add the download button
+
+### Bug Fixing
+
+-   Fix the dropdown of admin navbar
+
 ## [1.0.0] 2021-06-08
 
 ### Original Release

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # [Material Tailwind Dashboard React](https://demos.creative-tim.com/material-tailwind-dashboard-react/#/?ref=readme-mtdr)
 
-![version](https://img.shields.io/badge/version-1.0.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-tailwind-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/material-tailwind-dashboard-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-tailwind-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/material-tailwind-dashboard-react/issues?q=is%3Aissue+is%3Aclosed)
+![version](https://img.shields.io/badge/version-1.1.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-tailwind-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/material-tailwind-dashboard-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/material-tailwind-dashboard-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/material-tailwind-dashboard-react/issues?q=is%3Aissue+is%3Aclosed)
 
 ![Image](https://s3.amazonaws.com/creativetim_bucket/products/488/original/opt_md_tailwindreact_thumbnail.jpg)
 

diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "material-tailwind-dashboard-react",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "private": true,
   "homepage": "https://demos.creative-tim.com/material-tailwind-dashboard-react/#/",
   "dependencies": {
-    "@material-tailwind/react": "^0.3.3",
+    "@material-tailwind/react": "^0.3.4",
     "@react-google-maps/api": "^2.1.1",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
@@ -50,7 +50,7 @@
     "npm-run-all": "^4.1.5",
     "postcss": "^8.2.13",
     "postcss-cli": "^8.3.1",
-    "tailwindcss": "^2.1.2"
+    "tailwindcss": "^2.1.4"
   },
   "optionalDependencies": {
     "@babel/core": "7.14.0",

diff --git a/public/index.html b/public/index.html
@@ -1,7 +1,7 @@
 <!-- 
 /*!
 =========================================================
-* Material Tailwind Dashboard React - v1.0.0
+* Material Tailwind Dashboard React - v1.1.0
 =========================================================
 * Product Page: https://www.creative-tim.com/product/material-tailwind-dashboard-react
 * Copyright 2019 Creative Tim (https://www.creative-tim.com)

diff --git a/src/assets/styles/index.css b/src/assets/styles/index.css
@@ -1,6 +1,6 @@
 /*!
 =========================================================
-* Material Tailwind Dashboard React - v1.0.0
+* Material Tailwind Dashboard React - v1.1.0
 =========================================================
 * Product Page: https://www.creative-tim.com/product/material-tailwind-dashboard-react
 * Copyright 2019 Creative Tim (https://www.creative-tim.com)

diff --git a/src/components/AdminNavbar.js b/src/components/AdminNavbar.js
@@ -56,14 +56,17 @@ export default function AdminNavbar({ showSidebar, setShowSidebar }) {
 
                         <div className="-mr-4 ml-6">
                             <Dropdown
-                                buttonType="link"
+                                color="transparent"
                                 buttonText={
                                     <div className="w-12">
                                         <Image src={ProfilePicture} rounded />
                                     </div>
                                 }
                                 rounded
-                                style={{ padding: 0, color: 'transparent' }}
+                                style={{
+                                    padding: 0,
+                                    color: 'transparent',
+                                }}
                             >
                                 <DropdownItem color="lightBlue">
                                     Action

diff --git a/src/components/Sidebar.js b/src/components/Sidebar.js
@@ -116,7 +116,7 @@ export default function Sidebar() {
                         </ul>
 
                         <ul className="flex-col min-w-full flex list-none absolute bottom-0">
-                            <li className="bg-gradient-to-tr from-light-blue-500 to-light-blue-700 px-4 rounded-lg text-white">
+                            <li className="bg-gradient-to-tr from-light-blue-500 to-light-blue-700 px-4 rounded-lg text-white mb-2">
                                 <a
                                     href="https://material-tailwind.com/documentation/quick-start"
                                     target="_blank"
@@ -127,6 +127,16 @@ export default function Sidebar() {
                                     Documentation
                                 </a>
                             </li>
+                            <li className="bg-gradient-to-tr from-purple-500 to-purple-700 px-4 rounded-lg text-white">
+                                <a
+                                    href="https://www.creative-tim.com/product/material-tailwind-dashboard-react"
+                                    target="_blank"
+                                    rel="noreferrer"
+                                    className="flex items-center justify-center gap-4 text-sm font-light py-3"
+                                >
+                                    Free Download
+                                </a>
+                            </li>
                         </ul>
                     </div>
                 </div>

diff --git a/yarn.lock b/yarn.lock
@@ -1645,10 +1645,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@material-tailwind/react@^0.3.3":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@material-tailwind/react/-/react-0.3.3.tgz#12ec6840e9d87ec5081e45545083b6e4ec9f786b"
-  integrity sha512-BLrK7flKdXwFMQqnwtEimsYbdDS4kOGHDdaQ2gsqY12Do1Mg0jHEfimPstKieMC+sU1hQe8P0oVlRQXeksd4XA==
+"@material-tailwind/react@^0.3.4":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@material-tailwind/react/-/react-0.3.4.tgz#aaccb84d6b1dbe7a3cb790b6c8d4209081e031c0"
+  integrity sha512-ri5nMD6Wv4WT5x+3B3jt1A8ZwHijprY8R3EmI5eXnmCNe+Wzyn0AeKcB6IIHhP7fcZVMjSpMBrn5XO700LhO5Q==
   dependencies:
     "@babel/plugin-proposal-class-properties" "^7.13.0"
     "@babel/runtime" "^7.14.0"
@@ -12909,10 +12909,10 @@ table@^6.0.4:
     slice-ansi "^4.0.0"
     string-width "^4.2.0"
 
-tailwindcss@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-2.1.2.tgz#29402bf73a445faedd03df6d3b177e7b52b7c4a1"
-  integrity sha512-T5t+wwd+/hsOyRw2HJuFuv0LTUm3MUdHm2DJ94GPVgzqwPPFa9XxX0KlwLWupUuiOUj6uiKURCzYPHFcuPch/w==
+tailwindcss@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-2.1.4.tgz#ee8a1b8ccc140db61960b6738f968a8a1c4cd1f8"
+  integrity sha512-fh1KImDLg6se/Suaelju/5oFbqq1b0ntagmGLu0aG9LlnNPGHgO1n/4E57CbKcCtyz/VYnvVXUiWmfyfBBZQ6g==
   dependencies:
     "@fullhuman/postcss-purgecss" "^3.1.3"
     bytes "^3.0.0"