Commit Graph

960 Commits

Author SHA1 Message Date
Brandon Mathis
463e4a7656 Moved javascript generation out of js_assets plugin and into generate task 2013-03-18 01:59:46 -05:00
Joe Lencioni
d3525f0769 Allow scss line comments in development
These line comments point to the original source file for each selector
in the compiled scss files, which is very helpful when working with your
styles. Allowing them to be rendered in development should make theme
development much easier.
2013-03-18 01:32:30 -05:00
Joe Lencioni
d483912e4b Improve previewing
Previewing is typically done to verify a change to content, a plugin, or
a theme. In most of these cases, the person previewing will want to
re-generate before previewing. This commit adds a call to the `generate`
task from within the `preview` task to ensure that the newest content
will be previewed.

Additionally, since previewing is often done to verify changes to
themes, it can be helpful to be able to see un-minified assets. This
commit also sets a default value of 'development' to the `OCTOPRESS_ENV`
environment value, which is used when making decisions as to how assets
are compiled. This currently prevents the minification of the compiled
scss.

I also trimmed some trailing whitespace in the Rakefile.
2013-03-18 01:32:30 -05:00
Brandon Mathis
fa105ce68d Fixed spacing and wording on rake setup_github_pages task feedback 2013-03-18 01:14:23 -05:00
Brandon Mathis
56660dea6b Improvements to setup_github_pages task:
- Fixes issues with undefined variables
- Task feedback has been improved with colorized output and better wording.
- Configs are written to site.yml if necessary
- Help urls for custom domains have been updated

Fixes #1015
2013-03-18 01:06:29 -05:00
Brandon Mathis
39fca91b69 fixed example comments in image_tag plugin 2013-03-17 23:56:46 -05:00
Brandon Mathis
6d4526d340 Video tag plugin now supports relative urls. Closes #1127 2013-03-17 23:52:35 -05:00
Brandon Mathis
4f9fcbb886 Now image tag plugin supports relative urls. Improvements to alk attr and title attr support. Closes #724 2013-03-17 23:52:12 -05:00
Brandon Mathis
4dfdfb80c2 Fix: task set_root_dir now works properly and outputs rewritten configuration on success 2013-03-17 23:46:53 -05:00
Brandon Mathis
50e6a1ed04 Fixed issue where rake update would recursively copy stylesheets/custom 2013-03-17 23:46:53 -05:00
Parker Moore
f7d571ebb4 Merge branch '2.1' of github.com:imathis/octopress into 2.1
* '2.1' of github.com:imathis/octopress:
  Updating the classic theme should work again
