Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
K
kpp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alexandr Veselov
kpp
Commits
77e3bf4c
Commit
77e3bf4c
authored
Feb 21, 2016
by
Nikolay Gromov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
forms
parent
db708fd0
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
134 additions
and
115 deletions
+134
-115
_blocks_library.html
src/_blocks_library.html
+7
-14
chevron-down--error.svg
src/img/form_field_bg/chevron-down--error.svg
+0
-1
chevron-down--success.svg
src/img/form_field_bg/chevron-down--success.svg
+0
-1
chevron-down.svg
src/img/form_field_bg/chevron-down.svg
+0
-1
field-checkbox--custom.less
src/less/blocks/field-checkbox--custom.less
+38
-0
field-checkbox.less
src/less/blocks/field-checkbox.less
+0
-34
field-radio--custom.less
src/less/blocks/field-radio--custom.less
+38
-0
field-radio.less
src/less/blocks/field-radio.less
+0
-32
form.less
src/less/blocks/form.less
+40
-27
global_scaffolding.less
src/less/global_scaffolding.less
+2
-5
btn-mixins.less
src/less/mixins/btn-mixins.less
+2
-0
focus-mixin.less
src/less/mixins/focus-mixin.less
+4
-0
mixins.less
src/less/mixins/mixins.less
+1
-0
style.less
src/less/style.less
+2
-0
No files found.
src/_blocks_library.html
View file @
77e3bf4c
...
@@ -333,7 +333,7 @@
...
@@ -333,7 +333,7 @@
<div
class=
"field-checkbox__title"
>
Собственные флажки
</div>
<div
class=
"field-checkbox__title"
>
Собственные флажки
</div>
<div
class=
"field-checkbox__input-wrap"
>
<div
class=
"field-checkbox__input-wrap"
>
<label
class=
"field-checkbox__name"
>
<label
class=
"field-checkbox__name"
>
<input
class=
"field-checkbox__input"
type=
"checkbox"
>
<input
class=
"field-checkbox__input"
type=
"checkbox"
checked
>
<span
class=
"field-checkbox__name-text"
>
Флажок
</span>
<span
class=
"field-checkbox__name-text"
>
Флажок
</span>
</label>
</label>
<label
class=
"field-checkbox__name"
>
<label
class=
"field-checkbox__name"
>
...
@@ -347,11 +347,11 @@
...
@@ -347,11 +347,11 @@
<div
class=
"field-radio__title"
>
Собственные радиокнопки
</div>
<div
class=
"field-radio__title"
>
Собственные радиокнопки
</div>
<div
class=
"field-radio__input-wrap"
>
<div
class=
"field-radio__input-wrap"
>
<label
class=
"field-radio__name"
>
<label
class=
"field-radio__name"
>
<input
class=
"field-radio__input"
type=
"radio"
name=
"
one"
>
<input
class=
"field-radio__input"
type=
"radio"
name=
"
two"
checked
>
<span
class=
"field-radio__name-text"
>
Радиокнопка
</span>
<span
class=
"field-radio__name-text"
>
Радиокнопка
</span>
</label>
</label>
<label
class=
"field-radio__name"
>
<label
class=
"field-radio__name"
>
<input
class=
"field-radio__input"
type=
"radio"
name=
"
one
"
>
<input
class=
"field-radio__input"
type=
"radio"
name=
"
two
"
>
<span
class=
"field-radio__name-text"
>
Радиокнопка
</span>
<span
class=
"field-radio__name-text"
>
Радиокнопка
</span>
</label>
</label>
<div
class=
"field-radio__help-text"
>
Изображения в формате SVG, вписываются в CSS-файл функцией
<code>
data-uri()
</code>
компилятора LESS.
</div>
<div
class=
"field-radio__help-text"
>
Изображения в формате SVG, вписываются в CSS-файл функцией
<code>
data-uri()
</code>
компилятора LESS.
</div>
...
@@ -428,11 +428,11 @@
...
@@ -428,11 +428,11 @@
<div
class=
"field-radio__title"
></div>
<div
class=
"field-radio__title"
></div>
<div
class=
"field-radio__input-wrap"
>
<div
class=
"field-radio__input-wrap"
>
<label
class=
"field-radio__name"
>
<label
class=
"field-radio__name"
>
<input
class=
"field-radio__input"
type=
"radio"
name=
"one"
>
<input
class=
"field-radio__input"
type=
"radio"
name=
"one
1
"
>
<span
class=
"field-radio__name-text"
>
Радиокнопка
</span>
<span
class=
"field-radio__name-text"
>
Радиокнопка
</span>
</label>
</label>
<label
class=
"field-radio__name"
>
<label
class=
"field-radio__name"
>
<input
class=
"field-radio__input"
type=
"radio"
name=
"one"
>
<input
class=
"field-radio__input"
type=
"radio"
name=
"one
1
"
>
<span
class=
"field-radio__name-text"
>
Радиокнопка
</span>
<span
class=
"field-radio__name-text"
>
Радиокнопка
</span>
</label>
</label>
<div
class=
"field-radio__help-text"
>
Нет общего названия, но оставлен пустой
<code>
div
</code>
для него.
</div>
<div
class=
"field-radio__help-text"
>
Нет общего названия, но оставлен пустой
<code>
div
</code>
для него.
</div>
...
@@ -441,11 +441,11 @@
...
@@ -441,11 +441,11 @@
<div
class=
"field-radio"
>
<div
class=
"field-radio"
>
<div
class=
"field-radio__input-wrap"
>
<div
class=
"field-radio__input-wrap"
>
<label
class=
"field-radio__name"
>
<label
class=
"field-radio__name"
>
<input
class=
"field-radio__input"
type=
"radio"
name=
"
one
"
>
<input
class=
"field-radio__input"
type=
"radio"
name=
"
two1
"
>
<span
class=
"field-radio__name-text"
>
Радиокнопка
</span>
<span
class=
"field-radio__name-text"
>
Радиокнопка
</span>
</label>
</label>
<label
class=
"field-radio__name"
>
<label
class=
"field-radio__name"
>
<input
class=
"field-radio__input"
type=
"radio"
name=
"
one
"
>
<input
class=
"field-radio__input"
type=
"radio"
name=
"
two1
"
>
<span
class=
"field-radio__name-text"
>
Радиокнопка
</span>
<span
class=
"field-radio__name-text"
>
Радиокнопка
</span>
</label>
</label>
<div
class=
"field-radio__help-text"
>
Нет общего названия и отсутствует пустой
<code>
div
</code>
для него.
</div>
<div
class=
"field-radio__help-text"
>
Нет общего названия и отсутствует пустой
<code>
div
</code>
для него.
</div>
...
@@ -465,13 +465,6 @@
...
@@ -465,13 +465,6 @@
<small
class=
"field-select__help-text"
>
Обёртка —
<code>
<
label
>
</code>
.
</small>
<small
class=
"field-select__help-text"
>
Обёртка —
<code>
<
label
>
</code>
.
</small>
</div>
</div>
</label>
</label>
<label
class=
"field-file"
>
<div
class=
"field-file__name"
>
Название поля
</div>
<div
class=
"field-file__input-wrap"
>
<input
class=
"field-file__input"
type=
"file"
>
<div
class=
"field-file__help-text"
>
Обёртка —
<code>
<
label
>
</code>
.
</div>
</div>
</label>
<div
class=
"field-actions"
>
<div
class=
"field-actions"
>
<button
class=
"btn"
>
Отправить
</button>
<button
class=
"btn"
>
Отправить
</button>
</div>
</div>
...
...
src/img/form_field_bg/chevron-down--error.svg
deleted
100644 → 0
View file @
db708fd0
<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 @
db708fd0
<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 @
db708fd0
<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-checkbox--custom.less
0 → 100644
View file @
77e3bf4c
.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
View file @
77e3bf4c
...
@@ -2,40 +2,6 @@
...
@@ -2,40 +2,6 @@
display: block;
display: block;
margin-bottom: (@line-height / 2);
margin-bottom: (@line-height / 2);
&--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.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/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');
}
}
}
&__title {
&__title {
font-weight: 700;
font-weight: 700;
line-height: 1.2em;
line-height: 1.2em;
...
...
src/less/blocks/field-radio--custom.less
0 → 100644
View file @
77e3bf4c
.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
View file @
77e3bf4c
...
@@ -2,38 +2,6 @@
...
@@ -2,38 +2,6 @@
display: block;
display: block;
margin-bottom: (@line-height / 2);
margin-bottom: (@line-height / 2);
&--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');
}
}
}
&__title {
&__title {
font-weight: 700;
font-weight: 700;
line-height: 1.2em;
line-height: 1.2em;
...
...
src/less/blocks/form.less
View file @
77e3bf4c
...
@@ -5,6 +5,8 @@
...
@@ -5,6 +5,8 @@
&--horizontal {
&--horizontal {
@media (min-width: @screen-sm) {
.field-text,
.field-text,
.field-checkbox,
.field-checkbox,
.field-radio,
.field-radio,
...
@@ -16,6 +18,7 @@
...
@@ -16,6 +18,7 @@
.field-text__name,
.field-text__name,
.field-select__name {
.field-select__name {
width: 15rem;
width: 15rem;
min-width: 15rem;
padding-top: .42em;
padding-top: .42em;
padding-right: .6em;
padding-right: .6em;
margin-bottom: 0;
margin-bottom: 0;
...
@@ -25,6 +28,7 @@
...
@@ -25,6 +28,7 @@
.field-radio__title,
.field-radio__title,
.field-file__name {
.field-file__name {
width: 15rem;
width: 15rem;
min-width: 15rem;
padding-right: .6em;
padding-right: .6em;
margin-bottom: 0;
margin-bottom: 0;
}
}
...
@@ -38,5 +42,14 @@
...
@@ -38,5 +42,14 @@
.field-actions {
.field-actions {
padding-left: 15rem;
padding-left: 15rem;
}
}
}
.field-checkbox__title,
.field-radio__title {
&:empty {
margin-bottom: 0;
}
}
}
}
}
}
src/less/global_scaffolding.less
View file @
77e3bf4c
...
@@ -430,11 +430,8 @@ input[readonly] {
...
@@ -430,11 +430,8 @@ input[readonly] {
select,
select,
textarea,
textarea,
input:not([type="submit"]),
input {
input:not([type="button"]),
input:not([type="reset"]) {
&:focus {
&:focus {
outline: fade(@color-main, 30%) solid 2px;
.focus();
outline-offset: -1px;
}
}
}
}
src/less/mixins/btn-mixins.less
View file @
77e3bf4c
...
@@ -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 @
77e3bf4c
.focus() {
outline: 0;
box-shadow: 0 0 0 2px fade(@color-main, 30%);
}
src/less/mixins/mixins.less
View file @
77e3bf4c
...
@@ -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 @
77e3bf4c
...
@@ -9,7 +9,9 @@
...
@@ -9,7 +9,9 @@
@import "blocks/form.less";
@import "blocks/form.less";
@import "blocks/field-text.less";
@import "blocks/field-text.less";
@import "blocks/field-checkbox.less";
@import "blocks/field-checkbox.less";
@import "blocks/field-checkbox--custom.less";
@import "blocks/field-radio.less";
@import "blocks/field-radio.less";
@import "blocks/field-radio--custom.less";
@import "blocks/field-select.less";
@import "blocks/field-select.less";
@import "blocks/field-file.less";
@import "blocks/field-file.less";
@import "blocks/field-actions.less";
@import "blocks/field-actions.less";
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment