Commit Graph

641 Commits

Author SHA1 Message Date
Philip Arthur Moore ba41e2222a Merge pull request #586 from yoarts/patch-1
Change plugin references to theme references in Travis CI config file.
2014-08-20 15:18:46 +07:00
yoarts b1af13868b Rewording "plugin" to "theme" 2014-08-20 14:31:45 +07:00
Tammie Lister a3e0022dd5 Changes description of mixin - props @r007
Relates to #582
2014-08-18 16:38:19 +01:00
Philip Arthur Moore 86575390b5 Kick off Travis CI Build Monitoring for _s
See https://github.com/Automattic/_s/issues/553.
2014-08-18 00:38:51 +07:00
Philip Arthur Moore f490e2839f Merge pull request #581 from philiparthurmoore/master
Introduce Coding Standards Checks into Underscores
2014-08-18 00:26:27 +07:00
Philip Arthur Moore f8b66133ed Prepare Underscores for Coding Standards. See https://github.com/Automattic/_s/issues/553. [skip ci] 2014-08-18 00:12:38 +07:00
Philip Arthur Moore 895b7a93ab Prepare Underscores for Coding Standards. See https://github.com/Automattic/_s/issues/553. 2014-08-17 23:40:13 +07:00
Tammie Lister e88ad83914 Merge pull request #571 from corvannoorloos/patch-2
Update input field border color props @corvannoorloos
2014-08-14 17:00:37 +01:00
Tammie Lister 9db21f4850 Merge pull request #570 from corvannoorloos/patch-1
Indentation using tabs instead of mixed tabs/spaces- props @corvannoorloos
2014-08-14 11:30:38 +01:00
Cor van Noorloos bf1e501b00 Update input field border color
now matches style.css
2014-08-13 19:06:04 +02:00
Cor van Noorloos 354ad2b896 indentation using tabs instead of mixed tabs/spaces
see https://github.com/Automattic/_s/pull/565
2014-08-13 18:38:51 +02:00
Tammie Lister 4bba66e25e Puts width in right place
Props @corvannoorloos
2014-08-13 14:34:23 +01:00
Tammie Lister 47267e9fd5 Merge pull request #568 from fsylum/master
Reordering vendor-prefixes property in the mixin: props @fsylum
2014-08-13 13:11:47 +01:00
Firdaus Zahari 99c20e0e24 Update _mixins-master.scss 2014-08-13 20:03:49 +08:00
Firdaus Zahari 6a8b42795d Put vendor specific property first 2014-08-13 20:03:05 +08:00
Tammie Lister 96718641de Adds in missing class
Brings in class that was missing from updated Sass but in style.css.
Props @corvannoorloos
2014-08-13 12:18:30 +01:00
Tammie Lister beae35b2e2 Merge pull request #550 from Automattic/_sass
Brings sass into _s

Sass now comes with _s - you can simply check an option on underscores.me and get a version with Sass.

Props to: @gregrickaby @bradp @hugobaeta @obenland @sabreuse @MichaelArestad @jacklenox @karmatosed
2014-08-11 18:17:19 +01:00
Konstantin Obenland 1f62b392e8 _s: Bring back closing curly brace.
Erroneously removed while trying to sort out a merge conflict, when I
squashed `_sass` commits.
2014-08-11 09:55:33 -07:00
Tammie Lister 068f90fc8f Initial commit for _sass.
Props @michaelArestad @hugobeta, and @jacklenox.

* Give prefix to variable files. This avoids confusion with files of similar names like typography. It also helps with the visual recognition over what file does what.
* Set up mixins-master.
* Setting foundation for encouraging in larger projects use of more than one mixing file. This creates a master mixins file that we can then bring subs into if the project grows.
* Fixed line breaks, spacing and new lines. Props @gregrickaby.
* Nest widget select. Props @gregrickaby.
* Make variables be variables-site. Makes this the global variables folder. People can then use sub folders in sections for local only variables.
* Change content directory to be site directory.
* Remove zip. Revert `style.css` to not be auto generated version.
* Fixes rem size issue on body font.
* Fixes for differences between `_s` and `_sass`. Fixed font sizes, added in display block to classes so they compile and the theme check
passes.
* Remove text domain and clean up css.
2014-08-11 09:05:56 -07:00
Philip Arthur Moore 63d8fcb190 Add escaping to custom header example. Make sure that proper attribute escaping is added into the example that's in the custom header include file. Since we're not including this in header.php, we should at least make sure that the example given is proper and passes WordPress Coding Standards checks. See #552 for context. 2014-08-07 11:07:50 +07:00
Philip Arthur Moore 01f15acadd Merge pull request #554 from Automattic/fix-setup-typo
Setup is a noun. Set up is a verb.
2014-08-07 10:41:16 +07:00
Philip Arthur Moore e6fd8e99cf Setup is a noun. Set up is a verb. "Setup the WordPress core custom header feature." is incorrect. "Set up the WordPress core custom header feature." is correct. 2014-08-07 10:36:07 +07:00
Fränk Klein 17c12ec0e5 Remove Domain Path from style.css
Indicating a domain path is optional, if you use the default, there is
no need to specify it.
2014-08-06 08:55:45 +02:00
Konstantin Obenland 104b34821a Merge branch 'slobodan-updated-hAtom' 2014-07-30 14:49:19 -05:00
Konstantin Obenland 0d87d0bb70 _s: Continue using a default `time` tag.
We only need to change the default markup if published and updated
timestamps are different.
2014-07-30 14:47:16 -05:00
Konstantin Obenland 048057ad68 Merge branch 'updated-hAtom' of https://github.com/slobodan/_s into slobodan-updated-hAtom 2014-07-30 14:35:44 -05:00
Konstantin Obenland e4ad206745 Merge pull request #549 from WebDevStudios/empty_selectors
_s: Wrap after each selector and comma.
2014-07-30 14:29:35 -05:00
Greg Rickaby 99287281cf return all the things! Also, add display: block; to some empty selectors (to tie in with _sass) 2014-07-29 15:54:08 -05:00
Konstantin Obenland b0e25cfea5 Merge pull request #538 from lchski/lchski-readme-trailing-slash
Add trailing slash to `layouts` in readme.
2014-07-02 12:20:29 -07:00
Lucas Cherkewski 65b9ea8766 Add trailing slash to `layouts` in readme. 2014-06-30 19:42:03 -04:00
Thomas Guillot a78658a393 Revert "_s: Simplify entry meta output"
This reverts commit 9e66401930.
2014-06-30 16:37:12 +01:00
Thomas Guillot 9e66401930 _s: Simplify entry meta output
- Fix entry-footer inconsistency between content-*.php files
- Move in a function <code>_s_entry_meta()</code> to avoid duplication

