Skip to content

Commit

Permalink
Merge pull request #14 from blended-ideas/master
Browse files Browse the repository at this point in the history
Resolution for #13
  • Loading branch information
zoltanszogyenyi committed Sep 9, 2020
2 parents 26ad2b9 + b829654 commit 1b6bc71
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 93 deletions.
14 changes: 7 additions & 7 deletions src/pages/settings.html
Expand Up @@ -17,7 +17,7 @@
<!DOCTYPE html>
<html lang="en">

<head>
<head>
@@include('./_head.html', {
"path": "..",
"title": "Volt Bootstrap 5 Dashboard - Settings"
Expand All @@ -29,16 +29,16 @@
@@include('./dashboard/_nav.html', {
"path": ".."
})

<div class="container-fluid bg-soft">
<div class="row">
<div class="col-12">

@@include('./dashboard/_sidenav.html', {
"path": "..",
"page": "settings"
})

<main class="content">

@@include('./dashboard/_topbar.html', {
Expand Down Expand Up @@ -98,7 +98,7 @@ <h2 class="h5 mb-4">General information</h2>
<label for="birthday">Birthday</label>
<div class="input-group">
<span class="input-group-text"><span class="far fa-calendar-alt"></span></span>
<input data-datepicker="" class="form-control" id="birthday" type="text" placeholder="dd/mm/yyyy" required>
<input data-datepicker="" class="form-control" id="birthday" type="text" placeholder="dd/mm/yyyy" required>
</div>
</div>
<div class="col-md-6 mb-3">
Expand Down Expand Up @@ -194,7 +194,7 @@ <h2 class="h5 mb-4">Select profile photo</h2>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
Expand All @@ -213,7 +213,7 @@ <h2 class="h5 mb-4">Select profile photo</h2>
@@include('./_scripts.html', {
"path": ".."
})

</body>

</html>
173 changes: 87 additions & 86 deletions src/scss/volt/components/_forms.scss
@@ -1,86 +1,87 @@
.form-control{
box-shadow:none;

&.form-control-lg{
padding: $inpu-lg-padding-y $input-padding-x;
}

}



.form-check-input {
&.round-check{
&[type="checkbox"] {
@include border-radius($form-check-radio-border-radius);
}
}
}

.search-bar {
.form-control {
width: 200px;
transition: width .2s ease-in-out;

&:focus {
width: 300px;
}

@include media-breakpoint-down(sm) {
width: 120px;

&:focus {
width: 150px;
}
}
}
}

.input-group {
.form-control:focus {
border-color: $input-border-color;

& + .input-group-text {
border-color: $input-border-color;
}
}
}

.focused {

.form-control {
border-color: $input-focus-border-color;
background-color: $input-focus-bg;
}
}

.form-switch {
padding-left: $form-switch-padding-left;

.form-check-input {
height: 1.275em;
}
}

.form-select {
.form-select-lg{
padding: $form-select-padding-y ($form-select-padding-x + $form-select-indicator-padding) $form-select-padding-y $form-select-padding-x;
}
}

//Add File Alternative Style

.file-field input[type="file"] {
position: absolute;
cursor: pointer;
filter: alpha(opacity=0);
opacity: 0;
padding-bottom: 30px;
}
.file-field span {
cursor: pointer;
}

.datepicker-dropdown {
z-index: 9999;
}
.form-control{
box-shadow:none;

&.form-control-lg{
padding: $inpu-lg-padding-y $input-padding-x;
}

}



.form-check-input {
&.round-check{
&[type="checkbox"] {
@include border-radius($form-check-radio-border-radius);
}
}
}

.search-bar {
.form-control {
width: 200px;
transition: width .2s ease-in-out;

&:focus {
width: 300px;
}

@include media-breakpoint-down(sm) {
width: 120px;

&:focus {
width: 150px;
}
}
}
}

.input-group {
.form-control:focus {
border-color: $input-border-color;

& + .input-group-text {
border-color: $input-border-color;
}
}
}

.focused {

.form-control {
border-color: $input-focus-border-color;
background-color: $input-focus-bg;
}
}

.form-switch {
padding-left: $form-switch-padding-left;

.form-check-input {
height: 1.275em;
}
}

.form-select {
.form-select-lg{
padding: $form-select-padding-y ($form-select-padding-x + $form-select-indicator-padding) $form-select-padding-y $form-select-padding-x;
}
}

//Add File Alternative Style

.file-field input[type="file"] {
position: absolute;
cursor: pointer;
filter: alpha(opacity=0);
opacity: 0;
padding-bottom: 30px;
width: 200px;
}
.file-field span {
cursor: pointer;
}

.datepicker-dropdown {
z-index: 9999;
}

0 comments on commit 1b6bc71

Please sign in to comment.