Skip to content

Commit

Permalink
Merge branch 'release' into 'master'
Browse files Browse the repository at this point in the history 
PB-25738: Styleguide version bump to v4.20

See merge request passbolt/passbolt-styleguide!1279
  • Loading branch information
@cedricalfonsi
cedricalfonsi committed Aug 17, 2023
2 parents 4842103 + 5959c8a commit fc44296
Show file tree
Hide file tree
Showing 269 changed files with 9,050 additions and 3,674 deletions.
4 changes: 2 additions & 2 deletions package-lock.json
View file

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

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "passbolt-styleguide",
"version": "4.1.3",
"version": "4.2.0",
"license": "AGPL-3.0",
"copyright": "Copyright 2023 Passbolt SA",
"description": "Passbolt styleguide contains common styling assets used by the different sites, plugin, etc.",
Expand Down
32 changes: 32 additions & 0 deletions src/img/third_party/windowsstore.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 5 additions & 2 deletions src/less/abstractions/colors.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
@text-notification-color: @black;

/* label */
@label-active-background: @white;
@label-active-background: none;
@label-active-text-color: @black;

/* header */
Expand Down Expand Up @@ -187,7 +187,7 @@
@input-infield-border: @chinese-white;
@input-focus-border: @bleu-de-france;

/* passwords */
/* passwords */
@input-passwords-special-chars-color: @ultramarine-blue;
@input-passwords-numbers-color: @international-orange;

Expand Down Expand Up @@ -246,6 +246,8 @@
@complexity-text-color: @gray-2;
@complexity-bar-default-background: @gray-x11;
@complexity-bar-gradient-background: linear-gradient(to right, @dark-candy-apple-red, @bright-yellow, @islamic-green);
@complexity-bar-low-color: @dark-candy-apple-red;
@complexity-bar-high-color: @islamic-green;

/* hints */
@hint-success-color: @islamic-green-2;
Expand All @@ -263,6 +265,7 @@

/* chips */
@chips-text-color: @white;
@chips-background: @gray;
@chips-beta-background: @spanish-orange;
@chips-new-background: @bleu-de-france;

Expand Down
3 changes: 2 additions & 1 deletion src/less/abstractions/colors_custom.sample.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
@text-notification-color: @text-icon-main-color;

/* label */
@label-active-background: @main-color;
@label-active-background: none;
@label-active-text-color: @text-icon-main-color;

/* header */
Expand Down Expand Up @@ -260,6 +260,7 @@

/* chips */
@chips-text-color: @main-color;
@chips-background: @main-color-gradient-3;
@chips-beta-background: @warning-4;
@chips-new-background: @primary-color-3;

Expand Down
11 changes: 8 additions & 3 deletions src/less/abstractions/colors_migdar.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
@chinese-silver: #CACACA;
@azureish-white: #DDEBF8;
@bright-gray: #EBEBE9;
@cultured-2: #F8F8F8;
@chinese-white: #E0E0E0;

@cornflower-blue: #6895fa;
@fire-opal: #ef6157;
Expand All @@ -77,7 +79,7 @@
@text-notification-color: @black;

/* label */
@label-active-background: @raisin-black;
@label-active-background: none;
@label-active-text-color: @white;

/* header */
Expand Down Expand Up @@ -186,10 +188,10 @@
@input-infield-border: @raisin-black;
@input-focus-border: @bleu-de-france;

/* passwords */
/* passwords */
@input-passwords-special-chars-color: @cornflower-blue;
@input-passwords-numbers-color: @fire-opal;


/* checkbox */
@input-checkbox-background: @raisin-black;
Expand Down Expand Up @@ -246,6 +248,8 @@
@complexity-text-color: @white;
@complexity-bar-default-background: @arsenic;
@complexity-bar-gradient-background: linear-gradient(to right, @dark-candy-apple-red, @bright-yellow, @islamic-green);
@complexity-bar-low-color: @dark-candy-apple-red;
@complexity-bar-high-color: @islamic-green;

/* hints */
@hint-success-color: @islamic-green-2;
Expand All @@ -263,6 +267,7 @@

/* chips */
@chips-text-color: @white;
@chips-background: @gray;
@chips-beta-background: @spanish-orange;
@chips-new-background: @bleu-de-france;

Expand Down
11 changes: 9 additions & 2 deletions src/less/abstractions/colors_solarized-dark.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@

@satin-sheen-gold: #cea332;
@fire-opal: #ef6157;
@rosso-corsa: #D40101;
@cultured-2: #F8F8F8;
@chinese-white: #E0E0E0;
@black: #000000;

/* palette: main color gradient */
@hue: 194;
Expand Down Expand Up @@ -81,7 +85,7 @@
@text-notification-color: @main-color;

