From 63854075d8f6eb39a073a8a6c0de71ebc22d4335 Mon Sep 17 00:00:00 2001 From: Jack Pearkes Date: Mon, 21 Apr 2014 16:07:14 -0400 Subject: [PATCH] ui: use a /static directory --- .gitignore | 1 + ui/Makefile | 4 +- ui/{styles => static}/bootstrap.min.css | 0 ui/styles/base.css | 54 ------------------------- ui/styles/base.scss | 1 - 5 files changed, 3 insertions(+), 57 deletions(-) rename ui/{styles => static}/bootstrap.min.css (100%) delete mode 100644 ui/styles/base.css diff --git a/.gitignore b/.gitignore index 9b2ca01b499d..3837fa81d83f 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ website/npm-debug.log *.attr ui/.sass-cache +ui/static/base.css diff --git a/ui/Makefile b/ui/Makefile index 2a1beb7c4439..5fecbef1cf0a 100644 --- a/ui/Makefile +++ b/ui/Makefile @@ -2,9 +2,9 @@ server: python -m SimpleHTTPServer watch: - sass styles --watch + sass styles:static --watch build: - sass styles + sass styles:static .PHONY: server watch build diff --git a/ui/styles/bootstrap.min.css b/ui/static/bootstrap.min.css similarity index 100% rename from ui/styles/bootstrap.min.css rename to ui/static/bootstrap.min.css diff --git a/ui/styles/base.css b/ui/styles/base.css deleted file mode 100644 index 7d164eeb3503..000000000000 --- a/ui/styles/base.css +++ /dev/null @@ -1,54 +0,0 @@ -/* -Syntax error: File to import not found or unreadable: layout. - Load paths: - /Users/pearkes/code/hashicorp/consul/ui - /Users/pearkes/code/hashicorp/consul/ui/styles - on line 2 of styles/base.scss - -1: @import "variables"; -2: @import "layout"; -3: -4: body { -5: background-color: $foobar; -6: } - -Backtrace: -styles/base.scss:2 -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/import_node.rb:67:in `rescue in import' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/import_node.rb:45:in `import' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/import_node.rb:28:in `imported_file' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/import_node.rb:37:in `css_import?' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/visitors/perform.rb:217:in `visit_import' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/visitors/base.rb:37:in `visit' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/visitors/perform.rb:100:in `visit' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/visitors/base.rb:53:in `block in visit_children' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/visitors/base.rb:53:in `map' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/visitors/base.rb:53:in `visit_children' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/visitors/perform.rb:109:in `block in visit_children' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/visitors/perform.rb:121:in `with_environment' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/visitors/perform.rb:108:in `visit_children' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/visitors/base.rb:37:in `block in visit' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/visitors/perform.rb:128:in `visit_root' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/visitors/base.rb:37:in `visit' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/visitors/perform.rb:100:in `visit' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/visitors/perform.rb:7:in `visit' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/tree/root_node.rb:20:in `render' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/engine.rb:315:in `_render' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/engine.rb:262:in `render' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/plugin/compiler.rb:362:in `update_stylesheet' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/plugin/compiler.rb:203:in `block in update_stylesheets' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/plugin/compiler.rb:201:in `each' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/plugin/compiler.rb:201:in `update_stylesheets' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/sass-3.2.19/lib/sass/plugin/compiler.rb:283:in `block in watch' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/listen-0.7.3/lib/listen/multi_listener.rb:108:in `call' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/listen-0.7.3/lib/listen/multi_listener.rb:108:in `on_change' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/listen-0.7.3/lib/listen/multi_listener.rb:117:in `block in initialize_adapter' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/listen-0.7.3/lib/listen/adapter.rb:198:in `call' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/listen-0.7.3/lib/listen/adapter.rb:198:in `report_changes' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/listen-0.7.3/lib/listen/adapter.rb:210:in `poll_changed_dirs' -/Users/pearkes/.rvm/gems/ruby-2.0.0-p247/gems/listen-0.7.3/lib/listen/adapters/darwin.rb:38:in `block in start' -*/ -body:before { - white-space: pre; - font-family: monospace; - content: "Syntax error: File to import not found or unreadable: layout.\A Load paths:\A /Users/pearkes/code/hashicorp/consul/ui\A /Users/pearkes/code/hashicorp/consul/ui/styles\A on line 2 of styles/base.scss\A \A 1: @import \"variables\";\A 2: @import \"layout\";\A 3: \A 4: body {\A 5: background-color: $foobar;\A 6: }"; } diff --git a/ui/styles/base.scss b/ui/styles/base.scss index c930db4e7c97..bbf2f515377e 100644 --- a/ui/styles/base.scss +++ b/ui/styles/base.scss @@ -1,5 +1,4 @@ @import "variables"; -@import "layout"; body { background-color: $foobar;