Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 14:43:49 +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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@
@import 'custom/custom-fields';
@import 'custom/address';
@import 'custom/record_actions';
@import 'custom/flash_messages';
html,body {
@@ -156,9 +157,6 @@ dl.chill_view_data {
}
.flash_message {
margin-top: 2.5em;
}
blockquote.chill-user-quote {
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);
}
&.bt-show {
&.bt-show, &.bt-view {
@include button($blue, $white);
}
&.bt-create::before,
&.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;
}
&:not(.change-icon) {
&.bt-create::before,
&.bt-save::before,
@@ -73,9 +24,64 @@
&.bt-update::before,
&.bt-edit::before,
&.bt-cancel::before,
&.bt-view::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;
}
&: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 {
@@ -92,15 +98,18 @@
margin-right: 0.5em;
}
&.bt-create::before,
&.bt-save::before,
&.bt-new::before,
&.bt-delete::before,
&.bt-update::before,
&.bt-edit::before,
&.bt-cancel::before,
&.bt-show::before {
margin-right: 0.5em;
&: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.5em;
}
}
}