/* label */
@label-active-background: @main-color-gradient-8;
@label-active-background: none;
@label-active-text-color: @text-icon-main-color;

/* header */
Expand Down Expand Up @@ -190,7 +194,7 @@
@input-infield-border: @main-color-gradient-8;
@input-focus-border: @primary-color-3;

/* passwords */
/* passwords */
@input-passwords-special-chars-color: @satin-sheen-gold;
@input-passwords-numbers-color: @fire-opal;

Expand Down Expand Up @@ -249,6 +253,8 @@
@complexity-text-color: @text-icon-main-color;
@complexity-bar-default-background: @main-color-gradient-15;
@complexity-bar-gradient-background: linear-gradient(to right,#A40000, #FFA724, #0EAA00);
@complexity-bar-low-color: #a40000;
@complexity-bar-high-color: #0eaa00;

/* hints */
@hint-success-color: @success-2;
Expand All @@ -266,6 +272,7 @@

/* chips */
@chips-text-color: @text-icon-main-color;
@chips-background: @main-color-gradient-22;
@chips-beta-background: @warning-4;
@chips-new-background: @primary-color-3;

Expand Down
11 changes: 9 additions & 2 deletions src/less/abstractions/colors_solarized-light.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@

@queen-blue: #396e98;
@international-orange: #bf2812;
@rosso-corsa: #D40101;
@cultured-2: #F8F8F8;
@chinese-white: #E0E0E0;
@black: #000000;

/* palette: main color gradient */
@hue: 44;
Expand Down Expand Up @@ -84,7 +88,7 @@
@text-notification-color: @text-icon-main-color;

/* label */
@label-active-background: @main-color;
@label-active-background: none;
@label-active-text-color: @text-icon-main-color;

/* header */
Expand Down Expand Up @@ -193,7 +197,7 @@
@input-infield-border: @main-color-gradient-21;
@input-focus-border: @primary-color-3;

/* passwords */
/* passwords */
@input-passwords-special-chars-color: @queen-blue;
@input-passwords-numbers-color: @international-orange;

Expand Down Expand Up @@ -252,6 +256,8 @@
@complexity-text-color: @text-icon-main-color;
@complexity-bar-default-background: @main-color-gradient-12;
@complexity-bar-gradient-background: linear-gradient(to right,#A40000, #FFA724, #0EAA00);
@complexity-bar-low-color: #a40000;
@complexity-bar-high-color: #0eaa00;

/* hints */
@hint-success-color: @success-2;
Expand All @@ -269,6 +275,7 @@

/* chips */
@chips-text-color: @main-color;
@chips-background: @main-color-gradient-3;
@chips-beta-background: @warning-4;
@chips-new-background: @primary-color-3;

Expand Down
2 changes: 1 addition & 1 deletion src/less/base/layout_responsive_grid.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
}

.message {
margin: 0;
margin: 0 0 .8rem 0;
}

.accordion {
Expand Down
68 changes: 30 additions & 38 deletions src/less/components/actionbar.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,38 @@
margin-right: 0;
}
button {
float: left;
margin-right: .8rem;
}

}

.header.third .actions-wrapper {
display: flex;
justify-content: space-between;
margin: .4rem 1.6rem 0 0;
.actions {
flex: 1;
&.secondary {
flex: 0;
}
> ul {
display: flex;
}
}
.dropdown {
margin-right: 0;
.dropdown-content.left {
margin-right: 1rem;
}
}
button {
float: left;
margin-right: 1rem;
}
li {
display: inline;
}
.secondary {
float: right;

button {
min-width: inherit;
&:last-child {
margin-right: 0;
}
}
}
}

/* hide secondary actions if there is no space */
@media all and (max-width: 1024px) {
.header.third .actions-wrapper {
.dropdown,
.actions.secondary {
display: none;
&:last-child {
margin-right: 0;
}
}
}
}
Expand All @@ -46,11 +45,15 @@
@media all and (max-width: 1024px) {
.header.third .main-action-wrapper,
.header.third .actions-wrapper {
i {
display: none;
button {
min-width: 1em;
font-size: 1em;
}
i + span {
margin-left: 0;
button span + span {
&.svg-icon {
display: inline-flex;
}
display: none;
}
.disabled {
display: none;
Expand All @@ -60,20 +63,9 @@

/* hide text and only show icon if there is even less space */
@media all and (max-width: 540px) {
.header.third .main-action-wrapper,
.header.third .actions-wrapper {
a i {
display: block;
}
a.button {
min-width: 1em;
font-size: 1em;
}
a i + span {
margin-left: 0;
display: none;
}
.disabled {
.dropdown,
.actions.secondary {
display: none;
}
}
Expand Down
Loading

0 comments on commit fc44296

Please sign in to comment.