Skip to content

Commit

Permalink
Revert "Next release (#901)" (#907)
Browse files Browse the repository at this point in the history
This reverts commit 705f992.
  • Loading branch information
houbly committed Dec 9, 2021
1 parent 26932a7 commit 4448e2e
Show file tree
Hide file tree
Showing 42 changed files with 648 additions and 46,295 deletions.
45,571 changes: 517 additions & 45,054 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@
},
"dependencies": {
"@sentry/browser": "^6.2.5",
"array-flat-polyfill": "^1.0.1",
"axios": "^0.21.1",
"findandreplacedomtext": "^0.4.6",
"gulp-sass": "^4.1.0",
Expand Down
7 changes: 2 additions & 5 deletions src/wmnds/assets/sass/styles/wmnds-grid/_wmnds-grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,13 @@
-ms-flex-line-pack: start;
align-content: flex-start;

& > [class*="wmnds-col-"] {
[class*="wmnds-col-"] {
display: inline-block;
zoom: 1;
letter-spacing: normal;
word-spacing: normal;
text-rendering: auto;
vertical-align: top;

&:not(.wmnds-btn) {
display: inline-block;
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/wmnds/components/button/_button.njk
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{{
wmndsIcon({
icon: iconLeft,
class: ('wmnds-btn__icon wmnds-btn__icon--left '+iconClasses)
class: ('wmnds-btn__icon '+iconClasses)
})
}}

Expand Down
46 changes: 6 additions & 40 deletions src/wmnds/components/button/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,19 @@ $btn-transition: ease-in-out background-color 0.2s, ease-in-out border 0.2s;
// default button styles aka cta btn
&.wmnds-btn {
box-sizing: border-box;
display: inline-flex;
display: inline-block;
position: relative;
min-height: 50px;
padding: $size-xs $size-xsm;
padding: $size-sm;
transition: $btn-transition;
border: 1px solid transparent;
border-radius: $btn-border-radius;
color: $white;
background-color: get-color(cta);
font-size: 1rem;
font-weight: bold;
line-height: 1.3rem;
text-align: center;
text-decoration: none;
cursor: pointer;
align-items: center;
justify-content: space-between;

&:hover {
background-color: get-color(cta, 30, dark);
Expand All @@ -40,12 +37,7 @@ $btn-transition: ease-in-out background-color 0.2s, ease-in-out border 0.2s;
width: 22px;
height: 22px;
fill: $white;
flex: 0 0 22px;
}

// button icon left style
&__icon--left {
margin-right: $size-xs;
vertical-align: top;
}

.wmnds-swift-logo-inline {
Expand All @@ -55,6 +47,7 @@ $btn-transition: ease-in-out background-color 0.2s, ease-in-out border 0.2s;
// button icon right style
&__icon--right {
margin-left: $size-sm;
float: right;
}

// Dark background variant
Expand Down Expand Up @@ -124,7 +117,6 @@ $btn-transition: ease-in-out background-color 0.2s, ease-in-out border 0.2s;
}

// Secondary (disabled)
&.wmnds-btn--disabled,
&.wmnds-btn--disabled:disabled {
border-color: get-color(disable);
color: get-color(disable);
Expand Down Expand Up @@ -212,16 +204,6 @@ $btn-transition: ease-in-out background-color 0.2s, ease-in-out border 0.2s;
fill: get-color(primary);
}

&:not(.wmnds-text-align-left),
&:not(.wmnds-text-align-center),
&:not(.wmnds-text-align-right) {
justify-content: flex-start;

.wmnds-btn__icon--right {
margin-left: auto;
}
}

.wmnds-btn__coloured-icon {
&--bus {
fill: get-color(bus);
Expand Down Expand Up @@ -289,15 +271,12 @@ $btn-transition: ease-in-out background-color 0.2s, ease-in-out border 0.2s;
}

&--favourite {
min-height: 0;
padding: 0;
border-radius: 0;
color: get-color(text);
background: none;
font-weight: normal;
line-height: 1;
cursor: pointer;
align-items: center;

.wmnds-btn__icon {
margin-right: $size-xsm;
Expand All @@ -315,6 +294,7 @@ $btn-transition: ease-in-out background-color 0.2s, ease-in-out border 0.2s;

// block modifier for full width buttons
&--block {
display: block;
width: 100%;
}

Expand All @@ -323,23 +303,9 @@ $btn-transition: ease-in-out background-color 0.2s, ease-in-out border 0.2s;
text-align: left;
}

// include helpers for button alignment
&.wmnds-text-align-left {
justify-content: flex-start;
}

&.wmnds-text-align-center {
justify-content: center;
}

&.wmnds-text-align-right {
justify-content: flex-end;
}

// Show button like a normal link modifier
&--link {
display: inline;
min-height: 0;
padding: 0;
border-radius: 0;
color: get-color(cta, 10, dark);
Expand Down
2 changes: 0 additions & 2 deletions src/wmnds/components/form-elements/_form-elements.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@

@import "form-label/form-label";
@import "checkboxes/checkboxes";
@import "checkboxes/checkbox-buttons/checkbox-buttons";
@import "date-input/date-input";
@import "dropdown/dropdown";
@import "error-message/error-message";
@import "file-upload/file-upload";
@import "number-input/number-input";
@import "text-input/text-input";
@import "question/question";
@import "radios/radios";
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 4448e2e

Please sign in to comment.