-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #23 from harryfinn/release-v1.6.0
Release v1.6.0 updates
- Loading branch information
Showing
19 changed files
with
461 additions
and
109 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,8 +39,8 @@ submodule link will have been removed during setup (`rm -rf .git`), therefore | |
the submodule needs to be added and initialised within this repo: | ||
|
||
```TXT | ||
cd includes/ | ||
`it submodule add [email protected]:CMB2/CMB2.git | ||
cd includes | ||
git submodule add [email protected]:CMB2/CMB2.git | ||
yarn git-update | ||
``` | ||
|
||
|
@@ -51,7 +51,10 @@ The CMB2 files are not committed directly within this repo as there should | |
be no reason to change the library code once development has started. An | ||
exception to this would be if a security patch or bugfix was required. | ||
|
||
It is generally preferred that major updates to `CMB2` are not applied during development, unless new functionality is required, but rather left for the next project or new feature implementation as defined within the `WordPress Skeleton` framework. | ||
It is generally preferred that major updates to `CMB2` are not applied during | ||
development, unless new functionality is required, but rather left for the next | ||
project or new feature implementation as defined within the | ||
`WordPress Skeleton` framework. | ||
|
||
## Running & Building the project | ||
|
||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,230 @@ | ||
@include media-query(0) { | ||
* { | ||
-moz-osx-font-smoothing: grayscale; | ||
-webkit-font-smoothing: antialiased; | ||
|
||
&, | ||
&::before, | ||
&::after { | ||
box-sizing: border-box; | ||
} | ||
|
||
&::placeholder { | ||
transition: color .3s ease; | ||
} | ||
|
||
&:focus::placeholder { | ||
color: transparent; | ||
} | ||
} | ||
|
||
html { | ||
font-size: 62.5%; | ||
} | ||
|
||
body { | ||
@include font-size(1.6); | ||
background-color: $color-white; | ||
color: $color-black; | ||
display: flex; | ||
flex-direction: column; | ||
flex-wrap: nowrap; | ||
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; | ||
font-weight: 400; | ||
line-height: 1.4; | ||
min-height: 100vh; | ||
|
||
&.admin-bar { | ||
min-height: calc(100vh - 46px); | ||
} | ||
} | ||
|
||
h1, | ||
h2, | ||
h3, | ||
h4, | ||
h5, | ||
h6 { | ||
font-weight: 700; | ||
} | ||
|
||
h1, | ||
h2, | ||
h3 { | ||
margin-bottom: 30px; | ||
} | ||
|
||
h4, | ||
h5, | ||
h6 { | ||
margin-bottom: 20px; | ||
} | ||
|
||
h1 { | ||
@include font-size(2.4); | ||
} | ||
|
||
h2 { | ||
@include font-size(2); | ||
} | ||
|
||
h3 { | ||
@include font-size(1.8); | ||
} | ||
|
||
h4 { | ||
@include font-size(1.6); | ||
} | ||
|
||
h5 { | ||
@include font-size(1.6); | ||
} | ||
|
||
input, | ||
select, | ||
textarea { | ||
@include font-size(1.6); | ||
appearance: none; | ||
border: 0; | ||
border-radius: 0; | ||
max-width: none; | ||
width: 100%; | ||
|
||
&:focus { | ||
outline: 0; | ||
} | ||
} | ||
|
||
a { | ||
color: inherit; | ||
|
||
&:focus { | ||
outline: 0; | ||
} | ||
} | ||
|
||
img { | ||
height: auto; | ||
max-width: 100%; | ||
} | ||
|
||
ul:not([class]), | ||
ol:not([class]) { | ||
margin: 0 0 20px 20px; | ||
|
||
> li:not(:last-child) { | ||
margin-bottom: 20px; | ||
} | ||
|
||
&:last-child { | ||
margin-bottom: 0; | ||
} | ||
} | ||
|
||
ul:not([class]) { | ||
ul { | ||
list-style: circle; | ||
margin: 10px 0 10px 20px; | ||
|
||
ul { | ||
list-style: square; | ||
} | ||
} | ||
} | ||
|
||
ol:not([class]) { | ||
list-style: decimal; | ||
|
||
ol { | ||
list-style: lower-alpha; | ||
margin: 10px 0 10px 20px; | ||
|
||
ol { | ||
list-style: lower-roman; | ||
} | ||
} | ||
} | ||
|
||
strong { | ||
font-weight: 700; | ||
} | ||
|
||
small { | ||
font-size: 60%; | ||
} | ||
|
||
i { | ||
font-style: italic; | ||
} | ||
|
||
p:not(:last-child) { | ||
margin-bottom: 20px; | ||
} | ||
} | ||
|
||
@include media-query(md) { | ||
body { | ||
@include font-size(1.8); | ||
} | ||
|
||
h1 { | ||
@include font-size(3.2); | ||
} | ||
|
||
h2 { | ||
@include font-size(2.6); | ||
} | ||
|
||
h3 { | ||
@include font-size(2.2); | ||
} | ||
|
||
h4 { | ||
@include font-size(2); | ||
} | ||
|
||
h5 { | ||
@include font-size(1.8); | ||
} | ||
|
||
ul:not([class]), | ||
ol:not([class]) { | ||
margin: 0 0 30px 30px; | ||
} | ||
|
||
*:not(li) > ul:not([class]) { | ||
margin: 0 0 30px 60px; | ||
|
||
> li::before { | ||
left: -60px; | ||
} | ||
} | ||
} | ||
|
||
@include media-query(lg) { | ||
h1 { | ||
@include font-size(4.2); | ||
} | ||
|
||
h2 { | ||
@include font-size(3); | ||
} | ||
|
||
h3 { | ||
@include font-size(2.8); | ||
} | ||
|
||
h4 { | ||
@include font-size(2.4); | ||
} | ||
|
||
h5 { | ||
@include font-size(2); | ||
} | ||
} | ||
|
||
@include media-query(783px) { | ||
body.admin-bar { | ||
min-height: calc(100vh - 32px); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
@import 'normalize.css', | ||
'reset-css/reset.css'; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
.u { | ||
&-align-start { | ||
align-items: flex-start; | ||
} | ||
|
||
&-align-center { | ||
align-items: center; | ||
} | ||
|
||
&-align-end { | ||
align-items: flex-end; | ||
} | ||
|
||
&-justify-center { | ||
justify-content: center; | ||
} | ||
|
||
&-justify-end { | ||
justify-content: flex-end; | ||
} | ||
|
||
&-space-between { | ||
justify-content: space-between; | ||
} | ||
|
||
&-space-around { | ||
justify-content: space-around; | ||
} | ||
|
||
&-text-center { | ||
text-align: center; | ||
} | ||
} |
Oops, something went wrong.