Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop glyphicons and replace it by already existing icons in icons.css #1420

Merged
9 changes: 0 additions & 9 deletions app/client/components/ColumnFilters.css
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,6 @@
margin-right: 4px;
}

.g-glyphicon-tristate {
georgegevoian marked this conversation as resolved.
Show resolved Hide resolved
position: absolute;
top: 4px;
left: 3px;
width: 5px;
height: 5px;
background: #606060;
}

.badge-inv {
background-color: #ddd;
color: #666;
Expand Down
34 changes: 0 additions & 34 deletions app/client/components/DocConfigTab.js

This file was deleted.

3 changes: 0 additions & 3 deletions app/client/components/GristDoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {CodeEditorPanel} from 'app/client/components/CodeEditorPanel';
import * as commands from 'app/client/components/commands';
import {CursorMonitor, ViewCursorPos} from "app/client/components/CursorMonitor";
import {DocComm} from 'app/client/components/DocComm';
import * as DocConfigTab from 'app/client/components/DocConfigTab';
import {Drafts} from "app/client/components/Drafts";
import {EditorMonitor} from "app/client/components/EditorMonitor";
import {buildDefaultFormLayout} from 'app/client/components/Forms/FormView';
Expand Down Expand Up @@ -537,8 +536,6 @@ export class GristDoc extends DisposableWithEvents {

this._handleTriggerQueueOverflowMessage();

this.autoDispose(DocConfigTab.create({gristDoc: this}));

this.rightPanelTool = Computed.create(this, (use) => this._getToolContent(use(this._rightPanelTool)));

this.comparison = options.comparison || null;
Expand Down
16 changes: 15 additions & 1 deletion app/client/components/RecordLayoutEditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ RecordLayoutEditor.prototype.buildFinishButtons = function() {

RecordLayoutEditor.prototype.buildLeafDom = function() {
return dom('div.layout_grabbable.g_record_layout_editing',
dom('div.g_record_delete_field.glyphicon.glyphicon-eye-close',
cssIconEyeClose(
dom.on('mousedown', (ev) => ev.stopPropagation()),
dom.on('click', (ev, elem) => {
ev.preventDefault();
Expand All @@ -151,4 +151,18 @@ const cssCollapseIcon = styled(icon, `
margin: -3px -2px -2px 2px;
`);

const cssIconEyeClose = styled('div.g_record_delete_field', `
georgegevoian marked this conversation as resolved.
Show resolved Hide resolved
&::before {
display: block;
background-color: var(--grist-color-dark-text);
content: ' ';
mask-image: var(--icon-EyeHide);
width: 14px;
height: 14px;
mask-size: contain;
mask-repeat: no-repeat;
}
`
);

module.exports = RecordLayoutEditor;
29 changes: 0 additions & 29 deletions app/client/components/ValidationPanel.css

This file was deleted.

100 changes: 0 additions & 100 deletions app/client/components/ValidationPanel.js

This file was deleted.

1 change: 0 additions & 1 deletion app/client/declarations.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ declare module "app/client/components/AceEditor";
declare module "app/client/components/Clipboard";
declare module "app/client/components/CodeEditorPanel";
declare module "app/client/components/DetailView";
declare module "app/client/components/DocConfigTab";
declare module "app/client/components/GridView";
declare module "app/client/lib/Mousetrap";
declare module "app/client/lib/browserGlobals";
Expand Down
18 changes: 18 additions & 0 deletions app/client/lib/koForm.css
georgegevoian marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,24 @@ div:hover > .kf_tooltip {
color: #777777;
}

.kf_draggable__icon::before {
display: block;
background-color: var(--grist-theme-control-secondary-fg, var(--grist-color-slate));
content: ' ';
width: 14px;
height: 14px;
mask-size: contain;
mask-repeat: no-repeat;
}

.kf_draggable__icon.icon-dragdrop::before {
mask-image: var(--icon-DragDrop);
}

.kf_draggable__icon.icon-remove::before {
mask-image: var(--icon-Remove);
}

.kf_draggable_content {
display: inline-block;
margin-left: 2px;
Expand Down
18 changes: 2 additions & 16 deletions app/client/lib/koForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -329,20 +329,6 @@ exports.selectSpinner = function(valueObservable, optionObservable) {
return genSpinner(valueObservable, getNewValue, shouldDisable);
};

/**
georgegevoian marked this conversation as resolved.
Show resolved Hide resolved
* Creates an alignment selector linked to `valueObservable`.
*/
exports.alignmentSelector = function(valueObservable) {
return this.buttonSelect(valueObservable,
this.optionButton("left", dom('span.glyphicon.glyphicon-align-left'),
dom.testId('koForm_alignLeft')),
this.optionButton("center", dom('span.glyphicon.glyphicon-align-center'),
dom.testId('koForm_alignCenter')),
this.optionButton("right", dom('span.glyphicon.glyphicon-align-right'),
dom.testId('koForm_alignRight'))
);
};

/**
* Label with a collapser triangle in front, which may be clicked to toggle `isCollapsedObs`
* observable.
Expand Down Expand Up @@ -479,12 +465,12 @@ exports.draggableList = function(contentArray, itemCreateFunc, options) {
kd.cssClass(options.itemClass),
(options.drag_indicator ?
(typeof options.drag_indicator === 'boolean' ?
dom('span.kf_drag_indicator.glyphicon.glyphicon-option-vertical') :
dom('span.kf_drag_indicator.kf_draggable__icon.icon-dragdrop') :
options.drag_indicator()
) : null),
kd.domData('model', item),
kd.maybe(removeFunc !== undefined && options.removeButton, function() {
return dom('span.drag_delete.glyphicon.glyphicon-remove',
return dom('span.drag_delete.kf_draggable__icon.icon-remove',
dom.on('click', function() {
removeFunc(item)
.catch(function(err) {
Expand Down
37 changes: 0 additions & 37 deletions app/client/lib/multiselect.css

This file was deleted.

Loading