Merge branch 'release-1.5.0' into develop

This commit is contained in:
rhyneav 2018-06-22 10:58:06 -04:00
commit 4d8dbd9693
6 changed files with 38 additions and 41 deletions

View file

@ -73,7 +73,9 @@ Once you are ready to contribute, here the workflow you should follow:
- Change your current branch to `develop`: `git checkout develop`
- Create your new branch where you will write your code: `git checkout -b feature-thing develop`. Please be sure to prepend your new feature branch with "feature-"
- Start the local web-server: `gulp` or `npm start`
- Once done commit and push your changes to your fork.
- Write some code!
- Check to make sure your code is following style rules with `npm run stylelint`
- Once done commit and push your changes to your fork. The linter is also run as a precommit hook.
- Open a pull request on the origin papercss repo. Be sure to include any pictures and/or details on what you have done, it will help reviewers **a lot**!
- When your changes are approved, they will be merged into the `develop` branch, which will finally be merged into the `master` branch when we reach a milestone in terms of features and bug fixes. Check out [Vincent Driessen's blog post](http://nvie.com/posts/a-successful-git-branching-model/), [GitFlow](https://datasift.github.io/gitflow/IntroducingGitFlow.html), or [#27](https://github.com/rhyneav/papercss/issues/27) for more details on how this works.

View file

@ -6,18 +6,18 @@ weight: -270
#### Download
Download the latest version (1.4.1) using either of the links below. Or
Download the latest version (1.5.0) using either of the links below. Or
download an older release via Github.
<div class="row flex-spaces text-center">
<a class="paper-btn margin" href="https://github.com/rhyneav/papercss/releases/download/v1.4.1/paper.css">CSS File</a>
<a class="paper-btn margin" href="https://github.com/rhyneav/papercss/releases/download/v1.4.1/paper.min.css">Minified CSS File</a>
<a class="paper-btn margin" href="https://github.com/rhyneav/papercss/releases/download/v1.5.0/paper.css">CSS File</a>
<a class="paper-btn margin" href="https://github.com/rhyneav/papercss/releases/download/v1.5.0/paper.min.css">Minified CSS File</a>
<a class="paper-btn margin" href="https://github.com/rhyneav/papercss/releases">Github Releases</a>
</div>
#### NPM
PaperCSS is available on NPM as of version 1.4.1. Install with <code>npm install papercss --save</code> and find the CSS in:
PaperCSS is available on NPM, current version 1.5.0. Install with <code>npm install papercss --save</code> and find the CSS in:
* node_modules/papercss/dist/paper.css
* node_modules/papercss/dist/paper.min.css
@ -27,8 +27,8 @@ PaperCSS is available on NPM as of version 1.4.1. Install with <code>npm install
Don't want to download it? That's cool. You can just link to PaperCSS via
[unpkg's CDN](https://unpkg.com/#/). You can use either:
* [https://unpkg.com/papercss@1.4.1/dist/paper.css](https://unpkg.com/papercss@1.4.1/dist/paper.css)
* [https://unpkg.com/papercss@1.4.1/dist/paper.min.css](https://unpkg.com/papercss@1.4.1/dist/paper.min.css)
* [https://unpkg.com/papercss@1.5.0/dist/paper.css](https://unpkg.com/papercss@1.5.0/dist/paper.css)
* [https://unpkg.com/papercss@1.5.0/dist/paper.min.css](https://unpkg.com/papercss@1.5.0/dist/paper.min.css)
Here's a quck snippet to get started with PaperCSS:
@ -39,7 +39,7 @@ Here's a quck snippet to get started with PaperCSS:
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" href="https://unpkg.com/papercss@1.4.1/dist/paper.min.css">
<link rel="stylesheet" href="https://unpkg.com/papercss@1.5.0/dist/paper.min.css">
<title>Document</title>
</head>
<body>

View file

@ -8,10 +8,9 @@ description: PaperCSS Navbar
<h3><a href="/">Get PaperCSS</a></h3>
</div>
<div class="collapsible">
<input id="collapsible1" type="checkbox" name="collapsible">
<button class="btn-small btn-mobile">
<label for="collapsible1">
<!-- <i class="fas fa-3x fa-bars"></i> -->
<input id="collapsible0" type="checkbox" name="collapsible0">
<button>
<label for="collapsible0">
<div class="bar1"></div>
<div class="bar2"></div>
<div class="bar3"></div>
@ -32,10 +31,9 @@ description: PaperCSS Navbar
<h3><a href="#">Get PaperCSS</a></h3>
</div>
<div class="collapsible">
<input id="collapsible2" type="checkbox" name="collapsible2">
<button class="btn-small btn-mobile">
<label for="collapsible2">
<!-- <i class="fas fa-3x fa-bars"></i> -->
<input id="collapsible1" type="checkbox" name="collapsible1">
<button>
<label for="collapsible1">
<div class="bar1"></div>
<div class="bar2"></div>
<div class="bar3"></div>
@ -53,7 +51,7 @@ description: PaperCSS Navbar
#### Code:
Add ```.fixed``` to ```<nav>``` to fix the nav to the top to have it scroll the whole page.
Add ```.fixed``` to ```<nav>``` to fix the nav to the top to have it scroll the whole page. It's also mobile responsive and will show a hamburger menu on small screens. No JavaScript required!
```html
<nav class="border fixed split-nav">
@ -61,10 +59,9 @@ Add ```.fixed``` to ```<nav>``` to fix the nav to the top to have it scroll the
<h3><a href="#">Get PaperCSS</a></h3>
</div>
<div class="collapsible">
<input id="collapsible1" type="checkbox" name="collapsible">
<button class="btn-small btn-mobile">
<input id="collapsible1" type="checkbox" name="collapsible1">
<button>
<label for="collapsible1">
<!-- <i class="fas fa-3x fa-bars"></i> (https://fontawesome.com/icons) -->
<div class="bar1"></div>
<div class="bar2"></div>
<div class="bar3"></div>
@ -85,13 +82,12 @@ Add ```.fixed``` to ```<nav>``` to fix the nav to the top to have it scroll the
<nav class="border">
<div class="nav-brand">
<h4><a href="#">Get PaperCSS</a></h4>
<h3><a href="#">Get PaperCSS</a></h3>
</div>
<div class="collapsible">
<input id="collapsible2" type="checkbox" name="collapsible2">
<button class="btn-small btn-mobile">
<button>
<label for="collapsible2">
<!-- <i class="fas fa-3x fa-bars"></i> -->
<div class="bar1"></div>
<div class="bar2"></div>
<div class="bar3"></div>
@ -116,9 +112,8 @@ Add ```.fixed``` to ```<nav>``` to fix the nav to the top to have it scroll the
</div>
<div class="collapsible">
<input id="collapsible2" type="checkbox" name="collapsible2">
<button class="btn-small btn-mobile">
<button>
<label for="collapsible2">
<!-- <i class="fas fa-3x fa-bars"></i> -->
<div class="bar1"></div>
<div class="bar2"></div>
<div class="bar3"></div>

2
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "papercss",
"version": "1.4.1",
"version": "1.5.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View file

@ -1,6 +1,6 @@
{
"name": "papercss",
"version": "1.4.1",
"version": "1.5.0",
"description": "The less formal CSS framework.",
"main": "index.js",
"scripts": {

View file

@ -1,12 +1,8 @@
// html, body {
// margin: 40px 0;
// padding: 0;
// }
nav {
background-color: $main-background;
display: flex;
padding: 0.3rem;
position: relative;
width: 100%;
z-index: 100;
@ -18,7 +14,10 @@ nav {
.bar2,
.bar3 {
background-color: $primary;
height: 0.3rem;
border-bottom: 5px solid $primary;
border-bottom-left-radius: 15px 5px;
border-bottom-right-radius: 15px 3px;
color: $primary;
margin: 6px 0;
transition: 0.4s;
width: 2rem;
@ -121,13 +120,13 @@ nav {
.collapsible .collapsible-body {
border: 0;
@include resp(null, $small-screen) {
display: contents !important;
@include resp(null, $small-screen + 1px) {
display: contents;
}
}
div.collapsible-body {
padding: none !important;
padding: none;
}
.collapsible label {
@ -135,17 +134,18 @@ nav {
padding: 0;
}
.btn-mobile {
.collapsible > button {
background-color: $main-background;
display: none;
margin-right: 1.5rem;
margin-top: 0.01rem;
font-size: 0.5rem;
margin-right: 1rem;
padding: 0.25rem;
position: absolute;
right: 0;
top: 0;
top: 0.2rem;
@include resp(small) {
display: block !important;
display: block;
}
}
}