Skip to content

K
kpp
Commit 55d549d4 authored by Nikolay Gromov's avatar Nikolay Gromov
Browse files
Options

Merge pull request #1 from nicothin/form 

Form
parents aff64001 77e3bf4c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 437 additions and 280 deletions
README.md
View file @ 55d549d4
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
Установка: выполнить в папке проекта: `npm i`. Установка: выполнить в папке проекта: `npm i`.
Использование: `npm run gulp` (дабы не ставить глобально 4-ю версию, которая сейчас в альфе). После слова `gulp` можно через пробел указать другие команды (см. `gulpfile.js`). Использование: `npm start` (дабы не ставить глобально 4-ю версию gulp, которая сейчас в альфе). После `npm start` можно через пробел указать задачу. К примеру `npm start less` выполнит только задачу `less` из `gulpfile.js` (полный список задач смотри в `gulpfile.js`).
`port=3004 npm run gulp` — для запуска сервера автообновлений на указанном порту. `port=3004 npm start` — для запуска сервера автообновлений на указанном порту.
\ No newline at end of file
package.json
View file @ 55d549d4
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"description": "", "description": "",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1", "test": "echo \"Error: no test specified\" && exit 1",
"gulp": "./node_modules/.bin/gulp" "start": "./node_modules/.bin/gulp"
}, },
"author": "Nikolay Gromov", "author": "Nikolay Gromov",
"license": "MIT", "license": "MIT",
......
src/_blocks_library.html
View file @ 55d549d4
This diff is collapsed.
src/img/form_field_bg/checkbox--checked.svg
View file @ 55d549d4
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#2D2D2D" d="M9.984 17.016l9-9-1.406-1.453-7.594 7.594-3.563-3.563L5.017 12zm9-14.016q.844 0 1.43.61T21 5.014v13.97q0 .796-.586 1.405t-1.43.61H5.014q-.843 0-1.43-.61T3 18.983V5.014q0-.796.585-1.405T5.015 3h13.97z"/></svg> <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><path d="M6.984 14.017l9-9-1.406-1.454-7.594 7.595L3.42 7.594 2.018 9zm9-14.017q.844 0 1.43.61T18 2.014v13.97q0 .797-.586 1.406-.586.61-1.43.61H2.014q-.843 0-1.43-.61T0 15.984V2.014Q0 1.218.585.61 1.17 0 2.015 0h13.97z" fill="#2d2d2d"/></svg>
\ No newline at end of file \ No newline at end of file
src/img/form_field_bg/checkbox.svg
View file @ 55d549d4
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#2D2D2D" d="M18.984 3q.797 0 1.406.61T21 5.014v13.97q0 .796-.61 1.405t-1.406.61H5.014q-.796 0-1.405-.61T3 18.983V5.014q0-.796.61-1.405T5.014 3h13.97zm0 2.016H5.014v13.97h13.97V5.016z"/></svg> <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><path d="M15.984 0q.797 0 1.406.61.61.61.61 1.404v13.97q0 .797-.61 1.406-.61.61-1.406.61H2.014q-.796 0-1.405-.61Q0 16.78 0 15.984V2.014Q0 1.218.61.61 1.22 0 2.014 0h13.97zm0 2.016H2.014v13.97h13.97V2.017z" fill="#2d2d2d"/></svg>
\ No newline at end of file \ No newline at end of file
src/img/form_field_bg/chevron-down--error.svg deleted 100644 → 0
View file @ aff64001
<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28"><path fill="#d9534f" d="M26.297 12.625L14.703 24.203q-.297.297-.703.297t-.703-.297L1.703 12.625q-.297-.297-.297-.71t.297-.712l2.594-2.578q.297-.297.703-.297t.703.297L14 16.922l8.297-8.297q.297-.297.703-.297t.703.297l2.594 2.578q.297.297.297.71t-.297.712z"/></svg>
\ No newline at end of file
src/img/form_field_bg/chevron-down--success.svg deleted 100644 → 0
View file @ aff64001
<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28"><path fill="#5cb85c" d="M26.297 12.625L14.703 24.203q-.297.297-.703.297t-.703-.297L1.703 12.625q-.297-.297-.297-.71t.297-.712l2.594-2.578q.297-.297.703-.297t.703.297L14 16.922l8.297-8.297q.297-.297.703-.297t.703.297l2.594 2.578q.297.297.297.71t-.297.712z"/></svg>
\ No newline at end of file
src/img/form_field_bg/chevron-down.svg deleted 100644 → 0
View file @ aff64001
<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 28 28"><path fill="#2D2D2D" d="M26.297 12.625L14.703 24.203q-.297.297-.703.297t-.703-.297L1.703 12.625q-.297-.297-.297-.71t.297-.712l2.594-2.578q.297-.297.703-.297t.703.297L14 16.922l8.297-8.297q.297-.297.703-.297t.703.297l2.594 2.578q.297.297.297.71t-.297.712z"/></svg>
\ No newline at end of file
src/less/blocks/field-actions.less 0 → 100644
View file @ 55d549d4
.field-actions {
display: block;
margin-top: @line-height;
margin-bottom: (@line-height / 2);
}
src/less/blocks/field-checkbox--custom.less 0 → 100644
View file @ 55d549d4
.field-checkbox {
&--custom {
.field-checkbox__name {
padding-left: 1.6em;
}
.field-checkbox__help-text {
padding-left: 1.9em; // 1.6 + 0.3
}
.field-checkbox__input {
position: absolute;
opacity: 0;
& + .field-checkbox__name-text:before {
width: 1.13em;
height: 1.13em;
position: absolute;
top: .1em;
left: 0;
content: '';
background-size: 100%;
background-repeat: no-repeat;
background-image: data-uri('image/svg+xml;charset=UTF-8', '../img/form_field_bg/checkbox.svg');
}
&:checked + .field-checkbox__name-text:before {
background-image: data-uri('image/svg+xml;charset=UTF-8', '../img/form_field_bg/checkbox--checked.svg');
}
&:focus + .field-checkbox__name-text:before {
.focus();
}
}
}
}
src/less/blocks/field-checkbox.less 0 → 100644
View file @ 55d549d4
.field-checkbox {
display: block;
margin-bottom: (@line-height / 2);
&__title {
font-weight: 700;
line-height: 1.2em;
display: block;
margin-bottom: round(@line-height / 4, 2);
min-height: 1px;
}
&__input-wrap {}
&__name {
position: relative;
padding-left: 1.3em;
font-weight: 400;
display: inline-block;
margin-right: .6em;
line-height: @line-height;
}
&__input {
position: absolute;
top: 50%;
left: 0;
transform: translate(0, -50%);
}
&__help-text {
display: block;
font-size: @font-size--small;
line-height: 1.2em;
color: @text-color--muted;
padding-left: 1.6em; // 1.3 + 0.3
}
}
src/less/blocks/field-file.less 0 → 100644
View file @ 55d549d4
.field-file {
display: block;
margin-bottom: (@line-height / 2);
&__name {
font-weight: 700;
display: block;
margin-bottom: round(@line-height / 4, 2);
}
&__input-wrap {}
&__input {
margin-bottom: round(@line-height / 3, 2);
}
&__help-text {
display: block;
font-size: @font-size--small;
line-height: 1.2em;
color: @text-color--muted;
}
}
src/less/blocks/field-radio--custom.less 0 → 100644
View file @ 55d549d4
.field-radio {
&--custom {
.field-radio__name {
padding-left: 1.6em;
}
.field-radio__help-text {
padding-left: 1.9em; // 1.6 + 0.3
}
.field-radio__input {
position: absolute;
opacity: 0;
& + .field-radio__name-text:before {
width: 1.125em;
height: 1.125em;
position: absolute;
top: .1em;
left: 0;
content: '';
background-size: 100%;
background-repeat: no-repeat;
background-image: data-uri('image/svg+xml;charset=UTF-8', '../img/form_field_bg/radiobutton.svg');
}
&:checked + .field-radio__name-text:before {
background-image: data-uri('image/svg+xml;charset=UTF-8', '../img/form_field_bg/radiobutton--checked.svg');
}
&:focus + .field-radio__name-text:before {
.focus();
}
}
}
}
src/less/blocks/field-radio.less 0 → 100644
View file @ 55d549d4
.field-radio {
display: block;
margin-bottom: (@line-height / 2);
&__title {
font-weight: 700;
line-height: 1.2em;
display: block;
margin-bottom: round(@line-height / 4, 2);
min-height: 1px;
}
&__input-wrap {}
&__name {
position: relative;
padding-left: 1.3em;
font-weight: 400;
display: inline-block;
margin-right: .6em;
}
&__input {
position: absolute;
top: 50%;
left: 0;
transform: translate(0, -50%);
}
&__help-text {
display: block;
font-size: @font-size--small;
line-height: 1.2em;
color: @text-color--muted;
padding-left: 1.6em; // 1.3 + 0.3
}
}
src/less/blocks/field-select.less 0 → 100644
View file @ 55d549d4
.field-select {
display: block;
margin-bottom: (@line-height / 2);
&__name {
font-weight: 700;
display: block;
margin-bottom: round(@line-height / 4, 2);
}
&__input-wrap {}
&__select {
margin-bottom: round(@line-height / 3, 2);
}
&__help-text {
display: block;
font-size: @font-size--small;
line-height: 1.2em;
color: @text-color--muted;
}
}
src/less/blocks/field-text.less 0 → 100644
View file @ 55d549d4
.field-text {
display: block;
margin-bottom: (@line-height / 2);
&__name {
font-weight: 700;
display: block;
margin-bottom: round(@line-height / 4, 2);
}
&__input-wrap {}
&__input {
margin-bottom: round(@line-height / 3, 2);
}
&__help-text {
display: block;
font-size: @font-size--small;
line-height: 1.2em;
color: @text-color--muted;
}
}
src/less/blocks/field.less deleted 100644 → 0
View file @ aff64001
.field {
display: block;
margin-bottom: (@line-height / 2);
&--error {
color: @color-danger;
.field__help-text {
color: @color-danger;
}
.field__input {
color: @color-danger;
border-color: @color-danger;
background-image: data-uri('image/svg+xml;charset=UTF-8', '../img/form_field_bg/close.svg');
background-repeat: no-repeat;
background-position: right .3em center;
&::placeholder {
color: @color-danger;
}
&:focus {
outline-color: @color-danger;
}
}
.field__select {
color: @color-danger;
border-color: @color-danger;
&:focus {
outline-color: @color-danger;
}
}
}
// Закомментировал, в связи с редкой надобностью
// &--success {
// color: @color-success;
// .field__help-text {
// color: @color-success;
// }
// .field__input {
// color: @color-success;
// border-color: @color-success;
// background-image: data-uri('image/svg+xml;charset=UTF-8', '../img/form_field_bg/check.svg');
// background-repeat: no-repeat;
// background-position: right .3em center;
// &::placeholder {
// color: @color-success;
// }
// &:focus {
// outline-color: @color-success;
// }
// }
// .field__select {
// color: @color-success;
// border-color: @color-success;
// &:focus {
// outline-color: @color-success;
// }
// }
// }
&--checkbox,
&--radio {
.field__name {
display: inline-block;
vertical-align: top;
font-weight: inherit;
font-family: inherit;
margin-bottom: 0;
margin-right: .6em;
}
.field__input {
margin-top: .25em;
margin-bottom: 0;
display: inline-block;
vertical-align: top;
}
}
&__name {
font-weight: 700;
display: block;
margin-bottom: round(@line-height / 4, 2);
}
&__input-wrap {}
&__input,
&__select {
margin-bottom: round(@line-height / 4, 2);
}
&__select {
// appearance: none;
}
&__help-text {
font-size: @font-size--small;
color: @text-color--muted;
}
}
src/less/blocks/form.less
View file @ 55d549d4
...@@ -4,50 +4,52 @@ ...@@ -4,50 +4,52 @@
} }
&--horizontal { &--horizontal {
.field {
display: flex;
}
.field__name { @media (min-width: @screen-sm) {
width: 15rem;
padding-top: .42em;
padding-right: .3em;
}
.field__input-wrap { .field-text,
flex-grow: 10; .field-checkbox,
} .field-radio,
.field-select,
.field-file {
display: flex;
}
.field--actions { .field-text__name,
padding-left: 15rem; .field-select__name {
} width: 15rem;
min-width: 15rem;
padding-top: .42em;
padding-right: .6em;
margin-bottom: 0;
}
.field--checkbox { .field-checkbox__title,
& > .field__name { .field-radio__title,
margin-right: 0; .field-file__name {
width: 15rem;
min-width: 15rem;
padding-right: .6em;
margin-bottom: 0;
} }
.field__input-wrap .field__name {
width: auto; .field-text__input-wrap,
padding-top: 0; .field-select__select-wrap,
.field-file__input-wrap {
flex-grow: 1;
} }
}
}
&--inline { .field-actions {
.field { padding-left: 15rem;
display: inline-block; }
vertical-align: top;
}
.field__name {
display: inline-block;
vertical-align: top;
padding-top: .42em;
} }
.field__input-wrap { .field-checkbox__title,
display: inline-block; .field-radio__title {
vertical-align: top; &:empty {
margin-bottom: 0;
}
} }
} }
} }
src/less/global_scaffolding.less
View file @ 55d549d4
...@@ -427,3 +427,11 @@ input[disabled], ...@@ -427,3 +427,11 @@ input[disabled],
input[readonly] { input[readonly] {
background-color: @gray-lighter; background-color: @gray-lighter;
} }
select,
textarea,
input {
&:focus {
.focus();
}
}
src/less/mixins/btn-mixins.less
View file @ 55d549d4
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
&:active, &:active,
&:focus { &:focus {
text-decoration: none; text-decoration: none;
outline: 0;
box-shadow: none;
} }
// &--disabled, // &--disabled,
......
src/less/mixins/focus-mixin.less 0 → 100644
View file @ 55d549d4
.focus() {
outline: 0;
box-shadow: 0 0 0 2px fade(@color-main, 30%);
}
src/less/mixins/mixins.less
View file @ 55d549d4
...@@ -2,3 +2,4 @@ ...@@ -2,3 +2,4 @@
@import 'btn-mixins.less'; @import 'btn-mixins.less';
@import 'table-responsive-mixins.less'; @import 'table-responsive-mixins.less';
@import 'responsive-mixins.less'; @import 'responsive-mixins.less';
@import 'focus-mixin.less';
src/less/style.less
View file @ 55d549d4
...@@ -7,4 +7,11 @@ ...@@ -7,4 +7,11 @@
@import "blocks/table-responsive.less"; @import "blocks/table-responsive.less";
@import "blocks/btn.less"; @import "blocks/btn.less";
@import "blocks/form.less"; @import "blocks/form.less";
@import "blocks/field.less"; @import "blocks/field-text.less";
@import "blocks/field-checkbox.less";
@import "blocks/field-checkbox--custom.less";
@import "blocks/field-radio.less";
@import "blocks/field-radio--custom.less";
@import "blocks/field-select.less";
@import "blocks/field-file.less";
@import "blocks/field-actions.less";
src/less/variables.less
View file @ 55d549d4
...@@ -81,6 +81,5 @@ ...@@ -81,6 +81,5 @@
// Разное // Разное
@border-radius: .3rem; @border-radius: .3rem; // универсальное сглаживание углов бордюра
@opacity: .7; // универсальная прозрачность
@opacity: .7;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment