Skip to content

Commit

Permalink
Merge pull request #23 from harryfinn/release-v1.6.0
Browse files Browse the repository at this point in the history
Release v1.6.0 updates
  • Loading branch information
harryfinn authored Oct 13, 2017
2 parents bf13d75 + ac6313e commit 61009b6
Show file tree
Hide file tree
Showing 19 changed files with 461 additions and 109 deletions.
16 changes: 3 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ It uses yarn to compile and process packages and assets.

Before you clone this repository, please ensure the following have been
installed (first-time setup only). Please also ensure that you have `php`
installed (`php -v`), version `7.0.8` or higher. We are also using Yarn
installed (`php -v`), version `7.1.x` or higher. We are also using Yarn
to manage our project dependencies, however, you can still use `npm`
commands if you are unsure of the matching `yarn` command. Checkout the
Yarn docs here = [https://yarnpkg.com/en/docs/cli/](https://yarnpkg.com/en/docs/cli/)
Expand All @@ -18,7 +18,7 @@ brew install node
brew install yarn
```

If you do not have a version of `php` installed or is below version `7.x.x`,
If you do not have a version of `php` installed or is below version `7.1.x`,
please upgrade it. `php 7` is recommended due to the performance improvements,
view an upgrade guide [here](https://developerjack.com/blog/2015/12/11/Installing-PHP7-with-homebrew/)

Expand All @@ -44,12 +44,6 @@ mkdir your-wordpress-folder && cd your-wordpress-folder
wp core download --locale=en_GB
```

Or if you have 'Oh My Zsh' installed, you can simplify this with the take command which will create and swap into the directory:

```TXT
take your-wordpress-folder && wp core download --locale=en_GB
```

## Clone this repo into a new theme in your WordPress folder:

```TXT
Expand All @@ -69,11 +63,7 @@ the instructions below to create a new theme with this framework as the base.
## Starting your new themes

To create a new WordPress theme repo from this skeleton run the following
command to delete the current git files.

```TXT
rm -rf .git
```
command to delete the current git files. `rm -rf .git`

You can now create your new WordPress theme repository, following the repository
setup instructions on github.
Expand Down
9 changes: 6 additions & 3 deletions THEME_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand All @@ -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

Expand Down
3 changes: 3 additions & 0 deletions app/javascripts/modernizer.js

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

Empty file removed app/stylesheets/elements/.gitkeep
Empty file.
230 changes: 230 additions & 0 deletions app/stylesheets/elements/_base.scss
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);
}
}
2 changes: 2 additions & 0 deletions app/stylesheets/globals/_reset.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import 'normalize.css',
'reset-css/reset.css';
50 changes: 0 additions & 50 deletions app/stylesheets/globals/_setup.scss

This file was deleted.

33 changes: 33 additions & 0 deletions app/stylesheets/objects/_utilities.scss
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;
}
}
Loading

0 comments on commit 61009b6

Please sign in to comment.