Permalink
Browse files

Reorganize core files

  • Loading branch information...
1 parent 3c3d922 commit bea12e6836c2f2b85f269fcb3a046f221236d554 @tysongach tysongach committed Mar 1, 2016
Showing with 73 additions and 71 deletions.
  1. +38 −37 core/_bourbon.scss
  2. 0 core/bourbon/{settings → helpers}/_scales.scss
  3. 0 core/bourbon/{addons → helpers}/_timing-functions.scss
  4. 0 core/bourbon/{addons → library}/_border-color.scss
  5. 0 core/bourbon/{addons → library}/_border-radius.scss
  6. 0 core/bourbon/{addons → library}/_border-style.scss
  7. 0 core/bourbon/{addons → library}/_border-width.scss
  8. 0 core/bourbon/{addons → library}/_buttons.scss
  9. 0 core/bourbon/{addons → library}/_clearfix.scss
  10. 0 core/bourbon/{addons → library}/_contrast-switch.scss
  11. 0 core/bourbon/{addons → library}/_ellipsis.scss
  12. 0 core/bourbon/{addons → library}/_font-face.scss
  13. 0 core/bourbon/{addons → library}/_font-stacks.scss
  14. 0 core/bourbon/{addons → library}/_hide-text.scss
  15. 0 core/bourbon/{addons → library}/_hide-visually.scss
  16. 0 core/bourbon/{addons → library}/_margin.scss
  17. 0 core/bourbon/{addons → library}/_modular-scale.scss
  18. 0 core/bourbon/{addons → library}/_padding.scss
  19. 0 core/bourbon/{addons → library}/_position.scss
  20. 0 core/bourbon/{addons → library}/_prefixer.scss
  21. 0 core/bourbon/{functions → library}/_shade.scss
  22. 0 core/bourbon/{addons → library}/_size.scss
  23. 0 core/bourbon/{functions → library}/_strip-unit.scss
  24. 0 core/bourbon/{addons → library}/_text-inputs.scss
  25. 0 core/bourbon/{functions → library}/_tint.scss
  26. 0 core/bourbon/{addons → library}/_word-wrap.scss
  27. 0 core/bourbon/{functions → utilities}/_assign-inputs.scss
  28. 0 core/bourbon/{settings → utilities}/_bourbon-get-setting.scss
  29. 0 core/bourbon/{functions → utilities}/_collapse-directionals.scss
  30. 0 core/bourbon/{helpers → utilities}/_directional-values.scss
  31. 0 core/bourbon/{functions → utilities}/_font-source-declaration.scss
  32. 0 core/bourbon/{functions → utilities}/_unpack.scss
  33. 0 core/bourbon/{functions → validators}/_contains-falsy.scss
  34. 0 core/bourbon/{functions → validators}/_contains.scss
  35. 0 core/bourbon/{functions → validators}/_is-length.scss
  36. 0 core/bourbon/{functions → validators}/_is-light.scss
  37. 0 core/bourbon/{functions → validators}/_is-number.scss
  38. 0 core/bourbon/{functions → validators}/_is-size.scss
  39. +3 −2 features/step_definitions/bourbon_steps.rb
  40. +1 −1 spec/bourbon/{addons → library}/border_color_spec.rb
  41. +1 −1 spec/bourbon/{addons → library}/border_radius_spec.rb
  42. +1 −1 spec/bourbon/{addons → library}/border_style_spec.rb
  43. +1 −1 spec/bourbon/{addons → library}/border_width_spec.rb
  44. +1 −1 spec/bourbon/{addons → library}/buttons_spec.rb
  45. +1 −1 spec/bourbon/{addons → library}/clearfix_spec.rb
  46. +1 −1 spec/bourbon/{addons → library}/contrast_switch_spec.rb
  47. +1 −1 spec/bourbon/{addons → library}/ellipsis_spec.rb
  48. 0 spec/bourbon/{addons → library}/font_face_spec_1.rb
  49. 0 spec/bourbon/{addons → library}/font_face_spec_2.rb
  50. 0 spec/bourbon/{addons → library}/font_face_spec_3.rb
  51. 0 spec/bourbon/{addons → library}/font_face_spec_4.rb
  52. +1 −1 spec/bourbon/{addons → library}/font_stacks_spec.rb
  53. +1 −1 spec/bourbon/{addons → library}/hide_text_spec.rb
  54. +1 −1 spec/bourbon/{addons → library}/hide_visually_spec.rb
  55. +1 −1 spec/bourbon/{addons → library}/margin_spec.rb
  56. +1 −1 spec/bourbon/{addons → library}/modular_scale_spec.rb
  57. +1 −1 spec/bourbon/{addons → library}/padding_spec.rb
  58. +1 −1 spec/bourbon/{addons → library}/position_spec.rb
  59. +1 −1 spec/bourbon/{functions → library}/shade_spec.rb
  60. +1 −1 spec/bourbon/{addons → library}/size_spec.rb
  61. +1 −1 spec/bourbon/{functions → library}/strip_unit_spec.rb
  62. +1 −1 spec/bourbon/{addons → library}/text_inputs_spec.rb
  63. +1 −1 spec/bourbon/{functions → library}/tint_spec.rb
  64. +1 −1 spec/bourbon/{addons → library}/word_wrap_spec.rb
  65. +1 −1 spec/bourbon/{functions → utilities}/assign_inputs_spec.rb
  66. +1 −1 spec/bourbon/{settings → utilities}/bourbon_get_setting_spec.rb
  67. +1 −1 spec/bourbon/{functions → utilities}/collapse_directionals.rb
  68. +1 −1 spec/bourbon/{helpers → utilities}/directional_values_spec.rb
  69. +1 −1 spec/bourbon/{functions → utilities}/font_source_declaration_spec.rb
  70. +1 −1 spec/bourbon/{functions → utilities}/unpack_spec.rb
  71. +1 −1 spec/bourbon/{functions → validators}/contains_spec.rb
  72. +1 −1 spec/bourbon/{functions → validators}/is_length_spec.rb
  73. +1 −1 spec/bourbon/{functions → validators}/is_light_spec.rb
  74. +1 −1 spec/bourbon/{functions → validators}/is_number_spec.rb
  75. +1 −1 spec/bourbon/{functions → validators}/is_size_spec.rb
  76. 0 spec/fixtures/{addons → library}/border-color.scss
  77. 0 spec/fixtures/{addons → library}/border-radius.scss
  78. 0 spec/fixtures/{addons → library}/border-style.scss
  79. 0 spec/fixtures/{addons → library}/border-width.scss
  80. 0 spec/fixtures/{addons → library}/buttons.scss
  81. 0 spec/fixtures/{addons → library}/clearfix.scss
  82. 0 spec/fixtures/{addons → library}/contrast-switch.scss
  83. 0 spec/fixtures/{addons → library}/ellipsis.scss
  84. 0 spec/fixtures/{addons → library}/font-face-1.scss
  85. 0 spec/fixtures/{addons → library}/font-face-2.scss
  86. 0 spec/fixtures/{addons → library}/font-face-3.scss
  87. 0 spec/fixtures/{addons → library}/font-face-4.scss
  88. 0 spec/fixtures/{addons → library}/font-stacks.scss
  89. 0 spec/fixtures/{addons → library}/hide-text.scss
  90. 0 spec/fixtures/{addons → library}/hide-visually.scss
  91. 0 spec/fixtures/{addons → library}/margin.scss
  92. 0 spec/fixtures/{addons → library}/modular-scale.scss
  93. 0 spec/fixtures/{addons → library}/padding.scss
  94. 0 spec/fixtures/{addons → library}/position.scss
  95. 0 spec/fixtures/{functions → library}/shade.scss
  96. 0 spec/fixtures/{addons → library}/size.scss
  97. 0 spec/fixtures/{functions → library}/strip-unit.scss
  98. 0 spec/fixtures/{addons → library}/text-inputs.scss
  99. 0 spec/fixtures/{functions → library}/tint.scss
  100. 0 spec/fixtures/{addons → library}/word-wrap.scss
  101. 0 spec/fixtures/{functions → utilities}/assign-inputs.scss
  102. 0 spec/fixtures/{settings → utilities}/bourbon-get-setting.scss
  103. 0 spec/fixtures/{functions → utilities}/collapse-directionals.scss
  104. 0 spec/fixtures/{helpers → utilities}/directional-values.scss
  105. 0 spec/fixtures/{functions → utilities}/font-source-declaration.scss
  106. 0 spec/fixtures/{functions → utilities}/unpack.scss
  107. 0 spec/fixtures/{functions → validators}/contains.scss
  108. 0 spec/fixtures/{functions → validators}/is-length.scss
  109. 0 spec/fixtures/{functions → validators}/is-light.scss
  110. 0 spec/fixtures/{functions → validators}/is-number.scss
  111. 0 spec/fixtures/{functions → validators}/is-size.scss
