Merge pull request #190 from theonion/bulbs-styles-v2

Bulbs styles v2
theonion · May 19, 2016 · 6f5a0fd · 6f5a0fd
2 parents 1de1310 + ea045e8
commit 6f5a0fd
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 19 deletions.
diff --git a/bulbs/__init__.py b/bulbs/__init__.py
@@ -1 +1 @@
-__version__ = "2.1.0"
+__version__ = "2.2.0"
diff --git a/...es/stylesheets/components/video-grid.scss → ...s/bulbs-styles/components/video-grid.scss b/...es/stylesheets/components/video-grid.scss → ...s/bulbs-styles/components/video-grid.scss
@@ -8,8 +8,7 @@
 @import '../mixins/flex-grid';
 @import '../mixins/aspect-ratio';
 @import '../mixins/ease';
-@import '../global/breakpoints';
-@import '../extends/vertical-center-flex';
+@import '../variables/breakpoints';
 
 .video-grid {
   h2 {

diff --git a/...yles/stylesheets/mixins/aspect-ratio.scss → ...les/bulbs-styles/mixins/aspect-ratio.scss b/...yles/stylesheets/mixins/aspect-ratio.scss → ...les/bulbs-styles/mixins/aspect-ratio.scss
diff --git a/...tatic/styles/stylesheets/mixins/ease.scss → ...atic/styles/bulbs-styles/mixins/ease.scss b/...tatic/styles/stylesheets/mixins/ease.scss → ...atic/styles/bulbs-styles/mixins/ease.scss
diff --git a/.../styles/stylesheets/mixins/flex-grid.scss → ...styles/bulbs-styles/mixins/flex-grid.scss b/.../styles/stylesheets/mixins/flex-grid.scss → ...styles/bulbs-styles/mixins/flex-grid.scss
diff --git a/...ic/styles/stylesheets/mixins/flexbox.scss → ...c/styles/bulbs-styles/mixins/flexbox.scss b/...ic/styles/stylesheets/mixins/flexbox.scss → ...c/styles/bulbs-styles/mixins/flexbox.scss
diff --git a/bulbs/styles/static/styles/bulbs-styles/mixins/vertical-center-flex.scss b/bulbs/styles/static/styles/bulbs-styles/mixins/vertical-center-flex.scss
@@ -0,0 +1,13 @@
+//////////////////////////////
+// ************************ //
+//   VERTICAL CENTER FLEX   //
+// ************************ //
+//////////////////////////////
+
+@import 'flexbox';
+
+@mixin vertical-center-flex() {
+  @include flexbox;
+  @include justify-content(center);
+  @include align-items(center);
+}
diff --git a/...tyles/stylesheets/global/breakpoints.scss → ...s/bulbs-styles/variables/breakpoints.scss b/...tyles/stylesheets/global/breakpoints.scss → ...s/bulbs-styles/variables/breakpoints.scss
diff --git a/bulbs/styles/static/styles/stylesheets/extends/vertical-center-flex.scss b/bulbs/styles/static/styles/stylesheets/extends/vertical-center-flex.scss