Skip to content

Commit

Permalink
fix(files): pluralize names and change extensions to .scss
Browse files Browse the repository at this point in the history
[Finishes #75928814 #75928814]

Signed-off-by: Bebe Peng <bpeng@pivotal.io>
  • Loading branch information
jenndodd authored and bebepeng committed Oct 17, 2014
1 parent 04f7989 commit 3c37e24
Show file tree
Hide file tree
Showing 48 changed files with 46 additions and 46 deletions.
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.
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ Use this with fields that require telephone numbers to pop up the dialpad on mob

/*doc
---
title: Validation
title: Validations
name: form_validation
categories:
- All
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.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*doc
---
title: Map
title: Maps
name: map
categories:
- All
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.
2 changes: 1 addition & 1 deletion src/pivotal-ui/frameworks/bootstrap-sass-v3.2.0.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Core variables and mixins
//@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables";
@import "../components/mixins.css.scss";
@import "../components/mixins.scss";
@import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/mixins";

// Reset and dependencies
Expand Down
File renamed without changes.
82 changes: 41 additions & 41 deletions src/pivotal-ui/pivotal-ui.scss
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
// Nothing can go before variables!
@import "components/variables.css.scss";
@import "components/variables.scss";

@import "compass/css3";
@import "compass/typography";
@import "components/mixins.css.scss";
@import "components/fonts.css.scss";
@import "components/mixins.scss";
@import "components/fonts.scss";

@import "frameworks/bootstrap-sass-v3.2.0.scss";
@import "frameworks/oocss.css.scss";
@import "frameworks/oocss.scss";

@import "components/utils.css.scss";
@import "components/utils.scss";

@import "components/colors.css.scss";
@import "components/backgrounds.css.scss";
@import "components/whitespace.css.scss";
@import "components/typography.css.scss";
@import "components/iconography.css.scss";
@import "components/button.css.scss";
@import "components/links.css.scss";
@import "components/grids.css.scss";
@import "components/media.css.scss";
@import "components/table.css.scss";
@import "components/panel.css.scss";
@import "components/alerts.css.scss";
@import "components/dividers.css.scss";
@import "components/lists.css.scss";
@import "components/tabs.css.scss";
@import "components/ellipsis.css.scss";
@import "components/collapse.css.scss";
@import "components/forms.css.scss";
@import "components/modals.css.scss";
@import "components/gravatar.css.scss";
@import "components/toggle.css.scss";
@import "components/spinners.css.scss";
@import "components/tooltip.css.scss";
@import "components/progress_bar.css.scss";
@import "components/traffic_lights.css.scss";
@import "components/hoverable.css.scss";
@import "components/inline_modal.css.scss";
@import "components/code.css.scss";
@import "components/image.css.scss";
@import "components/pane.css.scss";
@import "components/scale.css.scss";
@import "components/map.css.scss";
@import "components/labels.css.scss";
@import "components/ribbons.css.scss";
@import "components/embeds.css.scss";
@import "components/back_to_top.css.scss";
@import "components/colors.scss";
@import "components/backgrounds.scss";
@import "components/whitespace.scss";
@import "components/typography.scss";
@import "components/iconography.scss";
@import "components/buttons.scss";
@import "components/links.scss";
@import "components/grids.scss";
@import "components/media.scss";
@import "components/tables.scss";
@import "components/panels.scss";
@import "components/alerts.scss";
@import "components/dividers.scss";
@import "components/lists.scss";
@import "components/tabs.scss";
@import "components/ellipsis.scss";
@import "components/collapse.scss";
@import "components/forms.scss";
@import "components/modals.scss";
@import "components/gravatars.scss";
@import "components/toggles.scss";
@import "components/spinners.scss";
@import "components/tooltips.scss";
@import "components/progress_bars.scss";
@import "components/traffic_lights.scss";
@import "components/hoverable.scss";
@import "components/inline_modals.scss";
@import "components/code.scss";
@import "components/images.scss";
@import "components/panes.scss";
@import "components/scales.scss";
@import "components/maps.scss";
@import "components/labels.scss";
@import "components/ribbons.scss";
@import "components/embeds.scss";
@import "components/back_to_top.scss";
4 changes: 2 additions & 2 deletions src/style_guide/style_guide.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Styles specific to the styleguide, otherwise, not used
@import 'compass';
@import '../pivotal-ui/components/variables.css.scss';
@import '../pivotal-ui/components/mixins.css.scss';
@import '../pivotal-ui/components/variables.scss';
@import '../pivotal-ui/components/mixins.scss';

html {
background-color: $gray-9;
Expand Down

0 comments on commit 3c37e24

Please sign in to comment.