From d7d53ecb49fb18727088924496023508716ee160 Mon Sep 17 00:00:00 2001 From: Holger Koenemann Date: Fri, 12 Dec 2014 15:38:27 +0100 Subject: [PATCH] cleaning up --- content.php | 2 +- layouts/content-sidebar.css | 22 ------ layouts/sidebar-content.css | 22 ------ sass/theme.css | 74 ++++++++++++++++++++ sass/underscores/understrap_underscores.scss | 2 +- 5 files changed, 76 insertions(+), 46 deletions(-) delete mode 100644 layouts/content-sidebar.css delete mode 100644 layouts/sidebar-content.css create mode 100644 sass/theme.css diff --git a/content.php b/content.php index 2310882..0c4f8bc 100644 --- a/content.php +++ b/content.php @@ -24,7 +24,7 @@ →', 'understrap' ), the_title( '"', '"', false ) ) ); diff --git a/layouts/content-sidebar.css b/layouts/content-sidebar.css deleted file mode 100644 index cfe2329..0000000 --- a/layouts/content-sidebar.css +++ /dev/null @@ -1,22 +0,0 @@ -/* -Theme Name: understrap -Layout: Content-Sidebar -*/ - -.content-area { - float: left; - margin: 0 -25% 0 0; - width: 100%; -} -.site-main { - margin: 0 25% 0 0; -} -.site-content .widget-area { - float: right; - overflow: hidden; - width: 25%; -} -.site-footer { - clear: both; - width: 100%; -} \ No newline at end of file diff --git a/layouts/sidebar-content.css b/layouts/sidebar-content.css deleted file mode 100644 index 32aa0e8..0000000 --- a/layouts/sidebar-content.css +++ /dev/null @@ -1,22 +0,0 @@ -/* -Theme Name: understrap -Layout: Sidebar-Content -*/ - -.content-area { - float: right; - margin: 0 0 0 -25%; - width: 100%; -} -.site-main { - margin: 0 0 0 25%; -} -.site-content .widget-area { - float: left; - overflow: hidden; - width: 25%; -} -.site-footer { - clear: both; - width: 100%; -} \ No newline at end of file diff --git a/sass/theme.css b/sass/theme.css new file mode 100644 index 0000000..ca1b99e --- /dev/null +++ b/sass/theme.css @@ -0,0 +1,74 @@ +/* +Error: Invalid CSS after "...les/alignments"": expected "{", was ";" + on line 65 of underscores/understrap_underscores.scss + from line 1 of theme.scss + +60: @import "modules/accessibility"; +61: +62: /*-------------------------------------------------------------- +63: 7.0 Alignments +64: --------------------------------------------------------------*\/ +65: /@import "modules/alignments"; +66: +67: /*-------------------------------------------------------------- +68: 8.0 Clearings +69: --------------------------------------------------------------*\/ +70: @import "modules/clearings"; + +Backtrace: +underscores/understrap_underscores.scss:65 +theme.scss:1 +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/scss/parser.rb:1165:in `expected' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/scss/parser.rb:1101:in `expected' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/scss/parser.rb:1096:in `tok!' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/scss/parser.rb:641:in `block' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/scss/parser.rb:635:in `ruleset' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/scss/parser.rb:660:in `block_child' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/scss/parser.rb:653:in `block_contents' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/scss/parser.rb:117:in `stylesheet' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/scss/parser.rb:42:in `parse' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/engine.rb:393:in `_to_tree' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/engine.rb:299:in `to_tree' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:313:in `block in visit_import' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/stack.rb:88:in `block in with_import' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/stack.rb:115:in `with_frame' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/stack.rb:88:in `with_import' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:312:in `visit_import' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/base.rb:36:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:158:in `block in visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/stack.rb:79:in `block in with_base' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/stack.rb:115:in `with_frame' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/stack.rb:79:in `with_base' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:158:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/base.rb:52:in `block in visit_children' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/base.rb:52:in `map' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/base.rb:52:in `visit_children' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:167:in `block in visit_children' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:179:in `with_environment' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:166:in `visit_children' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/base.rb:36:in `block in visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:186:in `visit_root' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/base.rb:36:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:157:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/visitors/perform.rb:8:in `visit' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/root_node.rb:36:in `css_tree' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/tree/root_node.rb:29:in `render_with_sourcemap' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/engine.rb:368:in `_render_with_sourcemap' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/engine.rb:285:in `render_with_sourcemap' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/plugin/compiler.rb:490:in `update_stylesheet' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/plugin/compiler.rb:215:in `block in update_stylesheets' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/plugin/compiler.rb:209:in `each' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/plugin/compiler.rb:209:in `update_stylesheets' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/plugin.rb:82:in `update_stylesheets' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/exec/sass_scss.rb:350:in `watch_or_update' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/exec/sass_scss.rb:50:in `process_result' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/exec/base.rb:52:in `parse' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/lib/sass/exec/base.rb:19:in `parse!' +/Library/Ruby/Gems/2.0.0/gems/sass-3.4.9/bin/scss:13:in `' +/usr/bin/scss:23:in `load' +/usr/bin/scss:23:in `
' +*/ +body:before { + white-space: pre; + font-family: monospace; + content: "Error: Invalid CSS after \"...les/alignments\"\": expected \"{\", was \";\"\A on line 65 of underscores/understrap_underscores.scss\A from line 1 of theme.scss\A \A 60: @import \"modules/accessibility\";\A 61: \A 62: /*--------------------------------------------------------------\A 63: 7.0 Alignments\A 64: --------------------------------------------------------------*/\A 65: /@import \"modules/alignments\";\A 66: \A 67: /*--------------------------------------------------------------\A 68: 8.0 Clearings\A 69: --------------------------------------------------------------*/\A 70: @import \"modules/clearings\";"; } diff --git a/sass/underscores/understrap_underscores.scss b/sass/underscores/understrap_underscores.scss index 2912dff..4cde694 100644 --- a/sass/underscores/understrap_underscores.scss +++ b/sass/underscores/understrap_underscores.scss @@ -62,7 +62,7 @@ underscores.scss - Does the same than the original style.scss file from the _s t /*-------------------------------------------------------------- 7.0 Alignments --------------------------------------------------------------*/ -//@import "modules/alignments"; +@import "modules/alignments"; /*-------------------------------------------------------------- 8.0 Clearings