diff --git a/README.md b/README.md index 1193d06..5e8df6a 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,20 @@ My fork has one significant difference over the original project, that is a full As time goes by I will gradually extend the available options and build a packaging tool that allows you to select all of your customisations in a graphical way, thinking something along the lines of jQuery themeroller, just a bit more lightweight. +### Some Key Differences +* Maintained! +* Configurable grid +* Default colours, borders, fonts, margins, padding etc are all configurable variables +* Normalized elements, rather than the old school CSS resets +* Sensible Table styles +* Taking advantage of sass, the majority of selector repetition is removed in favour of mixins that generate the selectors +* Many issues flagged by CSSLint refactored to resolve them +* The original CSS has been split out into individual files and heavily refactored to tidy it up +* Golden ratio default line heights +* A selection of useful mixins +* Push and pull column classes +* Bower installable + ## Installing Either clone this repository and drop in manually, or install from bower: @@ -16,29 +30,30 @@ bower install --save ribs ## Build status The project is set up to build and run csslint on Travis: -Master: [![Build Status](https://travis-ci.org/nickpack/Ribs.png)](https://travis-ci.org/nickpack/Ribs) -Development: [![Build Status](https://travis-ci.org/nickpack/Ribs.png?branch=develop)](https://travis-ci.org/nickpack/Ribs) +* Master: [![Build Status](https://travis-ci.org/nickpack/Ribs.png)](https://travis-ci.org/nickpack/Ribs) +* Development: [![Build Status](https://travis-ci.org/nickpack/Ribs.png?branch=develop)](https://travis-ci.org/nickpack/Ribs) ## Building I've added grunt configuration to the repository for those of you that use it. There are 4 main tasks added: * default - Runs Sass to create the stylesheet from the source files, places the output in ./css then creates a minified version of the file and places it into the same directory -* test - This runs CSSLint over the output CSS file (Note that there are a few bits in skeleton that I need to fix!) +* test - This runs CSSLint over the output CSS file (Note that there are a few bits in the original skeleton css that I still need to fix!) * minify - This literally just runs cssmin, useful if you've edited Ribs.css directly * watch - This will monitor the scss directory for changes and automatically rebuild the css and minified css (Effectively the same as sass --watch but with added minification) ### To get started with the grunt tools -You need to npm install grunt-cli to start with, otherwise you wont have a runner! +You need to install grunt-cli globally (`npm install -g grunt-cli`) to start with, otherwise you wont have a runner! Then following that, from the root dir of this project, run `npm install` which will set up all of the required dependencies. You should be good to go. ## Changelog -* August 7, 2013 - (v1.0.6) Some additional variables, grid push and pull -* July 17, 2013 - (v1.0.5) Some additional variables, some base table styling -* July 14, 2013 - (v1.0.4) Removed reset and replaced it with normalize +* Oct 10, 2013 - (v1.0.7) Documented the differences between the original skeleton project and Ribs, Updated normalize to 2.1.3 +* Aug 7, 2013 - (v1.0.6) Some additional variables, grid push and pull +* Jul 17, 2013 - (v1.0.5) Some additional variables, some base table styling +* Jul 14, 2013 - (v1.0.4) Removed reset and replaced it with normalize * May 30, 2013 - (v1.0.3) Added 1.5 * font size line heights to headings and paragraphs * May 28, 2013 - Rename project to Ribs * May 17, 2013 - (v1.0.2) Travis CI build configuration, and minor refactor to remove as many of the warnings from CSSLint as was feasible to do - MAY CAUSE REGRESSIONS. @@ -57,7 +72,7 @@ You should be good to go. ## Licence Copyright (c) 2013 Nick Pack Based on the original skeleton project which is Copyright 2011 Dave Gamache -Licensed under the MIT license. +Licensed under the MIT license. [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/nickpack/Ribs/trend.png)](https://bitdeli.com/free "Bitdeli Badge") diff --git a/src/scss/normalize/CHANGELOG.md b/src/scss/normalize/CHANGELOG.md deleted file mode 100644 index d0e9f93..0000000 --- a/src/scss/normalize/CHANGELOG.md +++ /dev/null @@ -1,45 +0,0 @@ -== HEAD - -== 2.1.1 (April 8, 2013) - -* Normalize root `color` and `background` to counter the effects of system - color schemes. - -== 2.1.0 (January 21, 2013) - -* Normalize `text-transform` for `button` and `select`. -* Normalize `h1` margin when within HTML5 sectioning elements. -* Normalize `hr` element. -* Remove unnecessary `pre` styles. -* Add `main` element to HTML5 display definitions. -* Fix cursor style for disabled button `input`. - -== 2.0.1 (August 20, 2012) - -* Remove stray IE 6/7 `inline-block` hack from HTML5 display settings. - -== 2.0.0 (August 19, 2012) - -* Remove legacy browser form normalizations. -* Remove all list normalizations. -* Add `quotes` normalizations. -* Remove all heading normalizations except `h1` font size. -* Form elements automatically inherit `font-family` from ancestor. -* Drop support for IE 6/7, Firefox < 4, and Safari < 5. - -== 1.0.1 (August 19, 2012) - -* Adjust `small` font size normalization. - -== 1.0.0 (August 14, 2012) - -(Only the notable changes since public release) - -* Add MIT License. -* Hide `audio` elements without controls in iOS 5 (#69). -* Normalize heading margins and font size. -* Move font-family normalization from `body` to `html` (#62). -* Remove scrollbar normalization (#64 #65). -* Remove excess padding from checkbox and radio inputs in IE 7 (#42). -* Add IE9 correction for SVG overflow (#16). -* Add fix for legend not inheriting color in IE 6/7/8/9. diff --git a/src/scss/normalize/CONTRIBUTING.md b/src/scss/normalize/CONTRIBUTING.md deleted file mode 100644 index 82bab9a..0000000 --- a/src/scss/normalize/CONTRIBUTING.md +++ /dev/null @@ -1,177 +0,0 @@ -# Contributing to normalize.css - -Please take a moment to review this document in order to make the contribution -process easy and effective for everyone involved. - -Following these guidelines helps to communicate that you respect the time of -the developers managing and developing this open source project. In return, -they should reciprocate that respect in addressing your issue or assessing -patches and features. - - -## Using the issue tracker - -The issue tracker is the preferred channel for [bug reports](#bugs), -[features requests](#features) and [submitting pull -requests](#pull-requests), but please respect the following restrictions: - -* Please **do not** use the issue tracker for personal support requests. - -* Please **do not** derail or troll issues. Keep the discussion on topic and - respect the opinions of others. - - - -## Bug reports - -A bug is a _demonstrable problem_ that is caused by the code in the repository. -Good bug reports are extremely helpful - thank you! - -Guidelines for bug reports: - -1. **Use the GitHub issue search** – check if the issue has already been - reported. - -2. **Check if the issue has been fixed** – try to reproduce it using the - latest `master` branch in the repository. - -3. **Isolate the problem** – create a live example (e.g., on - [Codepen](http://codepen.io)) of a [reduced test - case](http://css-tricks.com/6263-reduced-test-cases/). - -A good bug report shouldn't leave others needing to chase you up for more -information. Please try to be as detailed as possible in your report. What is -your environment? What steps will reproduce the issue? What browser(s) and OS -experience the problem? What would you expect to be the outcome? All these -details will help people to fix any potential bugs. - -Example: - -> Short and descriptive example bug report title -> -> A summary of the issue and the browser/OS environment in which it occurs. If -> suitable, include the steps required to reproduce the bug. -> -> 1. This is the first step -> 2. This is the second step -> 3. Further steps, etc. -> -> `` - a link to the reduced test case -> -> Any other information you want to share that is relevant to the issue being -> reported. This might include the lines of code that you have identified as -> causing the bug, and potential solutions (and your opinions on their -> merits). - - - -## Feature requests - -Feature requests are welcome. But take a moment to find out whether your idea -fits with the scope and aims of the project. It's up to *you* to make a strong -case to convince the project's developers of the merits of this feature. Please -provide as much detail and context as possible. - - - -## Pull requests - -Good pull requests - patches, improvements, new features - are a fantastic -help. They should remain focused in scope and avoid containing unrelated -commits. - -**Please ask first** before embarking on any significant work, otherwise you -risk spending a lot of time working on something that the project's developers -might not want to merge into the project. - -Please adhere to the coding conventions used throughout a project (whitespace, -accurate comments, etc.) and any other requirements (such as test coverage). - -Follow this process if you'd like your work considered for inclusion in the -project: - -1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork, - and configure the remotes: - - ```bash - # Clone your fork of the repo into the current directory - git clone https://github.com//normalize.css - # Navigate to the newly cloned directory - cd normalize.css - # Assign the original repo to a remote called "upstream" - git remote add upstream https://github.com/necolas/normalize.css - ``` - -2. If you cloned a while ago, get the latest changes from upstream: - - ```bash - git checkout master - git pull upstream master - ``` - -3. Never work directly on `master`. Create a new topic branch (off the latest - version of `master`) to contain your feature, change, or fix: - - ```bash - git checkout -b - ``` - -4. Commit your changes in logical chunks. Please adhere to these [git commit - message conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) - or your code is unlikely be merged into the main project. Use Git's - [interactive rebase](https://help.github.com/articles/interactive-rebase) - feature to tidy up your commits before making them public. - - Make sure to add a test to the `test.html` file if appropriate, and test - your change in all supported browsers. - -5. Locally rebase the upstream development branch into your topic branch: - - ```bash - git pull --rebase upstream master - ``` - -6. Push your topic branch up to your fork: - - ```bash - git push origin - ``` - -10. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) - with a clear title and description. - - Please submit a separate pull request for any appropriate changes required - in the `v1` branch for legacy browsers. - -**IMPORTANT**: By submitting a patch, you agree to allow the project owner to -license your work under the same license as that used by the project. - - - -## Maintainers - -If you have commit access, please follow this process for merging patches and -cutting new releases. - -### Accepting patches - -1. Check that a patch is within the scope and philosophy of the project. -2. Check that a patch has any necessary tests and a proper, descriptive commit - message. -3. Test the patch locally. -4. Do not use GitHub's merge button. Apply the patch to `master` locally - (either via `git am` or by checking the whole branch out). Amend minor - problems with the author's original commit if necessary. Then push to GitHub. -5. If a patch should be included in `v1`, cherry-pick the commits or manually - apply if all else fails. - -### Releasing a new version - -1. Include all new functional changes in the CHANGELOG. -2. Use a dedicated commit to increment the version. The version needs to be - added to the CHANGELOG (inc. date), and edited in the README, - `component.json`, and `normalize.css` files. -3. The commit message must be of `v0.0.0` format. -4. Create an annotated tag for the version: `git tag -m "v0.0.0" v0.0.0`. -5. Push the changes and tags to GitHub: `git push --tags origin master` -6. Checkout the `gh-pages` branch and follow the instructions in the README. diff --git a/src/scss/normalize/README.md b/src/scss/normalize/README.md index 62ac43c..2734827 100644 --- a/src/scss/normalize/README.md +++ b/src/scss/normalize/README.md @@ -1,13 +1,13 @@ -# normalize.css v2.1.1 +# normalize.css v2 Normalize.css is a customisable CSS file that makes browsers render all -elements more consistently and in line with modern standards. We researched the -differences between default browser styles in order to precisely target only -the styles that need normalizing. +elements more consistently and in line with modern standards. -[Check out the demo](http://necolas.github.io/normalize.css/2.1.0/test.html) +The project relies on researching the differences between default browser +styles in order to precisely target only the styles that need or benefit from +normalizing. -[Legacy browser support is available in v1](https://github.com/necolas/normalize.css/tree/v1) +[Check out the demo](http://necolas.github.io/normalize.css/latest/test.html) ## Install @@ -15,6 +15,8 @@ Download from the [project page](http://necolas.github.io/normalize.css/). Install with [Bower](http://bower.io/): `bower install --save normalize-css` +Install with [Component(1)](http://component.io/): `component install necolas/normalize.css` + ## What does it do? * Preserves useful defaults, unlike many CSS resets. @@ -25,11 +27,10 @@ Install with [Bower](http://bower.io/): `bower install --save normalize-css` ## How to use it -Normalize.css is intended to be used as an alternative to CSS resets. +No other styles should come before Normalize.css. -It's suggested that you read the `normalize.css` file and consider customising -it to meet your needs. Alternatively, include the file in your project and -override the defaults later in your CSS. +It is recommended that you include the `normalize.css` file as untouched +library code. ## Browser support @@ -39,7 +40,11 @@ override the defaults later in your CSS. * Opera 12+ * Internet Explorer 8+ -## Contribute +[Normalize.css v1 provides legacy browser +support](https://github.com/necolas/normalize.css/tree/v1) (IE 6+, Safari 4+), +but is no longer actively developed. + +## Contributing Please read the CONTRIBUTING.md diff --git a/src/scss/normalize/_normalize.scss b/src/scss/normalize/_normalize.scss index ee17d30..c2de8df 100644 --- a/src/scss/normalize/_normalize.scss +++ b/src/scss/normalize/_normalize.scss @@ -1,4 +1,4 @@ -/*! normalize.css v2.1.2 | MIT License | git.io/normalize */ +/*! normalize.css v2.1.3 | MIT License | git.io/normalize */ /* ========================================================================== HTML5 display definitions @@ -339,8 +339,8 @@ html input[disabled] { } /** - * 1. Address box sizing set to `content-box` in IE 8/9. - * 2. Remove excess padding in IE 8/9. + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. */ input[type="checkbox"], @@ -403,4 +403,4 @@ textarea { table { border-collapse: collapse; border-spacing: 0; -} \ No newline at end of file +} diff --git a/src/scss/normalize/component.json b/src/scss/normalize/component.json deleted file mode 100644 index 6246239..0000000 --- a/src/scss/normalize/component.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "normalize-css", - "version": "2.1.1", - "author": "Nicolas Gallagher", - "homepage": "http://necolas.github.com/normalize.css/", - "main": "normalize.css", - "styles": ["normalize.css"] -} diff --git a/src/scss/normalize/test.html b/src/scss/normalize/test.html deleted file mode 100644 index d7103c4..0000000 --- a/src/scss/normalize/test.html +++ /dev/null @@ -1,354 +0,0 @@ - - - - - - Normalize CSS - - - - - -

