Skip to content

Commit c4d7fb9

Browse files
extrabrightextrabright
committed
minor fixes
1 parent 675e911 commit c4d7fb9

File tree

19 files changed

+167
-264
lines changed

19 files changed

+167
-264
lines changed

‎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": "2.0.0-beta.24",
4+
"version": "2.0.0-beta.25",
55
"version_short": "2.0",
66
"license": "MIT",
77
"style": "dist/index.css",

‎scss/base/_reboot.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// additional styles for normalizing CSS
44
//
55

6-
76
iframe {
87
display: block;
98
vertical-align: middle;

‎scss/components/_badge.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
.badge-xs {
1616
--#{$prefix}badge-padding-x: .5rem;
1717
--#{$prefix}badge-padding-y: .1rem;
18-
font-size: 60%;
18+
font-size: 70%;
1919
}
2020

2121
.badge-md {

‎scss/components/_dropdown.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
.dropdown-item {
77
--#{$prefix}dropdown-item-border-radius: #{$dropdown-item-border-radius};
8-
98
@include border-radius(var(--#{$prefix}dropdown-item-border-radius, 0));
109
}
1110

‎scss/components/_navbar-vertical.scss‎

Lines changed: 3 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -2,113 +2,6 @@
22
// Vertical navbar
33
//
44

5-
.navbar-vertical {
6-
&.navbar-expand {
7-
@each $breakpoint in map-keys($grid-breakpoints) {
8-
$next: breakpoint-next($breakpoint, $grid-breakpoints);
9-
$infix: breakpoint-infix($next, $grid-breakpoints);
10-
11-
&#{$infix} {
12-
@include media-breakpoint-up($next) {
13-
display: block;
14-
width: 100%;
15-
max-width: $navbar-vertical-open-width;
16-
overflow-y: auto;
17-
z-index: 1000;
18-
@include border-radius($navbar-vertical-border-radius);
19-
20-
@if $enable-shadows {
21-
@include box-shadow($navbar-vertical-box-shadow);
22-
}
23-
24-
@include media-breakpoint-up(xs) {
25-
+ .main-content {
26-
margin-left: $navbar-vertical-width;
27-
}
28-
}
29-
30-
// Content
31-
.nav-link-text,
32-
.navbar-heading {
33-
opacity: 0;
34-
pointer-events: none;
35-
@include transition($transition-base);
36-
}
37-
38-
&.show {
39-
max-width: $navbar-vertical-open-width;
40-
@include border-radius($navbar-vertical-open-border-radius);
41-
42-
// Sizes
43-
&.navbar-lg {
44-
max-width: $navbar-vertical-width-lg;
45-
}
46-
47-
&.navbar-xl {
48-
max-width: $navbar-vertical-width-xl;
49-
}
50-
51-
.nav-link-text,
52-
.navbar-heading {
53-
opacity: 1;
54-
pointer-events: auto;
55-
}
56-
57-
+ .main-content {
58-
margin-left: $navbar-vertical-open-width;
59-
}
60-
}
61-
62-
&.hide {
63-
max-width: $navbar-vertical-width;
64-
65-
.nav-link-text {
66-
opacity: 0;
67-
pointer-events: none;
68-
}
69-
70-
+ .main-content {
71-
margin-left: $navbar-vertical-width;
72-
}
73-
}
74-
75-
// Navbar brand
76-
.navbar-brand {
77-
margin-right: 0;
78-
padding-top: 1.25rem;
79-
padding-bottom: 1.25rem;
80-
}
81-
82-
// Container
83-
>[class*="container"] {
84-
flex-direction: column;
85-
align-items: stretch;
86-
min-height: 100%;
87-
padding-left: 0;
88-
padding-right: 0;
89-
}
90-
91-
// Navbar collapse
92-
.navbar-collapse {
93-
flex: 1;
94-
display: flex;
95-
flex-direction: column;
96-
align-items: stretch;
97-
opacity: 1;
98-
}
99-
100-
// Navbar navigation
101-
.navbar-nav {
102-
margin-left: 0;
103-
margin-right: 0;
104-
flex-direction: column;
105-
}
106-
}
107-
}
108-
}
109-
}
110-
}
111-
1125
.navbar-vertical-nav {
1136
--#{$prefix}navbar-nav-link-padding-x: #{$navbar-vertical-nav-link-padding-x};
1147
--#{$prefix}navbar-nav-link-padding-y: #{$navbar-vertical-nav-link-padding-y};
@@ -179,9 +72,9 @@
17972
margin-top: var(--#{$prefix}navbar-nav-link-padding-y);
18073

18174
.nav-link {
182-
padding-top: calc(var(--#{$prefix}navbar-nav-link-padding-y) / 1.75);
183-
padding-bottom: calc(var(--#{$prefix}navbar-nav-link-padding-y) / 1.75);
184-
padding-left: calc(var(--#{$prefix}nav-link-padding-x) + $navbar-icon-min-width);
75+
padding: calc(var(--#{$prefix}navbar-nav-link-padding-y) / 1.75) .5rem;
76+
margin-left: $navbar-icon-min-width;
77+
margin-right: $navbar-icon-min-width;
18578
color: var(--#{$prefix}navbar-color);
18679
font-weight: 400;
18780

‎scss/components/_navbar.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
> .nav-item > .nav-link,
1717
> .nav-link {
1818
padding: var(--#{$prefix}navbar-nav-link-padding-y) var(--#{$prefix}navbar-nav-link-padding-x);
19+
}
20+
21+
.nav-link {
1922
background-color: var(--#{$prefix}navbar-nav-link-bg);
2023
@include border-radius(var(--#{$prefix}navbar-nav-link-border-radius));
2124

@@ -36,6 +39,8 @@
3639
}
3740
}
3841

42+
43+
3944
.navbar-user {
4045
display: flex;
4146
flex-direction: row;

‎scss/components/_progress.scss‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33
//
44

55
// Progress circle
6-
@keyframes progressCircleGrow {
7-
0%, 33% {
8-
--#{$prefix}progress-circle-percentage: 0;
9-
}
10-
100% {
11-
--#{$prefix}progress-circle-percentage: var(--value);
12-
}
13-
}
146

157
@property --#{$prefix}progress-circle-percentage {
168
syntax: '<number>';
@@ -25,7 +17,6 @@
2517
--#{$prefix}progress-circle-bar-bg: #{$progress-circle-bar-bg};
2618
--#{$prefix}progress-circle-percentage: var(--value);
2719

28-
animation: progressCircleGrow 3s 1 forwards;
2920
width: var(--#{$prefix}progress-circle-size);
3021
height: var(--#{$prefix}progress-circle-size);
3122
border-radius: 50%;
@@ -36,6 +27,10 @@
3627
font-size: calc(var(--#{$prefix}progress-circle-size) / 5);
3728
}
3829

30+
.progress-circle-animate {
31+
animation: progressCircleGrow 3s 1 forwards;
32+
}
33+
3934
.progress-circle-counter {
4035
&::before {
4136
counter-reset: percentage var(--value);
@@ -61,4 +56,15 @@
6156
--#{$prefix}progress-circle-color: var(--#{$prefix}#{$color});
6257
--#{$prefix}progress-circle-bar-bg: var(--#{$prefix}#{$color});
6358
}
59+
}
60+
61+
// Keyframes
62+
63+
@keyframes progressCircleGrow {
64+
0%, 33% {
65+
--#{$prefix}progress-circle-percentage: 0;
66+
}
67+
100% {
68+
--#{$prefix}progress-circle-percentage: var(--value);
69+
}
6470
}

‎scss/extra.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
2-
* Webpixels CSS v2.0.0-beta.24 (https://webpixels.io/)
3-
* Copyright 2024 Webpixels
2+
* Webpixels CSS v2.0.0-beta.25 (https://webpixels.io/)
3+
* Copyright 2025 Webpixels
44
* Licensed under MIT (https://github.com/webpixels/css/blob/main/LICENSE)
55
*/
66

‎scss/forms/_form-group.scss‎

Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,25 @@
33
.form-select {
44
position: relative;
55
box-sizing: border-box;
6-
height: auto;
76

8-
&:focus {
9-
z-index: 2;
10-
// box-shadow: none;
11-
}
12-
}
13-
14-
> :first-child {
15-
.form-control,
16-
.form-select {
7+
&:first-of-type {
178
margin-bottom: -1px;
18-
@include border-bottom-radius(0);
9+
border-bottom-right-radius: 0;
10+
border-bottom-left-radius: 0;
1911
}
20-
}
2112

22-
> :last-child {
23-
.form-control,
24-
.form-select {
25-
@include border-top-radius(0);
13+
&:not(:first-of-type):not(:last-of-type) {
14+
margin-bottom: -1px;
15+
border-radius: 0;
2616
}
27-
}
28-
29-
> .row {
30-
margin: 0;
3117

32-
> :first-child,
33-
> :last-child {
34-
padding: 0;
18+
&:last-of-type {
19+
border-top-left-radius: 0;
20+
border-top-right-radius: 0;
3521
}
3622

37-
> :first-child {
38-
.form-control,
39-
.form-select {
40-
border-right: 0;
41-
@include border-end-radius(0);
42-
}
43-
}
44-
> :last-child {
45-
.form-control,
46-
.form-select {
47-
@include border-start-radius(0);
48-
}
23+
&:focus {
24+
z-index: 2;
4925
}
5026
}
5127
}

‎scss/forms/_form.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,4 @@
3535
}
3636
}
3737
}
38-
3938
}

0 commit comments

Comments
 (0)