Commit Graph

19 Commits

Author SHA1 Message Date
Garen Torikian
5ee388cede Get it to a proper 80% 2013-04-18 18:50:22 -07:00
Nathan Sobo
f03b6207de Make all requires of 'fs-utils' assign to fsUtils var instead of fs 2013-04-03 12:01:37 -06:00
Kevin Sawicki & Nathan Sobo
501dc9b76c Merge remote-tracking branch 'origin/master' into cefode
Conflicts:
	native/v8_extensions/native.mm
	spec/app/config-spec.coffee
	spec/app/window-spec.coffee
	spec/spec-helper.coffee
	spec/stdlib/fs-utils-spec.coffee
	src/app/atom-package.coffee
	src/app/config.coffee
	src/app/window.coffee
	src/packages/fuzzy-finder/lib/load-paths-handler.coffee
	src/packages/markdown-preview/lib/markdown-preview-view.coffee
	src/packages/tree-view/spec/tree-view-spec.coffee
	src/stdlib/require.coffee
2013-03-20 10:46:50 -06:00
Kevin Sawicki & Nathan Sobo
1d1ba5f6d1 Use node's require instead of internal require 2013-03-12 10:38:05 -07:00
Corey Johnson & Nathan Sobo
478a376c97 Less files work in atom themes 2013-03-11 10:02:19 -07:00
Jon Rohan
c2af8712d1 Creating GitHub_Dark and GitHub_Light. 2013-01-31 19:01:44 -05:00
Kevin Sawicki
7e494caaff Remove unused require 2013-01-28 15:25:35 -08:00
Kevin Sawicki
c2319a30e6 💄 2013-01-28 15:25:08 -08:00
Jon Rohan
379824f6b0 adding vendor/themes and themes to themeDirPaths 2013-01-22 12:41:59 -08:00
Jon Rohan
5b241c1e1c In requireStylesheet, check loadedThemes for the required stylesheet
I've made requireStylesheet also check the loadedThemes for the
requiredStylesheet.

In the event that we have 2 stylesheets with the same name `editor.css`
and `editor.css` I want the `static/` directory stylesheet to be above
the userTheme stylesheet, so that proper cascading occurs. This commit
also adding class names to the styles.
2013-01-21 16:55:21 -08:00
Jon Rohan
20e5b303a7 refactoring all the stylesheets into /Atom - Dark/
Conflicts:
	.atom/themes/Atom - Dark/vim-mode.css
2013-01-17 22:11:45 -08:00
Nathan Sobo
4f50133fd8 💩 remove print statements 2012-12-31 17:49:39 -06:00
Nathan Sobo
7af5067152 Move Theme loading to instance methods on TextMate & Atom subclasses 2012-12-31 17:48:46 -06:00
Nathan Sobo
2d73aa292d Make theme loading more similar to package loading
These changes are mostly aesthetic in nature. I just thought it would 
be a good idea to have theme loading be parallel to package loading as
much as possible. So I localized more logic on the `atom` global.
2012-12-31 14:18:45 -06:00
Nathan Sobo
fa7bcfe51b Bundle a themes directory so we don't depend on ~/.atom/themes
We'll look first in the user themes directory, then in the built-in
themes directory. This allows us to default to 'IR_Black' and not crash
if the user doesn't setup their `~/.atom/themes` directory.
2012-12-31 12:08:36 -06:00
Corey Johnson
4a6d336763 Theme.load can take multiple theme names 2012-12-27 16:13:53 -08:00
Corey Johnson
82abbaa71c Break AtomTheme out into its own file. 2012-12-27 15:25:16 -08:00
Corey Johnson
0d946078c9 Atom Themes can be loaded 2012-12-27 14:31:13 -08:00
Corey Johnson
d509507b0c TextMateTheme extend Theme 2012-12-27 12:12:58 -08:00