Skip to content

Commit

Permalink
Move styles into a subdirectory of client/
Browse files Browse the repository at this point in the history
We're getting rather a lot of these files, and it makes it hard to browse the
contents of the client/ folder.
  • Loading branch information
zarvox committed Mar 10, 2016
1 parent 04bb88f commit 9381650
Show file tree
Hide file tree
Showing 21 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ tmp
deps
node_modules
shell/client/changelog.html
shell/client/_icons.scss
shell/client/styles/_icons.scss
shell/sandstorm-shell.config
shell/sandstorm-shell.creator
shell/sandstorm-shell.creator.user
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ shell-env: tmp/.shell-env

# Note that we need Ekam to build node_modules before we can run Meteor, hence
# the dependency on tmp/.ekam-run.
tmp/.shell-env: tmp/.ekam-run $(IMAGES) shell/client/changelog.html shell/client/_icons.scss
tmp/.shell-env: tmp/.ekam-run $(IMAGES) shell/client/changelog.html shell/client/styles/_icons.scss
@mkdir -p tmp
@touch tmp/.shell-env
@mkdir -p node_modules/capnp
Expand All @@ -258,7 +258,7 @@ tmp/.shell-env: tmp/.ekam-run $(IMAGES) shell/client/changelog.html shell/client
icons/node_modules: icons/package.json
cd icons && $(METEOR_DEV_BUNDLE)/bin/npm install

shell/client/_icons.scss: icons/node_modules icons/*svg icons/Gruntfile.js
shell/client/styles/_icons.scss: icons/node_modules icons/*svg icons/Gruntfile.js
cd icons && PATH=$(METEOR_DEV_BUNDLE)/bin:$$PATH ./node_modules/.bin/grunt

shell/client/changelog.html: CHANGELOG.md
Expand Down
2 changes: 1 addition & 1 deletion icons/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = function(grunt) {
icons: {
src: "./*.svg",
dest: "../shell/public/icons",
destCss: "../shell/client",
destCss: "../shell/client/styles",
options: {
font: "icons",
engine: "node",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 9381650

Please sign in to comment.