Heading 1

-

Heading 2

-

Heading 3

-

Heading 4

-
Heading 5
-
Heading 6
- -
-

Heading 1 (in section)

-

Heading 2 (in section)

-

Heading 3 (in section)

-

Heading 4 (in section)

-
Heading 5 (in section)
-
Heading 6 (in section)
-
- -
-

Heading 1 (in article)

-

Heading 2 (in article)

-

Heading 3 (in article)

-

Heading 4 (in article)

-
Heading 5 (in article)
-
Heading 6 (in article)
-
- -
-
-

Heading 1 (in hgroup)

-

Heading 2 (in hgroup)

-
- -
- -

Text-level semantics

- - - -

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m.

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m.

- -
Address: somewhere, world
- -
- -
- -

- The a element example
- The abbr element and abbr element with title examples
- The b element example
- The cite element example
- The code element example
- The del element example
- The dfn element and dfn element with title examples
- The em element example
- The i element example
- The img element example
- The ins element example
- The kbd element example
- The mark element example
- The q element inside a q element example
- The s element example
- The samp element example
- The small element example
- The span element example
- The strong element example
- The sub element example
- The sup element example
- The u element example
- The var element example -

- -

Embedded content

- -

audio

- - - - -

img

- - - - -

svg

- - - - - -

