Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[stylesheets] repaired some components

Browse source
This commit is contained in:
Maxim Kadushkin 2021-01-06 20:33:01 +03:00
parent 6d121415f2
commit bd6c34b66d
7 changed files with 41 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/common/main/lib/component/ComboBorderSize.js
View file

@ -177,7 +177,9 @@ define([
template: _.template([
'<span class="input-group combobox combo-border-size input-group-nr <%= cls %>" id="<%= id %>" style="<%= style %>">',
'<input type="text" class="form-control text">',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
'<span class="caret"></span>',
'</button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
'<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem">',
@ -230,7 +232,9 @@ define([
'<i class="image"></i>',
'</div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">',
'<span class="caret"></span>',
'</button>',
'<ul class="dropdown-menu <%= menuCls %>" style="<%= menuStyle %>" role="menu">',
'<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem" style="padding: 2px 0 2px 10px;">',

2
apps/common/main/resources/less/colors-table-dark.less
View file

@ -19,7 +19,7 @@
--highlight-button-pressed: #606060;
--highlight-button-pressed-hover: #808080;
--highlight-primary-dialog-button-hover: #e5e5e5;
--highlight-header-button-hover: #000, 20%;
--highlight-header-button-hover: fade(#fff, 20%);
--highlight-toolbar-tab-underline: #ddd;
--highlight-text-select: #96c8fd;

8
apps/common/main/resources/less/combobox.less
View file

@ -55,9 +55,11 @@
padding-right: 4px;
}
.btn-default.disabled:hover {
background-color: transparent;
border-color: @border-regular-control;
.btn-default.disabled {
&:hover, &:focus {
background-color: transparent;
border-color: @border-regular-control;
}
}
&.input-group-nr.open:not(.no-highlighted) {

32
apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
View file

@ -1012,9 +1012,11 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
el: $('#shape-advanced-begin-style'),
template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
'<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default">',
'<span class="caret"></span>',
'</button>',
'</div>'
].join(''))
});
@ -1039,9 +1041,11 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
el: $('#shape-advanced-begin-size'),
template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
'<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default">',
'<span class="caret"></span>',
'</button>',
'</div>'
].join(''))
});
@ -1072,9 +1076,11 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
el: $('#shape-advanced-end-style'),
template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
'<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default">',
'<span class="caret"></span>',
'</button>',
'</div>'
].join(''))
});
@ -1099,9 +1105,11 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
el: $('#shape-advanced-end-size'),
template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
'<div class="img-arrows form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default">',
'<span class="caret"></span>',
'</button>',
'</div>'
].join(''))
});

11
apps/documenteditor/main/resources/less/advanced-settings.less
View file

@ -50,16 +50,7 @@
&.image {
background-position: 10px 0;
background-attachment: scroll;
background-color: white;
}
}
.btn {
&:active:not(.disabled),
&.active:not(.disabled){
.caret {
background-position: @arrow-small-offset-x @arrow-small-offset-y;
}
background-color: @background-normal;
}
}
}

8
apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -357,7 +357,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>'
].join(''))
});
@ -384,7 +384,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>'
].join(''))
});
@ -417,7 +417,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>'
].join(''))
});
@ -444,7 +444,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>'
].join(''))
});

8
apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -378,7 +378,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>'
].join(''))
});
@ -405,7 +405,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>'
].join(''))
});
@ -438,7 +438,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>'
].join(''))
});
@ -465,7 +465,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle combo-arrow-style" data-toggle="dropdown">',
'<div class="form-control image" style="width: 100px;"></div>',
'<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default"><span class="caret img-commonctrl"></span></button>',
'<button type="button" class="btn btn-default"><span class="caret"></span></button>',
'</div>'
].join(''))
});