Skip to content

Commit ff71eab

Browse files
committed
minor fixes
1 parent e5d3e0b commit ff71eab

8 files changed

Lines changed: 14 additions & 63 deletions

File tree

.npmignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ script
1515
package-lock.json
1616

1717
# we ignore this because everything in src/ is copied out in script/prepublish
18-
src/
18+
scss/

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@webpixels/css",
33
"description": "Utility and component-centric design system based on Bootstrap for fast, responsive UI development.",
4-
"version": "3.0.0-beta.1",
4+
"version": "3.0.0-beta.2",
55
"version_short": "3.0",
66
"license": "MIT",
77
"style": "dist/all.css",

scss/_forms.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@import "bootstrap/scss/forms";
22

3-
@import "./forms/labels";
43
@import "./forms/form-group";
54
@import "./forms/form-control";
65
@import "./forms/input-group";

scss/_index.scss

Lines changed: 0 additions & 48 deletions
This file was deleted.

scss/_variables.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,10 @@ $font-monospace-system: ui-monospace, SFMono-Regular, Menlo, Monaco, Consola
134134

135135
// Additional variable to add custom fonts
136136
// add here you custom fonts after you install them
137-
$font-sans-serif: null !default;
138-
$font-serif: null !default;
139-
$font-display: $font-sans-serif !default !default;
140-
$font-monospace: null !default;
137+
$font-sans-serif: null !default;
138+
$font-serif: null !default;
139+
$font-display: $font-sans-serif !default;
140+
$font-monospace: null !default;
141141

142142
// Generate the font family by adding the custom font to the collection if that exists
143143
$font-sans-serif-bundle: if($font-sans-serif, #{$font-sans-serif,$font-sans-serif-system}, $font-sans-serif-system) !default;
@@ -338,6 +338,7 @@ $btn-neutral-active-color: $gray-700 !default;
338338
// Forms
339339
$form-label-font-size: $font-size-sm !default;
340340
$form-label-font-weight: $font-weight-semibold !default;
341+
$form-label-margin-bottom: 0 !default;
341342

342343
$input-box-shadow: 0px 1px 2px rgba(50, 50, 71, 0.08) !default;
343344

scss/all.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// 3. Include component overrides or custom built ones
88
@import "type";
99
@import "accordion";
10+
@import "alert";
1011
@import "avatar";
1112
@import "badge";
1213
@import "breadcrumb";

scss/forms/_form-check.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
// Form checks
33
//
44

5+
.form-check-label {
6+
@include font-size($form-label-font-size);
7+
font-style: $form-label-font-style;
8+
font-weight: $form-label-font-weight;
9+
color: $form-label-color;
10+
}
511

612
// Switch
713
.form-switch {

scss/forms/_labels.scss

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)