video

- - - - -

Interactive content

- -

details / summary

-
- More info -

Additional information

-
    -
  • Point 1
    • -
  • Point 2
    • -
-
- -

Grouping content

- -

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et m.

- -

pre

- - 
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et me.
- - 
<html>
-    <head>
-    </head>
-    <body>
-        <div class="main"> <div>
-    </body>
-</html>
- -

blockquote

- -
-

Some sort of famous witty quote marked up with a <blockquote> and a child <p> element.

-
- -
Even better philosophical quote marked up with just a <blockquote> element.
- -

ordered list

- -
    -
  1. list item 1
    2. -
  2. list item 1 -
      -
    1. list item 2
      2. -
    2. list item 2 -
        -
      1. list item 3
        2. -
      2. list item 3
        3. -
      -
      3. -
    3. list item 2
      4. -
    4. list item 2
      5. -
    -
    3. -
  3. list item 1
    4. -
  4. list item 1
    5. -
- -

unordered list

- -
    -
  • list item 1
    • -
  • list item 1 -
      -
    • list item 2
      • -
    • list item 2 -
        -
      • list item 3
        • -
      • list item 3
        • -
      -
      • -
    • list item 2
      • -
    • list item 2
      • -
    -
    • -
  • list item 1
    • -
  • list item 1
    • -
- -

description list

- -
-
Description name
-
Description value
-
Description name
-
Description value
-
Description value
-
Description name
-
Description name
-
Description value
-
- -

figure

- -
- -
Figcaption content
-
- -

Tabular data

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Jimi Hendrix - albums
AlbumYearPrice
AlbumYearPrice
Are You Experienced1967$10.00
Axis: Bold as Love1967$12.00
Electric Ladyland1968$10.00
Band of Gypsys1970$12.00
- -

Forms

- -
-
- Inputs as descendents of labels (form legend). This doubles up as a long legend that can test word wrapping. -

-

-

-

-

-

-

- -

-

-

-

- -

-

-
- -
- Inputs as siblings of labels -

-

-

-

-

-

-

-

- -

-

-

-

- -

-

-
- -
- Clickable inputs and buttons -

-

-

-

-

- - -

-

-

-

-
- -
- box-sizing tests -
-
-
-
-
- -
-
-
-
-
-
-
-
- -
-
- -
-
- -
-
-
-
- -
-
-
-
-
- - -