View
@@ -3,44 +3,45 @@
// Copyright 2011 thoughtbot, inc.
// MIT License
-@import "bourbon/settings/scales";
+@import "bourbon/helpers/scales";
+@import "bourbon/helpers/timing-functions";
+
@import "bourbon/settings/settings";
-@import "bourbon/settings/bourbon-get-setting";
-@import "bourbon/functions/assign-inputs";
-@import "bourbon/functions/collapse-directionals";
-@import "bourbon/functions/contains";
-@import "bourbon/functions/contains-falsy";
-@import "bourbon/functions/font-source-declaration";
-@import "bourbon/functions/is-length";
-@import "bourbon/functions/is-light";
-@import "bourbon/functions/is-number";
-@import "bourbon/functions/is-size";
-@import "bourbon/functions/shade";
-@import "bourbon/functions/strip-unit";
-@import "bourbon/functions/tint";
-@import "bourbon/functions/unpack";
+@import "bourbon/validators/contains";
+@import "bourbon/validators/contains-falsy";
+@import "bourbon/validators/is-length";
+@import "bourbon/validators/is-light";
+@import "bourbon/validators/is-number";
+@import "bourbon/validators/is-size";
-@import "bourbon/helpers/directional-values";
+@import "bourbon/utilities/assign-inputs";
+@import "bourbon/utilities/bourbon-get-setting";
+@import "bourbon/utilities/collapse-directionals";
+@import "bourbon/utilities/directional-values";
+@import "bourbon/utilities/font-source-declaration";
+@import "bourbon/utilities/unpack";
-@import "bourbon/addons/border-color";
-@import "bourbon/addons/border-radius";
-@import "bourbon/addons/border-style";
-@import "bourbon/addons/border-width";
-@import "bourbon/addons/buttons";
-@import "bourbon/addons/clearfix";
-@import "bourbon/addons/contrast-switch";
-@import "bourbon/addons/ellipsis";
-@import "bourbon/addons/font-face";
-@import "bourbon/addons/font-stacks";
-@import "bourbon/addons/hide-text";
-@import "bourbon/addons/hide-visually";
-@import "bourbon/addons/margin";
-@import "bourbon/addons/modular-scale";
-@import "bourbon/addons/padding";
-@import "bourbon/addons/position";
-@import "bourbon/addons/prefixer";
-@import "bourbon/addons/size";
-@import "bourbon/addons/text-inputs";
-@import "bourbon/addons/timing-functions";
-@import "bourbon/addons/word-wrap";
+@import "bourbon/library/border-color";
+@import "bourbon/library/border-radius";
+@import "bourbon/library/border-style";
+@import "bourbon/library/border-width";
+@import "bourbon/library/buttons";
+@import "bourbon/library/clearfix";
+@import "bourbon/library/contrast-switch";
+@import "bourbon/library/ellipsis";
+@import "bourbon/library/font-face";
+@import "bourbon/library/font-stacks";
+@import "bourbon/library/hide-text";
+@import "bourbon/library/hide-visually";
+@import "bourbon/library/margin";
+@import "bourbon/library/modular-scale";
+@import "bourbon/library/padding";
+@import "bourbon/library/position";
+@import "bourbon/library/prefixer";
+@import "bourbon/library/shade";
+@import "bourbon/library/size";
+@import "bourbon/library/strip-unit";
+@import "bourbon/library/text-inputs";
+@import "bourbon/library/tint";
+@import "bourbon/library/word-wrap";
@@ -7,10 +7,11 @@
Then /^the sass directories(?: with "([^"]+)" prefix)? should have been generated$/ do |prefix|
sass_directories = [
- "bourbon/addons",
"bourbon/helpers",
- "bourbon/functions",
+ "bourbon/library",
"bourbon/settings",
+ "bourbon/utilities",
+ "bourbon/validators",
]
sass_directories.map!{ |directory| bourbon_path(prefix, directory) }
check_directory_presence(sass_directories, true)
@@ -2,7 +2,7 @@
describe "border-color" do
before(:all) do
- ParserSupport.parse_file("addons/border-color")
+ ParserSupport.parse_file("library/border-color")
end
context "called with one color" do
@@ -2,7 +2,7 @@
describe "border-radius" do
before(:all) do
- ParserSupport.parse_file("addons/border-radius")
+ ParserSupport.parse_file("library/border-radius")
end
context "called with one argument" do
@@ -2,7 +2,7 @@
describe "border-style" do
before(:all) do
- ParserSupport.parse_file("addons/border-style")
+ ParserSupport.parse_file("library/border-style")
end
context "called with one style" do
@@ -2,7 +2,7 @@
describe "border-width" do
before(:all) do
- ParserSupport.parse_file("addons/border-width")
+ ParserSupport.parse_file("library/border-width")
end
context "called with one color" do
@@ -2,7 +2,7 @@
describe "buttons" do
before(:all) do
- ParserSupport.parse_file("addons/buttons")
+ ParserSupport.parse_file("library/buttons")
@buttons_list = %w(
button
@@ -2,7 +2,7 @@
describe "clearfix" do
before(:all) do
- ParserSupport.parse_file("addons/clearfix")
+ ParserSupport.parse_file("library/clearfix")
end
context "called on element" do
@@ -2,7 +2,7 @@
describe "contrast-switch" do
before(:all) do
- ParserSupport.parse_file("addons/contrast-switch")
+ ParserSupport.parse_file("library/contrast-switch")
end
context "called with a light base color" do
@@ -2,7 +2,7 @@
describe "ellipsis" do
before(:all) do
- ParserSupport.parse_file("addons/ellipsis")
+ ParserSupport.parse_file("library/ellipsis")
end
context "called on element" do
@@ -2,7 +2,7 @@
describe "font-stacks" do
before(:all) do
- ParserSupport.parse_file("addons/font-stacks")
+ ParserSupport.parse_file("library/font-stacks")
end
context "stacks used in variable" do
@@ -2,7 +2,7 @@
describe "hide-text" do
before(:all) do
- ParserSupport.parse_file("addons/hide-text")
+ ParserSupport.parse_file("library/hide-text")
end
context "called on element" do
@@ -2,7 +2,7 @@
describe "hide-visually" do
before(:all) do
- ParserSupport.parse_file("addons/hide-visually")
+ ParserSupport.parse_file("library/hide-visually")
end
context "called on element" do
@@ -2,7 +2,7 @@
describe "margin" do
before(:all) do
- ParserSupport.parse_file("addons/margin")
+ ParserSupport.parse_file("library/margin")
end
context "called with one size" do
@@ -2,7 +2,7 @@
describe "modular-scale" do
before(:all) do
- ParserSupport.parse_file("addons/modular-scale")
+ ParserSupport.parse_file("library/modular-scale")
end
context "called with arguments (1, $value: 2em)" do
@@ -2,7 +2,7 @@
describe "padding" do
before(:all) do
- ParserSupport.parse_file("addons/padding")
+ ParserSupport.parse_file("library/padding")
end
context "called with one size" do
@@ -2,7 +2,7 @@
describe "position" do
before(:all) do
- ParserSupport.parse_file("addons/position")
+ ParserSupport.parse_file("library/position")
end
context "called with one size" do
@@ -2,7 +2,7 @@
describe "shade" do
before(:all) do
- ParserSupport.parse_file("functions/shade")
+ ParserSupport.parse_file("library/shade")
end
context "called on white" do
@@ -2,7 +2,7 @@
describe "size" do
before(:all) do
- ParserSupport.parse_file("addons/size")
+ ParserSupport.parse_file("library/size")
end
context "called with one size" do
@@ -2,7 +2,7 @@
describe "strip-unit" do
before(:all) do
- ParserSupport.parse_file("functions/strip-unit")
+ ParserSupport.parse_file("library/strip-unit")
end
context "called with px" do
@@ -2,7 +2,7 @@
describe "text-inputs" do
before(:all) do
- ParserSupport.parse_file("addons/text-inputs")
+ ParserSupport.parse_file("library/text-inputs")
@inputs_list = %w(
[type='color']
@@ -2,7 +2,7 @@
describe "tint" do
before(:all) do
- ParserSupport.parse_file("functions/tint")
+ ParserSupport.parse_file("library/tint")
end
context "called on white" do
@@ -2,7 +2,7 @@
describe "word-wrap" do
before(:all) do
- ParserSupport.parse_file("addons/word-wrap")
+ ParserSupport.parse_file("library/word-wrap")
end
context "called on element" do
@@ -2,7 +2,7 @@
describe "assign-inputs" do
before(:all) do
- ParserSupport.parse_file("functions/assign-inputs")
+ ParserSupport.parse_file("utilities/assign-inputs")
@text_inputs_list = [
"[type='password']",
"[type='text']",
@@ -2,7 +2,7 @@
describe "_bourbon-get-setting" do
before(:all) do
- ParserSupport.parse_file("settings/bourbon-get-setting")
+ ParserSupport.parse_file("utilities/bourbon-get-setting")
end
context "gets the modular-scale-base setting" do
@@ -2,7 +2,7 @@
describe "collapse-directionals" do
before(:all) do
- ParserSupport.parse_file("functions/collapse-directionals")
+ ParserSupport.parse_file("utilities/collapse-directionals")
end
context "collapse-directionals" do
@@ -2,7 +2,7 @@
describe "directional-values" do
before(:all) do
- ParserSupport.parse_file("helpers/directional-values")
+ ParserSupport.parse_file("utilities/directional-values")
end
context "directional-property" do
@@ -2,7 +2,7 @@
describe "font-source-declaration" do
before(:all) do
- ParserSupport.parse_file("functions/font-source-declaration")
+ ParserSupport.parse_file("utilities/font-source-declaration")
end
context "called with pipeline" do
@@ -2,7 +2,7 @@
describe "unpack" do
before(:all) do
- ParserSupport.parse_file("functions/unpack")
+ ParserSupport.parse_file("utilities/unpack")
end
context "single" do
@@ -2,7 +2,7 @@
describe "contains" do
before(:all) do
- ParserSupport.parse_file("functions/contains")
+ ParserSupport.parse_file("validators/contains")
end
context "called on array with single item" do
@@ -2,7 +2,7 @@
describe "is-length" do
before(:all) do
- ParserSupport.parse_file("functions/is-length")
+ ParserSupport.parse_file("validators/is-length")
end
context "checks if unitless integer can be represented as a length" do
@@ -2,7 +2,7 @@
describe "is-light" do
before(:all) do
- ParserSupport.parse_file("functions/is-light")
+ ParserSupport.parse_file("validators/is-light")
end
context "takes a light color" do
@@ -2,7 +2,7 @@
describe "is-number" do
before(:all) do
- ParserSupport.parse_file("functions/is-number")
+ ParserSupport.parse_file("validators/is-number")
end
context "called with integer" do
@@ -2,7 +2,7 @@
describe "is-size" do
before(:all) do
- ParserSupport.parse_file("functions/is-size")
+ ParserSupport.parse_file("validators/is-size")
end
context "called with integer" do

0 comments on commit bea12e6

Please sign in to comment.