Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-07-01 22:46:13 +00:00
Code Issues Actions Projects Releases Wiki Activity

improve button and add message level 'warning'

Browse Source
This commit is contained in:
Julien Fastré 2017-08-19 21:44:51 +02:00
parent 10b67b5a5f
commit 2d0d45e01a
6 changed files with 120 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Resources/public/css/scratch.css
View File

@ -4279,7 +4279,7 @@ span.force-inline-label label {
color: #cd5e1f; } color: #cd5e1f; }
.sc-button.bt-action[disabled]:hover, .sc-button.bt-edit[disabled]:hover, .sc-button.bt-update[disabled]:hover { .sc-button.bt-action[disabled]:hover, .sc-button.bt-edit[disabled]:hover, .sc-button.bt-update[disabled]:hover {
box-shadow: none; } box-shadow: none; }
.sc-button.bt-show { .sc-button.bt-show, .sc-button.bt-view {
color: #fff; color: #fff;
background: #334d5c; background: #334d5c;
border: medium none; border: medium none;
@ -4295,37 +4295,37 @@ span.force-inline-label label {
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
border-bottom-right-radius: 0; } border-bottom-right-radius: 0; }
.sc-button.bt-show:hover, .sc-button.bt-show:active { .sc-button.bt-show:hover, .sc-button.bt-show:active, .sc-button.bt-view:hover, .sc-button.bt-view:active {
background: #2a3f4c; background: #2a3f4c;
color: #fff; color: #fff;
text-decoration: none; } text-decoration: none; }
.sc-button.bt-show:focus { .sc-button.bt-show:focus, .sc-button.bt-view:focus {
background: #2a3f4c; } background: #2a3f4c; }
.sc-button.bt-show[disabled] { .sc-button.bt-show[disabled], .sc-button.bt-view[disabled] {
background: rgba(51, 77, 92, 0.6); background: rgba(51, 77, 92, 0.6);
color: #21323b; } color: #21323b; }
.sc-button.bt-show[disabled]:hover { .sc-button.bt-show[disabled]:hover, .sc-button.bt-view[disabled]:hover {
box-shadow: none; } box-shadow: none; }
.sc-button.bt-create::before, .sc-button.bt-save::before, .sc-button.bt-new::before, .sc-button.bt-delete::before, .sc-button.bt-update::before, .sc-button.bt-edit::before, .sc-button.bt-cancel::before, .sc-button.bt-show::before { .sc-button:not(.change-icon).bt-create::before, .sc-button:not(.change-icon).bt-save::before, .sc-button:not(.change-icon).bt-new::before, .sc-button:not(.change-icon).bt-delete::before, .sc-button:not(.change-icon).bt-update::before, .sc-button:not(.change-icon).bt-edit::before, .sc-button:not(.change-icon).bt-cancel::before, .sc-button:not(.change-icon).bt-view::before, .sc-button:not(.change-icon).bt-show::before {
font: normal normal normal 14px/1 FontAwesome; font: normal normal normal 14px/1 FontAwesome;
margin-right: 0.5em; } margin-right: 0.5em; }
.sc-button.bt-save::before { .sc-button:not(.change-icon).bt-save::before {
content: ""; } content: ""; }
.sc-button.bt-create::before, .sc-button.bt-new::before { .sc-button:not(.change-icon).bt-create::before, .sc-button:not(.change-icon).bt-new::before {
content: ""; } content: ""; }
.sc-button.bt-delete::before { .sc-button:not(.change-icon).bt-delete::before {
content: ""; } content: ""; }
.sc-button.bt-edit::before, .sc-button.bt-update::before { .sc-button:not(.change-icon).bt-edit::before, .sc-button:not(.change-icon).bt-update::before {
content: ""; } content: ""; }
.sc-button.bt-cancel::before { .sc-button:not(.change-icon).bt-cancel::before {
content: ""; } content: ""; }
.sc-button.bt-show::before { .sc-button:not(.change-icon).bt-show::before, .sc-button:not(.change-icon).bt-view::before {
content: ""; } content: ""; }
.sc-button > i.fa { .sc-button > i.fa {
margin-right: 0.5em; } margin-right: 0.5em; }
.sc-button.has-hidden > i.fa, .sc-button.no-content > i.fa { .sc-button.has-hidden > i.fa, .sc-button:empty > i.fa {
margin-right: 0; } margin-right: 0; }
.sc-button.has-hidden.bt-create::before, .sc-button.has-hidden.bt-save::before, .sc-button.has-hidden.bt-new::before, .sc-button.has-hidden.bt-delete::before, .sc-button.has-hidden.bt-update::before, .sc-button.has-hidden.bt-edit::before, .sc-button.has-hidden.bt-cancel::before, .sc-button.has-hidden.bt-show::before, .sc-button.no-content.bt-create::before, .sc-button.no-content.bt-save::before, .sc-button.no-content.bt-new::before, .sc-button.no-content.bt-delete::before, .sc-button.no-content.bt-update::before, .sc-button.no-content.bt-edit::before, .sc-button.no-content.bt-cancel::before, .sc-button.no-content.bt-show::before { .sc-button.has-hidden:not(.change-icon).bt-create::before, .sc-button.has-hidden:not(.change-icon).bt-save::before, .sc-button.has-hidden:not(.change-icon).bt-new::before, .sc-button.has-hidden:not(.change-icon).bt-delete::before, .sc-button.has-hidden:not(.change-icon).bt-update::before, .sc-button.has-hidden:not(.change-icon).bt-edit::before, .sc-button.has-hidden:not(.change-icon).bt-cancel::before, .sc-button.has-hidden:not(.change-icon).bt-view::before, .sc-button.has-hidden:not(.change-icon).bt-show::before, .sc-button:empty:not(.change-icon).bt-create::before, .sc-button:empty:not(.change-icon).bt-save::before, .sc-button:empty:not(.change-icon).bt-new::before, .sc-button:empty:not(.change-icon).bt-delete::before, .sc-button:empty:not(.change-icon).bt-update::before, .sc-button:empty:not(.change-icon).bt-edit::before, .sc-button:empty:not(.change-icon).bt-cancel::before, .sc-button:empty:not(.change-icon).bt-view::before, .sc-button:empty:not(.change-icon).bt-show::before {
margin-right: 0; } margin-right: 0; }
.sc-button.has-hidden > span.show-on-hover { .sc-button.has-hidden > span.show-on-hover {
display: none; } display: none; }
@ -4333,7 +4333,7 @@ span.force-inline-label label {
display: inline-block; } display: inline-block; }
.sc-button.has-hidden:hover > i.fa { .sc-button.has-hidden:hover > i.fa {
margin-right: 0.5em; } margin-right: 0.5em; }
.sc-button.has-hidden:hover.bt-create::before, .sc-button.has-hidden:hover.bt-save::before, .sc-button.has-hidden:hover.bt-new::before, .sc-button.has-hidden:hover.bt-delete::before, .sc-button.has-hidden:hover.bt-update::before, .sc-button.has-hidden:hover.bt-edit::before, .sc-button.has-hidden:hover.bt-cancel::before, .sc-button.has-hidden:hover.bt-show::before { .sc-button.has-hidden:hover:not(.change-icon).bt-create::before, .sc-button.has-hidden:hover:not(.change-icon).bt-save::before, .sc-button.has-hidden:hover:not(.change-icon).bt-new::before, .sc-button.has-hidden:hover:not(.change-icon).bt-delete::before, .sc-button.has-hidden:hover:not(.change-icon).bt-update::before, .sc-button.has-hidden:hover:not(.change-icon).bt-edit::before, .sc-button.has-hidden:hover:not(.change-icon).bt-cancel::before, .sc-button.has-hidden:hover:not(.change-icon).bt-view::before, .sc-button.has-hidden:hover:not(.change-icon).bt-show::before {
margin-right: 0.5em; } margin-right: 0.5em; }
.sc-button.button-small { .sc-button.button-small {
font-size: 80%; font-size: 80%;
@ -4548,6 +4548,23 @@ td ul.record_actions li,
ul.record_actions_small li { ul.record_actions_small li {
margin-right: 0.2em; } margin-right: 0.2em; }
.flash_message {
margin-top: 2.5em; }
.alert {
background: rgba(223, 73, 73, 0.2);
color: #df4949;
font-weight: bold;
margin-bottom: 0.75em;
padding: 0.75em; }
.warning {
background: rgba(226, 121, 61, 0.2);
color: #e2793d;
font-weight: bold;
margin-bottom: 0.75em;
padding: 0.75em; }
html, body { html, body {
min-height: 100%; min-height: 100%;
font-family: 'Open Sans'; } font-family: 'Open Sans'; }
@ -4657,9 +4674,6 @@ dl.chill_view_data dd {
dl.chill_view_data dd ul { dl.chill_view_data dd ul {
padding-left: 0; } padding-left: 0; }
.flash_message {
margin-top: 2.5em; }
blockquote.chill-user-quote { blockquote.chill-user-quote {
border-left: 10px solid #eec84a; border-left: 10px solid #eec84a;
margin: 1.5em 10px; margin: 1.5em 10px;

4
Resources/public/css/scratch.css.map
View File

File diff suppressed because one or more lines are too long

4
Resources/public/sass/_custom.scss
View File

@ -8,6 +8,7 @@
@import 'custom/custom-fields'; @import 'custom/custom-fields';
@import 'custom/address'; @import 'custom/address';
@import 'custom/record_actions'; @import 'custom/record_actions';
@import 'custom/flash_messages';
html,body { html,body {
@ -156,9 +157,6 @@ dl.chill_view_data {
} }
.flash_message {
margin-top: 2.5em;
}
blockquote.chill-user-quote { blockquote.chill-user-quote {
border-left: 10px solid $chill-yellow; border-left: 10px solid $chill-yellow;

14
Resources/public/sass/custom/_flash_messages.scss Normal file
View File

@ -0,0 +1,14 @@
.flash_message {
margin-top: 2.5em;
}
// note that other level are defined in modules/_alerts.scss
.alert {
// override in modules/_alerts.scss
@include alert($red);
}
.warning {
@include alert($orange);
}

131
Resources/public/sass/custom/modules/_buttons.scss
View File

@ -11,60 +11,11 @@
@include button($orange, $white); @include button($orange, $white);
} }
&.bt-show { &.bt-show, &.bt-view {
@include button($blue, $white); @include button($blue, $white);
} }
&.bt-create::before, &:not(.change-icon) {
&.bt-save::before,
&.bt-new::before,
&.bt-delete::before,
&.bt-update::before,
&.bt-edit::before,
&.bt-cancel::before,
&.bt-show::before {
font: normal normal normal 14px/1 FontAwesome;
margin-right: 0.5em;
}
&.bt-save::before {
// add a floppy
content: "";
}
&.bt-create::before, &.bt-new::before {
// add a plus
content: "";
}
&.bt-delete::before {
// add a trash
content: "";
}
&.bt-edit::before, &.bt-update::before {
// add a pencil
content: "";
}
&.bt-cancel::before {
// add an arrow left
content: "";
}
&.bt-show::before {
content: "";
}
> i.fa {
margin-right: 0.5em;
}
&.has-hidden,
&.no-content {
> i.fa {
margin-right: 0;
}
&.bt-create::before, &.bt-create::before,
&.bt-save::before, &.bt-save::before,
@ -73,9 +24,64 @@
&.bt-update::before, &.bt-update::before,
&.bt-edit::before, &.bt-edit::before,
&.bt-cancel::before, &.bt-cancel::before,
&.bt-view::before,
&.bt-show::before { &.bt-show::before {
font: normal normal normal 14px/1 FontAwesome;
margin-right: 0.5em;
}
&.bt-save::before {
// add a floppy
content: "";
}
&.bt-create::before, &.bt-new::before {
// add a plus
content: "";
}
&.bt-delete::before {
// add a trash
content: "";
}
&.bt-edit::before, &.bt-update::before {
// add a pencil
content: "";
}
&.bt-cancel::before {
// add an arrow left
content: "";
}
&.bt-show::before, &.bt-view::before {
content: "";
}
}
> i.fa {
margin-right: 0.5em;
}
&.has-hidden,
&:empty {
> i.fa {
margin-right: 0; margin-right: 0;
} }
&:not(.change-icon) {
&.bt-create::before,
&.bt-save::before,
&.bt-new::before,
&.bt-delete::before,
&.bt-update::before,
&.bt-edit::before,
&.bt-cancel::before,
&.bt-view::before,
&.bt-show::before {
margin-right: 0;
}
}
} }
&.has-hidden > span.show-on-hover { &.has-hidden > span.show-on-hover {
@ -92,15 +98,18 @@
margin-right: 0.5em; margin-right: 0.5em;
} }
&.bt-create::before, &:not(.change-icon) {
&.bt-save::before, &.bt-create::before,
&.bt-new::before, &.bt-save::before,
&.bt-delete::before, &.bt-new::before,
&.bt-update::before, &.bt-delete::before,
&.bt-edit::before, &.bt-update::before,
&.bt-cancel::before, &.bt-edit::before,
&.bt-show::before { &.bt-cancel::before,
margin-right: 0.5em; &.bt-view::before,
&.bt-show::before {
margin-right: 0.5em;
}
} }
} }

1
Resources/translations/messages.fr.yml
View File

@ -30,6 +30,7 @@ Not valid: Non valide
not valid: non valide not valid: non valide
Confirm: Confirmer Confirm: Confirmer
Cancel: Annuler Cancel: Annuler
Save: Enregistrer
Edit: Modifier Edit: Modifier
Update: Mettre à jour Update: Mettre à jour