2013-03-17 15:27:53 +01:00
Parker Moore
9a5ad130d8 Fix error in video tag. Fixes #1127. 2013-03-17 15:24:58 +01:00
Brandon Mathis
bbf0df5cef Updating the classic theme should work again 2013-03-17 01:00:46 -05:00
Brandon Mathis
a4adca5fcd Added sass-globbing, allowing plugin stylesheets to be auto-imported from the assets/stylesheets/plugins directory 2013-03-11 01:38:18 -05:00
Brandon Mathis
66b75fe40c Improved: config_tag plugin is much more flexible now and can be used by other plugins directly through the config_tag method 2013-03-11 01:19:35 -05:00
Brandon Mathis
7e4cac1460 Improved: config_tag plugin now works on site context configuration and no longer relies on octopress configurator 2013-03-10 17:07:04 -05:00
Brandon Mathis
4f86b1a2f6 Fixed jQuery each and map functions (added index) 2013-03-10 16:02:40 -05:00
Brandon Mathis
a48153f99b Merge pull request #1103 from imathis/pygments-loud-fail
Fail loudly when a pygments highlight fails
2013-03-10 13:52:53 -07:00
Parker Moore
d52bf53cc7 Pygments error messages are now printed alongside ours. 2013-03-10 21:47:07 +01:00
Brandon Mathis
d0e59172f3 Updated error message for gist syntax 2013-03-10 00:17:55 -06:00
Brandon Mathis
bfeeecea71 Improved error formatting and valid syntax directions. 2013-03-10 00:03:30 -06:00
Parker Moore
0efbec7daa Remove stray test file. 2013-03-10 02:28:37 +01:00
Parker Moore
b456865c8c #highlight_failed now accepts tag name, and proper syntax 2013-03-10 02:06:02 +01:00
Parker Moore
6c58529532 Rescuing errors issued by Pygments and raising our own with helpful info 2013-03-10 01:45:05 +01:00
Parker Moore
66e7fb0bfb #highlight_failed in PygmentsCode 2013-03-10 01:44:32 +01:00
Parker Moore
8f7106c39b Colorizing fail message in Pygments code highlighting. 2013-03-10 00:24:52 +01:00
Parker Moore
e6faef6257 Added .gitattributes file to keep CRLF's out of the codebase. 2013-03-10 00:17:44 +01:00
Parker Moore
1306ad83b9 Fail loudly when a pygments highlight fails. #990. 2013-03-10 00:17:43 +01:00
Brandon Mathis
81ea4ae9bb Merge pull request #1101 from imathis/bye-twitter
Bye, Twitter Timeline
2013-03-09 15:05:11 -08:00
Parker Moore
f562af5e19 Remove mention of ADN in Readme. 2013-03-10 00:04:26 +01:00
Parker Moore
7a897d10d2 Merge pull request #1060 from MrJoy/gitignore_cleanup_redux
Be more precise about what we ignore to avoid accidentally ignoring things.
2013-03-06 06:24:27 -08:00
Parker Moore
9087cf125e Merge pull request #1046 from MrJoy/remove_redundant_rake_task
This task is superfluous AND...
2013-03-05 16:32:13 -08:00
Parker Moore
c95867e61c Merge pull request #1037 from MrJoy/add_clobber_task
Add 'clobber' task for purging generated files.
2013-03-05 16:30:20 -08:00
sjml
e59adc9ef9 Just kidding, I don't want the exact changes from #990 in here. 2013-03-06 01:05:08 +01:00
earaya
7a6c53d041 Cherry-picked #664 fix to 2.1 branch. 2013-03-06 00:14:14 +01:00
Kevin Mees
e15b51aae4 Fixed an include bug in page layout 2013-03-06 00:08:35 +01:00
Parker Moore
e7dd5befdc Merge pull request #658 from kmees/2.1
Fixed an include bug in page layout
2013-03-05 15:08:09 -08:00
Parker Moore
22fb2f2652 Actually bringing in the meat of the change from #629. 2013-03-06 00:05:59 +01:00
Leonardo Saraiva
b0dec8235e Merge change from @vyper in #629. 2013-03-06 00:02:42 +01:00
Trey Hunner
11fec7516b Add EditorConfig file for classic theme 2013-03-05 23:53:36 +01:00
Trey Hunner
b3606b9f67 Add EditorConfig file for Ruby files 2013-03-05 23:53:25 +01:00
Parker Moore
810d7e4d4f Only include GitHub repo listing if site.github_repo_count is > 0. Fixes #344. 2013-03-05 23:22:41 +01:00
Parker Moore
bc9d9c2415 Removed twitter sidebar section. 2013-03-05 23:06:45 +01:00
Parker Moore
331987cdfa Bring back Twitter configs when needed for 'tweet' button (for posts). 2013-03-05 23:05:01 +01:00
Parker Moore
768fa8ed39 Remove Twitter timeline SCSS. 2013-03-05 23:00:21 +01:00
Parker Moore
63391c59dc Do not require twitter in site.coffee. 2013-03-05 22:55:39 +01:00
Parker Moore
ef13e1ff61 Remove Twitter Timeline CoffeeScript. 2013-03-05 22:53:34 +01:00
Parker Moore
38623c57d5 Remove references to Twitter from non-theme files. 2013-03-05 22:52:43 +01:00
Parker Moore
efd5bb3367 Remove Twitter configuration file. 2013-03-05 22:51:41 +01:00
Parker Moore
a63bb4f701 Merge pull request #1098 from gkarekinian/style
Switched code style to a more usual Ruby style
2013-03-05 05:22:15 -08:00