diff --git a/apps/common/main/lib/component/RadioBox.js b/apps/common/main/lib/component/RadioBox.js
index 040d88af3..c523d0f96 100644
--- a/apps/common/main/lib/component/RadioBox.js
+++ b/apps/common/main/lib/component/RadioBox.js
@@ -71,8 +71,13 @@ define([
disabled : false,
rendered : false,
- template : _.template(''),
+ template : _.template('
' +
+ '' +
+ '' +
+ '
'),
initialize : function(options) {
Common.UI.BaseView.prototype.initialize.call(this, options);
@@ -96,7 +101,6 @@ define([
this.setCaption(this.options.labelText);
// handle events
- this.$radio.on('click', _.bind(this.onItemCheck, this));
},
render: function () {
@@ -111,9 +115,15 @@ define([
}));
this.$radio = el.find('input[type=radio]');
- this.$label = el.find('label.radiobox');
+ this.$label = el.find('div.radiobox');
this.$span = this.$label.find('span');
- this.$label.on('keydown', this.onKeyDown.bind(this));
+ this.$label.on({
+ 'keydown': this.onKeyDown.bind(this),
+ 'click': function(e){
+ if ( !this.disabled )
+ this.setValue(true);
+ }.bind(this),});
+
this.rendered = true;
return this;
diff --git a/apps/common/main/resources/less/radiobox.less b/apps/common/main/resources/less/radiobox.less
index 843c1eb82..6aebe8c2f 100644
--- a/apps/common/main/resources/less/radiobox.less
+++ b/apps/common/main/resources/less/radiobox.less
@@ -1,72 +1,53 @@
.radiobox {
- padding-left: 22px;
margin-bottom: 0;
.font-size-normal();
font-weight: normal;
position: relative;
min-height: 1em;
- input[type=radio] {
+ display: flex;
+ align-items: center;
+ svg {
+ margin-right: 8px;
+ .rb-circle {
+ fill: @background-normal;
+ stroke: @border-regular-control;
+ }
+
+ .rb-check-mark {
+ fill: @text-normal;
+ }
+ }
+
+ input[type=radio] {
display: none;
- + label {
- position: absolute;
- left: 0;
- margin-top: auto;
- padding-bottom: 4px;
- width: 14px;
- height: 14px;
-
- background: @background-normal-ie;
- background: @background-normal;
- border: @scaled-one-px-value-ie solid @border-regular-control-ie;
- border: @scaled-one-px-value solid @border-regular-control;
- border-radius: 50%;
-
- + span {
- outline: @scaled-one-px-value-ie dotted transparent;
- outline: @scaled-one-px-value dotted transparent;
- display: inline-block;
+ &:not(:checked) + svg {
+ .rb-check-mark {
+ display: none;
}
}
+ }
- &:checked {
- + label {
- &::before {
- content: '';
- position: absolute;
- background: @text-normal-ie;
- background: @text-normal;
- border-radius: 50%;
- width: 8px;
- height: 8px;
- left: 2px;
- top: 2px;
- }
- }
- }
-
- &.disabled, &:disabled {
-
- + label {
- &::before {
- }
- }
+ &.disabled, &:disabled {
+ svg, span {
+ opacity: @component-disabled-opacity;
+ pointer-events: none;
}
}
&:focus:not(.disabled) {
- input[type=radio] {
- + label {
- border-color: @border-control-focus-ie;
- border-color: @border-control-focus;
-
- + span {
- outline-color: @border-control-focus-ie;
- outline-color: @border-control-focus;
- }
+ svg {
+ .rb-circle {
+ stroke: @border-control-focus-ie;
+ stroke: @border-control-focus;
}
}
+
+ span {
+ outline: @scaled-one-px-value-ie dotted @border-control-focus-ie;
+ outline: @scaled-one-px-value dotted @border-control-focus;
+ }
}
}
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/BookmarksDialog.js b/apps/documenteditor/main/app/view/BookmarksDialog.js
index 1e3285f81..1d69c9716 100644
--- a/apps/documenteditor/main/app/view/BookmarksDialog.js
+++ b/apps/documenteditor/main/app/view/BookmarksDialog.js
@@ -79,8 +79,8 @@ define([
'',
'',
'
',
'',
diff --git a/apps/documenteditor/main/app/view/TextToTableDialog.js b/apps/documenteditor/main/app/view/TextToTableDialog.js
index a1d69eea2..5293df706 100644
--- a/apps/documenteditor/main/app/view/TextToTableDialog.js
+++ b/apps/documenteditor/main/app/view/TextToTableDialog.js
@@ -91,8 +91,8 @@ define([
'
',
'',
'',
- '',
- '',
+ '',
+ '',
' | ',
'
',
'',
diff --git a/apps/documenteditor/main/resources/less/advanced-settings.less b/apps/documenteditor/main/resources/less/advanced-settings.less
index 01a5aa989..75d7fda5c 100644
--- a/apps/documenteditor/main/resources/less/advanced-settings.less
+++ b/apps/documenteditor/main/resources/less/advanced-settings.less
@@ -73,4 +73,25 @@
#page-margins-preview {
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control;
+}
+
+#id-text-table-radio-fixed {
+ display: inline-block;
+ margin-right: 10px;
+ vertical-align: middle;
+
+ .pixel-ratio__1_75 &, .pixel-ratio__2 & {
+ padding-bottom: 1px;
+ }
+}
+
+#bookmarks-radio-name {
+ display: inline-block;
+ margin-right: 10px;
+ vertical-align: middle;
+}
+
+#id-text-table-spn-fixed, #bookmarks-radio-location {
+ display: inline-block;
+ vertical-align: middle;
}
\ No newline at end of file