Skip to content

Commit

Permalink
Updated to bootstrap4 beta
Browse files Browse the repository at this point in the history
  • Loading branch information
colintucker committed Aug 29, 2017
1 parent cf9a792 commit 06c75a1
Show file tree
Hide file tree
Showing 24 changed files with 999 additions and 436 deletions.
12 changes: 9 additions & 3 deletions _config/styles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,19 @@ SilverWare\Grid\Frameworks\Bootstrap\Framework:
justify: justify
background:
primary: bg-primary
secondary: bg-secondary
success: bg-success
info: bg-info
warning: bg-warning
danger: bg-danger
inverse: bg-inverse
faded: bg-faded
white: bg-white
light: bg-light
dark: bg-dark
feature:
block: card-block
body: card-body
feature: card
heading: card-title
sub-heading: card-subtitle
image-top: card-img-top
figure:
figure: figure
Expand All @@ -59,11 +62,14 @@ SilverWare\Grid\Frameworks\Bootstrap\Framework:
text:
text: text
primary: text-primary
secondary: text-secondary
success: text-success
info: text-info
warning: text-warning
danger: text-danger
white: text-white
light: text-light
dark: text-dark
viewport:
small: sm
medium: md
Expand Down
9 changes: 7 additions & 2 deletions _config/theme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,21 @@ SilverWare\Extensions\Style\ThemeStyle:
theme_styles:
ColorBackground:
background.primary: Primary
background.secondary: Secondary
background.success: Success
background.info: Info
background.warning: Warning
background.danger: Danger
background.inverse: Inverse
background.faded: Faded
background.white: White
background.light: Light
background.dark: Dark
ColorForeground:
text.primary: Primary
text.secondary: Secondary
text.success: Success
text.info: Info
text.warning: Warning
text.danger: Danger
text.white: White
text.light: Light
text.dark: Dark
2 changes: 1 addition & 1 deletion admin/client/dist/js/bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion admin/client/dist/js/preview.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion admin/client/src/styles/forms/DimensionsField.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

display: inline-block;
line-height: 30px;
margin-right: $spacer-x / 2;
margin-right: $spacer / 2;

&:last-child {
display: none;
Expand Down
2 changes: 1 addition & 1 deletion client/dist/js/bundle.js

Large diffs are not rendered by default.

Loading

0 comments on commit 06c75a1

Please sign in to comment.