diff --git a/toolkit/scss/toolkit.scss b/toolkit/scss/toolkit.scss index 3d06761..6a50dee 100644 --- a/toolkit/scss/toolkit.scss +++ b/toolkit/scss/toolkit.scss @@ -133,6 +133,7 @@ body { box-shadow: 0 1px 3px rgba(0,0,0,.3); border: 1px solid $border-light; border-radius: 3px; + margin-bottom: 32px; &.toolkit-dark { background-color: $dark-body; diff --git a/toolkit/src/file_input.rs b/toolkit/src/file_input.rs index 702c02f..a8c901d 100644 --- a/toolkit/src/file_input.rs +++ b/toolkit/src/file_input.rs @@ -4,7 +4,6 @@ use crate::ButtonKind; pub struct FileInput { pub(crate) name: String, pub(crate) label: String, - pub(crate) id: String, pub(crate) kind: ButtonKind, pub(crate) accept: String, pub(crate) classes: Vec, @@ -14,43 +13,39 @@ pub struct FileInput { } impl FileInput { - pub fn primary(name: &str, label: &str, id: &str) -> Self { + pub fn primary(name: &str, label: &str) -> Self { FileInput { name: name.to_owned(), label: label.to_owned(), - id: id.to_owned(), group: true, ..Default::default() } } - pub fn primary_outline(name: &str, label: &str, id: &str) -> Self { + pub fn primary_outline(name: &str, label: &str) -> Self { FileInput { name: name.to_owned(), label: label.to_owned(), - id: id.to_owned(), kind: ButtonKind::PrimaryOutline, group: true, ..Default::default() } } - pub fn outline(name: &str, label: &str, id: &str) -> Self { + pub fn outline(name: &str, label: &str) -> Self { FileInput { name: name.to_owned(), label: label.to_owned(), - id: id.to_owned(), kind: ButtonKind::Outline, group: true, ..Default::default() } } - pub fn secondary(name: &str, label: &str, id: &str) -> Self { + pub fn secondary(name: &str, label: &str) -> Self { FileInput { name: name.to_owned(), label: label.to_owned(), - id: id.to_owned(), kind: ButtonKind::Secondary, group: true, ..Default::default() diff --git a/toolkit/templates/file_input.rs.html b/toolkit/templates/file_input.rs.html index edcf155..a85cfc0 100644 --- a/toolkit/templates/file_input.rs.html +++ b/toolkit/templates/file_input.rs.html @@ -5,7 +5,7 @@ @if file.group {
- @file.label + @file.label @if file.multiple { } else {
- @file.label + @file.label @if file.multiple {