Skip to content

Commit

Permalink
Merge pull request #7 from creativetimofficial/dev-main
Browse files Browse the repository at this point in the history
Feature: v1.3.0
  • Loading branch information
einazare authored Mar 24, 2021
2 parents bc66ad4 + 379b399 commit fd06fc2
Show file tree
Hide file tree
Showing 41 changed files with 299 additions and 173 deletions.
31 changes: 31 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
# Change Log

## [1.3.0] 2021-03-24
### Bug fixing
- Changed the way we import images
- Old way: `require("path/to/imgae")`
- New way: `require("path/to/imgae").default`
### Major style changes
### Deleted components
### Added components
### Deleted dependencies
- `react-bootstrap-switch` (replaced by the simple Bootstrap Switch: https://reactstrap.github.io/components/form/#Custom-Inputs)
### Added dependencies
- `[email protected]`
- `[email protected]` (Only to stop warnings from Bootstrap)
### Updated dependencies
```
moment 2.26.0 → 2.29.1
node-sass 4.14.1 → 5.0.0
nouislider 14.5.0 → 14.6.4
react 16.13.1 → 17.0.2
react-datetime 2.16.3 → 3.0.4
react-dom 16.13.1 → 17.0.2
react-scripts 3.4.1 → 4.0.3
reactstrap 8.4.1 → 8.9.0
typescript 3.9.5 → 4.2.3
```
### Warning
_When doing a clean install, you might have some warnings, those come from `node_modules` and do not affect the project in any way._
_The following two error might occur while doing a clean install - They do not affect the product in any way:_
_npm WARN [email protected] requires a peer of react@^16.5.0 but none is installed. You must install peer dependencies yourself._
_npm WARN @babel/plugin-bugfix-v8-spread-parameters-in[email protected] requires a peer of @babel/core@^7.13.0 but none is installed. You must install peer dependencies yourself._

## [1.2.0] 2020-06-12
### Bug fixing
- https://github.com/creativetimofficial/paper-kit-react/issues/2 (changed the fonts import to `~assets/fonts` and also added assets path inside `jsconfig.json` file)
Expand Down
22 changes: 9 additions & 13 deletions Documentation/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
/*!
=========================================================
* Paper Kit React - v1.2.0
* Paper Kit React - v1.3.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/paper-kit-react/blob/master/LICENSE.md)
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/paper-kit-react/blob/main/LICENSE.md)
* Coded by Creative Tim
Expand All @@ -30,9 +30,7 @@
/>
<link rel="icon" type="image/png" href="../public/favicon.ico" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>
Components Documentation - Paper Kit by Creative Tim
</title>
<title>Components Documentation - Paper Kit by Creative Tim</title>
<meta
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no"
name="viewport"
Expand All @@ -48,9 +46,9 @@
/>
<!-- CSS Files -->
<link href="../src/assets/css/bootstrap.min.css" rel="stylesheet" />
<link href="../src/assets/css/paper-kit.css?v=1.2.0" rel="stylesheet" />
<link href="../src/assets/css/paper-kit.css?v=1.3.0" rel="stylesheet" />
<!-- CSS Just for demo purpose, don't include it in your project -->
<link href="../src/assets/demo/demo.css?v=1.2.0" rel="stylesheet" />
<link href="../src/assets/demo/demo.css?v=1.3.0" rel="stylesheet" />
</head>

<body class="offline-doc">
Expand Down Expand Up @@ -97,15 +95,13 @@
<div class="page-header">
<div
class="page-header-image"
style="background-image: url('../src/assets/img/daniel-olahh.jpg');"
style="background-image: url('../src/assets/img/daniel-olahh.jpg')"
></div>
<div class="container text-center">
<div class="col-md-8 mx-auto">
<div class="brand">
<h1 class="title">
Paper Kit React
</h1>
<h3 class="description">Documentation v1.2.0</h3>
<h1 class="title">Paper Kit React</h1>
<h3 class="description">Documentation v1.3.0</h3>
<br />
<a
href="https://demos.creative-tim.com/paper-kit-react/#/documentation/introduction?ref=pkr-static-docs"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Creative Tim
Copyright (c) 2021 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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [Paper Kit React - Free Bootstrap 4, React, React Hooks and Reactstrap UI Kit](https://demos.creative-tim.com/paper-kit-react/#/index?ref=pkr-github-readme) ![version](https://img.shields.io/badge/version-1.2.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-kit.svg?maxAge=2592000)](https://github.com/creativetimofficial/paper-kit-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/paper-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/paper-kit-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)
# [Paper Kit React - Free Bootstrap 4, React, React Hooks and Reactstrap UI Kit](https://demos.creative-tim.com/paper-kit-react/#/index?ref=pkr-github-readme) ![version](https://img.shields.io/badge/version-1.3.0-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/material-kit.svg?maxAge=2592000)](https://github.com/creativetimofficial/paper-kit-react/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/paper-kit-react.svg?maxAge=2592000)](https://github.com/creativetimofficial/paper-kit-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)

![Paper Kit React](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/paper-kit-react/opt_pk_react_thumbnail.jpg)

Expand Down Expand Up @@ -175,7 +175,7 @@ We use GitHub Issues as the official bug tracker for the Paper Kit 2. Here are s

## Licensing

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

[CHANGELOG]: ./CHANGELOG.md
[LICENSE]: ./LICENSE.md
Expand Down
Empty file added commit.sh
Empty file.
12 changes: 6 additions & 6 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ gulp.task("licenses", async function () {
gap.prependText(`/*!
=========================================================
* Paper Kit React - v1.2.0
* Paper Kit React - v1.3.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-react
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
* Coded by Creative Tim
Expand All @@ -32,11 +32,11 @@ gulp.task("licenses", async function () {
gap.prependText(`<!--
=========================================================
* Paper Kit React - v1.2.0
* Paper Kit React - v1.3.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-react
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
* Coded by Creative Tim
Expand All @@ -55,11 +55,11 @@ gulp.task("licenses", async function () {
gap.prependText(`/*!
=========================================================
* Paper Kit React - v1.2.0
* Paper Kit React - v1.3.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-react
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
* Coded by Creative Tim
Expand Down
56 changes: 43 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
{
"name": "paper-kit-react",
"version": "1.2.0",
"private": true,
"version": "1.3.0",
"dependencies": {
"classnames": "2.2.6",
"moment": "2.26.0",
"node-sass": "4.14.1",
"nouislider": "14.5.0",
"react": "16.13.1",
"react-bootstrap-switch": "15.5.3",
"react-datetime": "2.16.3",
"react-dom": "16.13.1",
"moment": "2.29.1",
"node-sass": "5.0.0",
"nouislider": "14.6.4",
"react": "17.0.2",
"react-datetime": "3.0.4",
"react-dom": "17.0.2",
"react-router": "5.2.0",
"react-router-dom": "5.2.0",
"react-scripts": "3.4.1",
"reactstrap": "8.4.1"
"react-scripts": "4.0.3",
"reactstrap": "8.9.0"
},
"scripts": {
"start": "react-scripts start",
Expand Down Expand Up @@ -42,10 +40,42 @@
]
},
"optionalDependencies": {
"typescript": "3.9.5"
"jquery": "3.6.0",
"typescript": "4.2.3"
},
"devDependencies": {
"bootstrap": "4.6.0",
"gulp": "4.0.2",
"gulp-append-prepend": "1.0.8"
}
},
"description": "Paper Kit React is a free Bootstrap 4, React, React Hooks and Reactstrap UI Kit with pale colors, beautiful typography and thoughtful drawings. We've created it having paper and drawings in mind.",
"main": "src/assets/scss/paper-kit.scss",
"repository": {
"type": "git",
"url": "git+https://github.com/creativetimofficial/paper-kit-react.git"
},
"keywords": [
"react",
"reactstrap",
"reactjs",
"paper-kit",
"paper-kit-react",
"paper-kit-2",
"paper-kit2",
"paper-design",
"hook",
"hooks",
"react-hook",
"react-hooks",
"template",
"theme",
"react-template",
"react-theme"
],
"author": "Creative Tim",
"license": "MIT",
"bugs": {
"url": "https://github.com/creativetimofficial/paper-kit-react/issues"
},
"homepage": "https://demos.creative-tim.com/paper-kit-react/#/index"
}
6 changes: 3 additions & 3 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
/*!
=========================================================
* Paper Kit React - v1.2.0
* Paper Kit React - v1.3.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/paper-kit-react/blob/master/LICENSE.md)
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/paper-kit-react/blob/main/LICENSE.md)
* Coded by Creative Tim
Expand Down
7 changes: 0 additions & 7 deletions src/assets/css/bootstrap.min.css

This file was deleted.

1 change: 0 additions & 1 deletion src/assets/css/bootstrap.min.css.map

This file was deleted.

4 changes: 2 additions & 2 deletions src/assets/css/paper-kit.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/paper-kit.min.css

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

6 changes: 3 additions & 3 deletions src/assets/demo/demo.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*!
=========================================================
* Paper Kit React - v1.2.0
* Paper Kit React - v1.3.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/paper-kit-react/blob/master/LICENSE.md)
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/paper-kit-react/blob/main/LICENSE.md)
* Coded by Creative Tim
Expand Down
4 changes: 2 additions & 2 deletions src/assets/scss/paper-kit.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
=========================================================
* Paper Kit React - v1.2.0 based on Paper Kit - v2.2.0
* Paper Kit React - v1.3.0 based on Paper Kit - v2.2.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-2
* Copyright 2020 Creative Tim (http://www.creative-tim.com)
* Copyright 2021 Creative Tim (http://www.creative-tim.com)
* Designed by www.invisionapp.com Coded by www.creative-tim.com
Expand Down
39 changes: 39 additions & 0 deletions src/assets/scss/react/paper-kit/_switch.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
.custom-switch {
padding-left: 3.25rem;
min-height: 2rem;
display: flex;
.custom-control-label {
display: inline-flex;
align-items: center;
&::after {
height: calc(1.625rem - 4px);
width: calc(1.625rem - 4px);
left: calc(-3.25rem + 2px);
border-radius: 2.5rem;
background-color: white;
}
&::before {
height: 1.625rem;
width: 3rem;
left: -3.25rem;
border-radius: 2.5rem;
background-color: #adb5bd;
}
}

.custom-control-input:checked ~ .custom-control-label {
&::after {
transform: translateX(1.35rem);
}
&::before {
background-color: $info-color;
border-color: $info-color;
}
}

.custom-control-input:disabled {
&:checked ~ .custom-control-label::before {
// background-color: $info-color;
}
}
}
1 change: 1 addition & 0 deletions src/assets/scss/react/react-differences.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
@import "paper-kit/inputs";
@import "paper-kit/navbars";
@import "paper-kit/responsive";
@import "paper-kit/switch";
@import "paper-kit/tooltips-and-popovers";
6 changes: 3 additions & 3 deletions src/components/Footers/DemoFooter.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*!
=========================================================
* Paper Kit React - v1.2.0
* Paper Kit React - v1.3.0
=========================================================
* Product Page: https://www.creative-tim.com/product/paper-kit-react
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/paper-kit-react/blob/master/LICENSE.md)
* Copyright 2021 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/paper-kit-react/blob/main/LICENSE.md)
* Coded by Creative Tim
Expand Down
Loading

0 comments on commit fd06fc2

Please sign in to comment.