---

At the moment there is an inconsistency between content.php and
content-single.php regarding the .entry-footer output.

In my opinion content.php output is would be better to use because it's
easier to translate and allow more customisation.

Finally by moving it into <code>inc/template-tags.php</code> we are
getting rid of some duplicated code.
2014-06-30 16:36:36 +01:00
Philip Arthur Moore afd91c3ba8 Merge pull request #527 from kovshenin/master
Add a non-breaking space to _s_post_nav().
2014-06-30 22:33:05 +07:00
Philip Arthur Moore 894190e735 Merge pull request #536 from Automattic/revert-532-Entry-Meta-Consistency
Revert "_s: Simplify entry meta output"
2014-06-30 22:23:21 +07:00
Konstantin Obenland 1596a6a50b Revert "_s: Simplify entry meta output" 2014-06-30 08:17:33 -07:00
Philip Arthur Moore 170dd682cb Merge pull request #533 from lchski/lchski-readme-consistency-fixes
Update README for consistency.
2014-06-30 22:10:59 +07:00
Philip Arthur Moore 2271e29802 Merge pull request #532 from Automattic/Entry-Meta-Consistency
Make entry meta more consistent throughout _s and gut out code duplication.
2014-06-30 22:08:48 +07:00
Lucas Cherkewski 536359f88b Update README to be more consistent
Wrap all file paths in '`', capitalize properly, fix grammar.
2014-06-29 20:44:04 -04:00
Thomas Guillot f2881285b7 _s: Simplify entry meta output
- Add entry-footer consistency between content-*.php files
- Move in a function _s_entry_meta() to avoid duplicate
2014-06-27 12:57:31 +01:00
Konstantin Obenland 5106a9e3e4 _s: Use braces in all conditionals.
Formatting updates for file comment, conditional braces, and indentation.
2014-06-26 13:45:05 -07:00
Konstantin Obenland fc95a34dec Merge pull request #529 from Automattic/Remove-Default-Widgets
Remove default widgets from sidebar.

Closes #528.
2014-06-26 13:42:21 -07:00
sixhours d2beca6092 Remove unnecessary semicolon 2014-06-26 11:06:51 -04:00
sixhours d01a8d319b is_active_sidebar() check
Check to ensure sidebar is active before displaying #secondary
2014-06-26 11:06:33 -04:00
sixhours 409d15d1a2 Remove default widgets from sidebar 2014-06-26 10:55:04 -04:00
Konstantin Kovshenin 5fffb5e911 Add a non-breaking space to _s_post_nav().
Sometimes the title length of a previous or next post would cause
the arrow (larr/rarr) in the link to be wrapped to the next line.
Adding a non-breaking space between the title and the arrow will stick
it to the last word in the title.
2014-06-26 11:50:14 +04:00
Tammie Lister 4dad296c3a Merge pull request #524 from jacklenox/dev
Capitalisation and coding standards corrections - props @jacklenox
2014-06-25 11:47:40 +01:00
Jack Lenox 0b96c02e02 Undid my multiline function corrections 2014-06-25 10:31:51 +01:00
Jack Lenox 776eaf6e94 Correcting some irregular capitalisation and coding standards issues 2014-06-25 00:13:36 +01:00
Jack Lenox b6ad3b341a Changed lone uppercase H to lower 2014-06-25 00:04:59 +01:00
Tammie Lister eb58df8d30 Revert the change to spacing in #517
Adds back in space for now. Props @lancewillett
2014-06-21 00:39:40 +01:00