diff --git a/src/riotTags/app-view.tag b/src/riotTags/app-view.tag index 291d168c5..6a22048c0 100644 --- a/src/riotTags/app-view.tag +++ b/src/riotTags/app-view.tag @@ -1,6 +1,6 @@ app-view.flexcol nav.nogrow.flexrow(if="{global.currentProject}") - ul#app.nav.tabs + ul#app.aNav.tabs li.it30#ctlogo(onclick="{changeTab('menu')}" title="{voc.ctIDE}" class="{active: tab === 'menu'}") svg.feather.nmr use(xlink:href="#menu") @@ -11,7 +11,7 @@ app-view.flexcol svg.feather use(xlink:href="#save") - ul#mainnav.nav.tabs + ul#mainnav.aNav.tabs li.nbl.it30(onclick="{runProject}" class="{active: tab === 'debug'}" title="{voc.launch} {voc.launchHotkeys}" data-hotkey="F5") svg.feather.rotateccw(show="{exportingProject}") use(xlink:href="#refresh-ccw") diff --git a/src/riotTags/debugger/debugger-modal.tag b/src/riotTags/debugger/debugger-modal.tag index 0a3b52458..bf99fa50c 100644 --- a/src/riotTags/debugger/debugger-modal.tag +++ b/src/riotTags/debugger/debugger-modal.tag @@ -1,4 +1,4 @@ -debugger-modal.view +debugger-modal.aView .center.aQRList .aQR(each="{interfaces}") div.center(ref="qr" data-address="{address}") diff --git a/src/riotTags/font-editor.tag b/src/riotTags/font-editor.tag index 7d225b585..fed31cc1d 100644 --- a/src/riotTags/font-editor.tag +++ b/src/riotTags/font-editor.tag @@ -1,5 +1,5 @@ -font-editor.panel.view - .panel.pad.left.tall.flexfix +font-editor.aPanel.aView + .aPanel.pad.left.tall.flexfix .flexfix-body fieldset label.block diff --git a/src/riotTags/fonts-panel.tag b/src/riotTags/fonts-panel.tag index 081295e57..0724e0d67 100644 --- a/src/riotTags/fonts-panel.tag +++ b/src/riotTags/fonts-panel.tag @@ -9,8 +9,8 @@ fonts-panel.flexfix.tall.fifty names="{names}" ref="fonts" class="tall" - ) h1 {voc.fonts} + h1 {parent.voc.fonts} .toleft label.file.flexfix-header input(type="file" multiple @@ -18,8 +18,8 @@ fonts-panel.flexfix.tall.fifty onchange="{parent.fontImport}") .button svg.feather - use(xlink:href="#download") span {voc.import} + span {parent.voc.import} context-menu(menu="{fontMenu}" ref="fontMenu") font-editor(if="{editingFont}" fontobj="{editedFont}") script. diff --git a/src/riotTags/main-menu/export-panel.tag b/src/riotTags/main-menu/export-panel.tag index 3c92d59be..33b579788 100644 --- a/src/riotTags/main-menu/export-panel.tag +++ b/src/riotTags/main-menu/export-panel.tag @@ -1,6 +1,6 @@ export-panel .dim - .modal.pad.flexfix + .aModal.pad.flexfix .flexfix-header h2.nmt {voc.exportPanel} .flexfix-body @@ -28,7 +28,7 @@ export-panel | span {voc.windowsCrossBuildWarning} span(if="{process.platform === 'darwin'}") {voc.windowsCrossBuildMacOs} - .spacer + .aSpacer h3(if="{log.length}") | {voc.log} .rem.a(onclick="{copyLog}").toright {vocGlob.copy} @@ -190,4 +190,4 @@ export-panel this.copyLog = () => { nw.Clipboard.get().set(this.log.join('\n'), 'text'); - }; \ No newline at end of file + }; diff --git a/src/riotTags/main-menu/icon-panel.tag b/src/riotTags/main-menu/icon-panel.tag index 401e744d5..44ebe8f78 100644 --- a/src/riotTags/main-menu/icon-panel.tag +++ b/src/riotTags/main-menu/icon-panel.tag @@ -1,8 +1,8 @@ -icon-panel.view.pad +icon-panel.aView.pad .toright button(onclick="{opts.onclose}") {vocGlob.close} .clear - ul.cards + ul.Cards li( each="{icon in iconList}" onclick="{copy(icon)}" diff --git a/src/riotTags/main-menu/license-panel.tag b/src/riotTags/main-menu/license-panel.tag index 8e188a2cb..f192c5e13 100644 --- a/src/riotTags/main-menu/license-panel.tag +++ b/src/riotTags/main-menu/license-panel.tag @@ -1,4 +1,4 @@ -license-panel.modal.pad +license-panel.aModal.pad .toright(title="{vocGlob.close}") span(onclick="{opts.onclose}") svg.feather diff --git a/src/riotTags/main-menu/main-menu-project.tag b/src/riotTags/main-menu/main-menu-project.tag index 841cb3b59..75c7d11a9 100644 --- a/src/riotTags/main-menu/main-menu-project.tag +++ b/src/riotTags/main-menu/main-menu-project.tag @@ -10,7 +10,7 @@ main-menu-project use(xlink:href="#package") span {voc.zipProject} li(onclick="{openIncludeFolder}") - .spacer + .aSpacer span {voc.openIncludeFolder} ul.aMenu li(onclick="{openProject}") @@ -18,10 +18,10 @@ main-menu-project use(xlink:href="#folder") span {voc.openProject} li(onclick="{openExample}") - .spacer + .aSpacer span {voc.openExample} li(onclick="{toStartScreen}") - .spacer + .aSpacer span {voc.startScreen} script. this.namespace = 'mainMenu.project'; diff --git a/src/riotTags/new-project-onboarding.tag b/src/riotTags/new-project-onboarding.tag index 7cdde935d..2d9acca45 100644 --- a/src/riotTags/new-project-onboarding.tag +++ b/src/riotTags/new-project-onboarding.tag @@ -1,6 +1,6 @@ new-project-onboarding - .dimmer - .panel.flexfix + .aDimmer + .aPanel.flexfix .flexfix-body .center svg.anIllustration diff --git a/src/riotTags/notepad-panel.tag b/src/riotTags/notepad-panel.tag index 93d68c517..b485035a2 100644 --- a/src/riotTags/notepad-panel.tag +++ b/src/riotTags/notepad-panel.tag @@ -1,5 +1,5 @@ -notepad-panel#notepad.panel.dockright(class="{opened: opened}") - ul.nav.tabs.nogrow.nb +notepad-panel#notepad.aPanel.dockright(class="{opened: opened}") + ul.aNav.tabs.nogrow.nb li(onclick="{changeTab('notepadlocal')}" class="{active: tab === 'notepadlocal'}") svg.feather use(xlink:href="#edit") diff --git a/src/riotTags/particles/emitter-editor.tag b/src/riotTags/particles/emitter-editor.tag index 3b9b1c5e4..685631201 100644 --- a/src/riotTags/particles/emitter-editor.tag +++ b/src/riotTags/particles/emitter-editor.tag @@ -1,4 +1,4 @@ -emitter-editor.panel.pad.nb +emitter-editor.aPanel.pad.nb .emitter-editor-aHeader img.emitter-editor-aTexture(src="{getPreview()}") h3 {voc.emitterHeading} {opts.emitter.uid.split('-').pop()} @@ -302,7 +302,7 @@ emitter-editor.panel.pad.nb value="{parent.opts.emitter.settings.delay}" oninput="{parent.wireAndReset('this.opts.emitter.settings.delay')}" ) - .spacer + .aSpacer collapsible-section( heading="{voc.shapeAndPositioningHeading}" @@ -392,7 +392,7 @@ emitter-editor.panel.pad.nb value="{parent.opts.emitter.settings.angleStart}" oninput="{parent.wireAndUpdate('this.opts.emitter.settings.angleStart', 'angleStart', true)}" ) - .spacer + .aSpacer input.wide( type="range" min="0" max="360" step="1" data-wired-force-minmax="yes" diff --git a/src/riotTags/particles/emitter-tandem-editor.tag b/src/riotTags/particles/emitter-tandem-editor.tag index 0f960dee3..48688437a 100644 --- a/src/riotTags/particles/emitter-tandem-editor.tag +++ b/src/riotTags/particles/emitter-tandem-editor.tag @@ -1,7 +1,7 @@ -emitter-tandem-editor.panel.view.flexrow +emitter-tandem-editor.aPanel.aView.flexrow .flexfix(style="width: {panelWidth}px") .flexfix-header - .panel.pad.nbt.nbl.nbr + .aPanel.pad.nbt.nbl.nbr b {vocGlob.name} br input.wide(type="text" value="{tandem.name}" onchange="{wire('this.tandem.name')}") @@ -32,7 +32,7 @@ emitter-tandem-editor.panel.view.flexrow .emitter-tandem-editor-Tools.flexrow button.nogrow.forcebackground(onclick="{resetEmitters}") span {voc.reset} - .spacer + .aSpacer button.nogrow.forcebackground(onclick="{openPreviewTexturePicker}") svg.feather use(xlink:href="#texture") @@ -51,7 +51,7 @@ emitter-tandem-editor.panel.view.flexrow | | b {Math.round(zoom * 100)}% - .spacer + .aSpacer zoom-slider(onchanged="{setZoom}" ref="zoomslider" value="{zoom}") color-picker( ref="previewBackgroundColor" if="{changingPreviewColor}" diff --git a/src/riotTags/particles/fx-panel.tag b/src/riotTags/particles/fx-panel.tag index 4fa340793..01cc5f771 100644 --- a/src/riotTags/particles/fx-panel.tag +++ b/src/riotTags/particles/fx-panel.tag @@ -1,4 +1,4 @@ -fx-panel.panel.view +fx-panel.aPanel.aView asset-viewer.tall( collection="{global.currentProject.emitterTandems}" contextmenu="{showTandemPopup}" diff --git a/src/riotTags/particles/particle-importer.tag b/src/riotTags/particles/particle-importer.tag index 76da8bdb7..6f0fc8ffc 100644 --- a/src/riotTags/particles/particle-importer.tag +++ b/src/riotTags/particles/particle-importer.tag @@ -1,7 +1,7 @@ -particle-importer.panel.view +particle-importer.aPanel.aView .flexfix.tall .flexfix-body - ul.cards + ul.Cards li( each="{texture in textures}" onclick="{onselected(texture)}" diff --git a/src/riotTags/patreon-screen.tag b/src/riotTags/patreon-screen.tag index 7db997375..82c7f61c5 100644 --- a/src/riotTags/patreon-screen.tag +++ b/src/riotTags/patreon-screen.tag @@ -12,7 +12,7 @@ patron-line span(if="{!opts.patron['18+'] && opts.patron.about}") {parent.getEmoji(opts.patron.name)} script. -patreon-screen.view(style="z-index: 100;") +patreon-screen.aView(style="z-index: 100;") .Confetti .aConfettiPiece(each="{confetti in (new Array(15))}" style="background: {getConfettiColor()}") h1 {voc.patronsHeader} diff --git a/src/riotTags/project-selector.tag b/src/riotTags/project-selector.tag index c31d4fa40..6923257bf 100644 --- a/src/riotTags/project-selector.tag +++ b/src/riotTags/project-selector.tag @@ -1,8 +1,8 @@ project-selector #bg.stretch.flexcol - .spacer - #intro.panel.flexfix.nogrow - ul.nav.tabs.flexfix-header.nb + .aSpacer + #intro.aPanel.flexfix.nogrow + ul.aNav.tabs.flexfix-header.nb li(class="{active: tab === 'projects'}" onclick="{changeTab('projects')}") span {voc.latest} li(class="{active: tab === 'examples'}" onclick="{changeTab('examples')}") @@ -46,8 +46,10 @@ project-selector onclick="{loadRecentProject}" title="{project}" ) - img(src="{getProjectThumbnail(project)}") - span {getProjectName(project)} + .Cards-aThumbnail + img(src="{getProjectThumbnail(project)}") + .Cards-Properties + span {getProjectName(project)} .aCard-Actions button.tiny(onclick="{cloneProject}" title="{voc.cloneProject}") svg.feather @@ -61,7 +63,7 @@ project-selector ref="projectname" ) button.nm.inline(onclick="{openProjectFolder}") {voc.newProject.button} - .spacer + .aSpacer .aVersionNumber.nogrow a(href="https://github.com/orgs/ct-js/" title="{voc.github}" onclick="{openExternal('https://github.com/orgs/ct-js/')}") svg.icon diff --git a/src/riotTags/project-settings/project-settings.tag b/src/riotTags/project-settings/project-settings.tag index c2d43d67a..4b5d48284 100644 --- a/src/riotTags/project-settings/project-settings.tag +++ b/src/riotTags/project-settings/project-settings.tag @@ -1,4 +1,4 @@ -project-settings.panel.view.pad.flexrow +project-settings.aPanel.aView.pad.flexrow - var tabs = ['authoring', 'actions', 'branding', 'content', 'modules', 'scripts', 'rendering', 'export']; var iconMap = { @@ -13,7 +13,7 @@ project-settings.panel.view.pad.flexrow default: 'settings' }; aside.nogrow.noshrink - ul.nav.tabs.vertical + ul.aNav.tabs.vertical // A bit of Pug sorcery, destroyed by Riot.js syntax // Iterate over an array of sections. Template out Riot syntax inside `these` backticks. each name in tabs @@ -22,7 +22,7 @@ project-settings.panel.view.pad.flexrow use(xlink:href=`#${(name in iconMap)? iconMap[name] : iconMap.default}`) span='{voc.' + name + '.heading}' h3(if="{modulesWithFields.length}") {voc.catmodsSettings} - ul(if="{modulesWithFields.length}").nav.tabs.vertical + ul(if="{modulesWithFields.length}").aNav.tabs.vertical li( each="{module in modulesWithFields}" onclick="{openModuleSettings(module)}" @@ -33,7 +33,7 @@ project-settings.panel.view.pad.flexrow use(xlink:href=`#{getIcon(module)}`) span {module.manifest.main.name} h3(if="{currentProject.contentTypes && currentProject.contentTypes.length}") {voc.contentTypes} - ul(if="{currentProject.contentTypes && currentProject.contentTypes.length}").nav.tabs.vertical + ul(if="{currentProject.contentTypes && currentProject.contentTypes.length}").aNav.tabs.vertical li( each="{contentType in currentProject.contentTypes}" onclick="{openContentType(contentType)}" diff --git a/src/riotTags/project-settings/tabs/actions-input-selector.tag b/src/riotTags/project-settings/tabs/actions-input-selector.tag index d748be892..d26e03803 100644 --- a/src/riotTags/project-settings/tabs/actions-input-selector.tag +++ b/src/riotTags/project-settings/tabs/actions-input-selector.tag @@ -1,5 +1,5 @@ actions-input-selector - .panel.flexfix + .aPanel.flexfix .flexfix-header .aSearchWrap.wide input.wide( diff --git a/src/riotTags/project-settings/tabs/actions-settings.tag b/src/riotTags/project-settings/tabs/actions-settings.tag index 64058c122..13d054dfd 100644 --- a/src/riotTags/project-settings/tabs/actions-settings.tag +++ b/src/riotTags/project-settings/tabs/actions-settings.tag @@ -35,7 +35,7 @@ actions-settings input.wide(type="text" placeholder="{voc.inputActionNamePlaceholder}" value="{action.name}" onchange="{checkActionNameAndSave}") .anErrorNotice(if="{nameTaken === action.name}" ref="errors") {vocGlob.nametaken} .anErrorNotice(if="{action.name.trim() === ''}" ref="errors") {vocGlob.cannotBeEmpty} - .spacer + .aSpacer svg.feather.a(title="{voc.deleteAction}" onclick="{deleteAction}") use(xlink:href="#x") .c8.npr.npl.breakon800 @@ -68,7 +68,7 @@ actions-settings svg.feather use(xlink:href="#upload") span {voc.exportActionPreset} - .dimmer(show="{addingMethod}") + .aDimmer(show="{addingMethod}") actions-input-selector(action="{editedAction}" ref="methodSelector") script. global.currentProject.actions = global.currentProject.actions || []; diff --git a/src/riotTags/project-settings/tabs/branding-settings.tag b/src/riotTags/project-settings/tabs/branding-settings.tag index 0dd86e9cc..44b29cbd0 100644 --- a/src/riotTags/project-settings/tabs/branding-settings.tag +++ b/src/riotTags/project-settings/tabs/branding-settings.tag @@ -11,13 +11,13 @@ branding-settings onselected="{updateGameIcon}" header="{voc.icon}" ) - .spacer + .aSpacer .block b span {voc.accent} hover-hint(text="{voc.accentNotice}") color-input(onchange="{wire('global.currentProject.settings.branding.accent', true)}" color="{global.currentProject.settings.branding.accent}") - .spacer + .aSpacer .block.checkbox input(type="checkbox" value="{global.currentProject.settings.branding.invertPreloaderScheme}" checked="{global.currentProject.settings.branding.invertPreloaderScheme}" onchange="{wire('this.currentProject.settings.branding.invertPreloaderScheme')}") span {voc.invertPreloaderScheme} diff --git a/src/riotTags/project-settings/tabs/content-subsystem/content-settings.tag b/src/riotTags/project-settings/tabs/content-subsystem/content-settings.tag index be446717e..bd360eb49 100644 --- a/src/riotTags/project-settings/tabs/content-subsystem/content-settings.tag +++ b/src/riotTags/project-settings/tabs/content-subsystem/content-settings.tag @@ -7,7 +7,7 @@ content-settings // References to `this` get weird here. // See https://v3.riotjs.vercel.app/api/#yield-and-loops - collapsible-section.panel(each="{type in contentTypes}" contentType="{type}") + collapsible-section.aPanel(each="{type in contentTypes}" contentType="{type}") yield(to="header") h3 svg.feather diff --git a/src/riotTags/project-settings/tabs/modules/modules-settings.tag b/src/riotTags/project-settings/tabs/modules/modules-settings.tag index b21797d1b..51764cdde 100644 --- a/src/riotTags/project-settings/tabs/modules/modules-settings.tag +++ b/src/riotTags/project-settings/tabs/modules/modules-settings.tag @@ -1,4 +1,4 @@ -modules-settings.panel.view +modules-settings.aPanel.aView collapsible-section.aModuleFilter(heading="{voc.filter}" defaultstate="closed" storestatekey="modulesFilter") .flexrow label.nogrow diff --git a/src/riotTags/project-settings/tabs/script-editor.tag b/src/riotTags/project-settings/tabs/script-editor.tag index 96d7df2f8..5528095e5 100644 --- a/src/riotTags/project-settings/tabs/script-editor.tag +++ b/src/riotTags/project-settings/tabs/script-editor.tag @@ -1,4 +1,4 @@ -script-editor.view +script-editor.aView .flexfix.tall div.flexfix-header b {voc.name} diff --git a/src/riotTags/rooms/copy-custom-properties-modal.tag b/src/riotTags/rooms/copy-custom-properties-modal.tag index d71e54470..39c3023ef 100644 --- a/src/riotTags/rooms/copy-custom-properties-modal.tag +++ b/src/riotTags/rooms/copy-custom-properties-modal.tag @@ -8,7 +8,7 @@ A function that changes whether this modal is shown copy-custom-properties-modal - .panel.flexfix(ref="widget" style='overflow: auto; max-height: 600px') + .aPanel.flexfix(ref="widget" style='overflow: auto; max-height: 600px') h2.flexfix-header {voc.customProperties} .flexfix-body table.wide.aPaddedTable diff --git a/src/riotTags/rooms/room-copy-properties.tag b/src/riotTags/rooms/room-copy-properties.tag index 84b9625fb..7b964664d 100644 --- a/src/riotTags/rooms/room-copy-properties.tag +++ b/src/riotTags/rooms/room-copy-properties.tag @@ -1,4 +1,4 @@ -room-copy-properties.panel +room-copy-properties.aPanel b {voc.position}: .aPoint2DInput.compact.wide label @@ -9,7 +9,7 @@ room-copy-properties.panel oninput="{wire('this.opts.copy.x')}" value="{opts.copy.x}" ) - .spacer + .aSpacer label span.nogrow Y: | @@ -28,7 +28,7 @@ room-copy-properties.panel oninput="{wire('this.opts.copy.tx')}" value="{opts.copy.tx === void 0 ? 1 : opts.copy.tx}" ) - .spacer + .aSpacer label span.nogrow Y: | @@ -46,7 +46,7 @@ room-copy-properties.panel value="{opts.copy.tr || 0}" oninput="{wire('this.opts.copy.tr')}" ) - .spacer + .aSpacer input.compact( min="0" max="360" step="1" type="number" value="{opts.copy.tr || 0}" @@ -62,4 +62,4 @@ room-copy-properties.panel if (this.opts.copy && !this.opts.copy.exts) { this.opts.copy.exts = {}; } - }); \ No newline at end of file + }); diff --git a/src/riotTags/rooms/room-editor.tag b/src/riotTags/rooms/room-editor.tag index 820115eee..cd5e7a5c9 100644 --- a/src/riotTags/rooms/room-editor.tag +++ b/src/riotTags/rooms/room-editor.tag @@ -1,4 +1,4 @@ -room-editor.panel.view +room-editor.aPanel.aView .toolbar.tall(style="width: {sidebarWidth}px") copy-custom-properties-modal(if="{showCopyPropertiesModal}" closestcopy="{closestCopy}" showme="{toggleCopyProperties}") .settings.nogrow.noshrink @@ -12,7 +12,7 @@ room-editor.panel.view span {voc.events} .palette .tabwrap.flexfix - ul.tabs.nav.noshrink.nogrow.flexfix-header + ul.tabs.aNav.noshrink.nogrow.flexfix-header li(onclick="{changeTab('roomcopies')}" title="{voc.copies}" class="{active: tab === 'roomcopies'}") svg.feather use(xlink:href="#type") @@ -33,7 +33,7 @@ room-editor.panel.view room-type-picker(show="{tab === 'roomcopies'}" current="{currentType}") room-backgrounds-editor(show="{tab === 'roombackgrounds'}" room="{room}") room-tile-editor(show="{tab === 'roomtiles'}" room="{room}") - .pad.panel(show="{tab === 'properties'}") + .pad.aPanel(show="{tab === 'properties'}") fieldset .fifty.npt.npb.npl b {voc.width} @@ -57,7 +57,7 @@ room-editor.panel.view oninput="{wireAndRedraw('this.room.restrictMinX')}" value="{room.restrictMinX === void 0 ? 0 : room.restrictMinX}" ) - .spacer + .aSpacer label span.nogrow {voc.minimumY}: | @@ -75,7 +75,7 @@ room-editor.panel.view oninput="{wireAndRedraw('this.room.restrictMaxX')}" value="{room.restrictMaxX === void 0 ? room.width : room.restrictMaxX}" ) - .spacer + .aSpacer label span.nogrow {voc.maximumY}: | @@ -140,7 +140,7 @@ room-editor.panel.view | | span {Math.round(zoomFactor * 100)}% - .spacer + .aSpacer zoom-slider(onchanged="{setZoom}" ref="zoomslider" value="{zoomFactor}") .grid button#roomgrid.forcebackground(onclick="{roomToggleGrid}" class="{active: room.gridX > 0}") diff --git a/src/riotTags/rooms/room-events-editor.tag b/src/riotTags/rooms/room-events-editor.tag index 80d9882cd..b7507dc69 100644 --- a/src/riotTags/rooms/room-events-editor.tag +++ b/src/riotTags/rooms/room-events-editor.tag @@ -1,6 +1,6 @@ -room-events-editor.view +room-events-editor.aView .tabwrap - ul.tabs.nav.nogrow.noshrink.nb + ul.tabs.aNav.nogrow.noshrink.nb li(onclick="{switchTab('roomcreate')}" class="{active: tab === 'roomcreate'}" title="Control-Q" data-hotkey="Control+q") svg.feather use(xlink:href="#sun") diff --git a/src/riotTags/rooms/rooms-panel.tag b/src/riotTags/rooms/rooms-panel.tag index dd14b09d9..ba3112f5e 100644 --- a/src/riotTags/rooms/rooms-panel.tag +++ b/src/riotTags/rooms/rooms-panel.tag @@ -1,4 +1,4 @@ -rooms-panel.panel.view +rooms-panel.aPanel.aView .flexfix.tall .flexfix-header div @@ -22,7 +22,7 @@ rooms-panel.panel.view svg.feather use(xlink:href="#plus") span {voc.create} - ul.pad.cards.largeicons.flexfix-body(class="{list: localStorage.roomsLayout === 'list'}") + ul.pad.Cards.largeicons.flexfix-body(class="{list: localStorage.roomsLayout === 'list'}") li( each="{room in (searchResults? searchResults : rooms)}" class="{starting: global.currentProject.startroom === room.uid}" diff --git a/src/riotTags/root-tag.tag b/src/riotTags/root-tag.tag index dbdcf71a6..bf7b80cb1 100644 --- a/src/riotTags/root-tag.tag +++ b/src/riotTags/root-tag.tag @@ -39,7 +39,7 @@ root-tag font-family: ${localStorage.fontFamily || 'Iosevka, monospace'}; font-variant-ligatures: ${localStorage.codeLigatures === 'off' ? 'none' : 'normal'}; } - .monaco-editor .view-lines.view-lines { + .monaco-editor .aView-lines.aView-lines { line-height: ${localStorage.codeDense === 'on' ? 1.5 : 1.75}; } `; diff --git a/src/riotTags/shared/asset-viewer.tag b/src/riotTags/shared/asset-viewer.tag index be9bae011..53b9c455a 100644 --- a/src/riotTags/shared/asset-viewer.tag +++ b/src/riotTags/shared/asset-viewer.tag @@ -60,7 +60,7 @@ asset-viewer.flexfix(class="{opts.namespace} {opts.class}") .clear .flexfix-body - ul.cards(class="{list: localStorage[opts.namespace? (opts.namespace+'Layout') : 'defaultAssetLayout'] === 'list'}") + ul.Cards(class="{list: localStorage[opts.namespace? (opts.namespace+'Layout') : 'defaultAssetLayout'] === 'list'}") li( each="{asset in (searchResults? searchResults : collection)}" oncontextmenu="{parent.opts.contextmenu && parent.opts.contextmenu(asset)}" @@ -68,8 +68,11 @@ asset-viewer.flexfix(class="{opts.namespace} {opts.class}") onclick="{parent.opts.click && parent.opts.click(asset)}" no-reorder ) - span {parent.opts.names? parent.opts.names(asset) : asset.name} - span.date(if="{asset.lastmod}") {niceTime(asset.lastmod)} + .Cards-aThumbnail + img(if="{parent.opts.thumbnails}" src="{parent.opts.thumbnails(asset)}") + .Cards-Properties + span {parent.opts.names? parent.opts.names(asset) : asset.name} + span.date(if="{asset.lastmod}") {niceTime(asset.lastmod)} img(if="{parent.opts.thumbnails}" src="{parent.opts.thumbnails(asset)}") script. this.namespace = this.opts.vocspace || this.opts.namespace; diff --git a/src/riotTags/shared/collapsible-section.tag b/src/riotTags/shared/collapsible-section.tag index 5f4c281c2..c66631211 100644 --- a/src/riotTags/shared/collapsible-section.tag +++ b/src/riotTags/shared/collapsible-section.tag @@ -1,6 +1,6 @@ // A small block that displays a section with an h3 header that can be collapsed. - Supports .panel modifier (CSS class), but also works by itself + Supports .aPanel modifier (CSS class), but also works by itself @slot The insides of the collapsible section. diff --git a/src/riotTags/shared/color-picker.tag b/src/riotTags/shared/color-picker.tag index a8c3883a0..033238b31 100644 --- a/src/riotTags/shared/color-picker.tag +++ b/src/riotTags/shared/color-picker.tag @@ -16,7 +16,7 @@ Disables alpha input. color-picker - .panel(ref="widget") + .aPanel(ref="widget") .color-picker-aBackgroundToggler .color-picker-aBackgoundWell.flexrow .c6.swatch(style="background-color: {oldColor.toString()};") @@ -160,4 +160,4 @@ color-picker if (this.opts.oncancel) { this.opts.oncancel(this.color.toString(), 'oncancel'); } - }; \ No newline at end of file + }; diff --git a/src/riotTags/shared/extensions-editor.tag b/src/riotTags/shared/extensions-editor.tag index d005137ea..627ce439d 100644 --- a/src/riotTags/shared/extensions-editor.tag +++ b/src/riotTags/shared/extensions-editor.tag @@ -53,7 +53,7 @@ extensions-editor virtual(each="{ext in extensions}" if="{!ext.if || opts.entity[ext.if]}") // ext="{ext}" is a workaround to lost loop variables in yields - collapsible-section.panel( + collapsible-section.aPanel( ext="{ext}" if="{ext.type === 'group'}" heading="{ext.name}" @@ -91,7 +91,7 @@ extensions-editor hover-hint(if="{ext.help && parent.opts.compact}" text="{ext.help}") dd(if="{ext.type === 'table'}") .aTableWrap - table.nicetable(class="{wide: parent.opts.wide}") + table.aNiceTable(class="{wide: parent.opts.wide}") tr th.center(if="{!parent.opts.compact}") № th(each="{field in ext.fields}") @@ -146,7 +146,7 @@ extensions-editor value="{parent.opts.entity[ext.key]? parent.opts.entity[ext.key][0] : ext.default[0]}" onchange="{ensurePoint2DAndWire(parent.opts.entity, ext.key, ext.default, 'this.opts.entity.'+ ext.key + '.0')}" ) - .spacer + .aSpacer label span.nogrow Y: input( @@ -226,7 +226,7 @@ extensions-editor max="{ext.max}" step="{ext.step}" ) - .spacer + .aSpacer input( class="{compact: parent.opts.compact, invalid: ext.required && !Number.isFinite(parent.opts.entity[ext.key])}" type="number" diff --git a/src/riotTags/shared/font-selector.tag b/src/riotTags/shared/font-selector.tag index 2ee2b4ec3..91749ef98 100644 --- a/src/riotTags/shared/font-selector.tag +++ b/src/riotTags/shared/font-selector.tag @@ -9,7 +9,7 @@ @attribute oncancelled (riot function) Calls the funtion when a user presses the "Cancel" button. Passes no arguments. -font-selector.panel.view.flexfix +font-selector.aPanel.aView.flexfix .flexfix-body asset-viewer( collection="{global.currentProject.fonts}" diff --git a/src/riotTags/shared/icon-selector.tag b/src/riotTags/shared/icon-selector.tag index 76cb3212d..3828b7a36 100644 --- a/src/riotTags/shared/icon-selector.tag +++ b/src/riotTags/shared/icon-selector.tag @@ -10,12 +10,12 @@ @attribute oncancelled (riot function) Calls the funtion when a user presses the "Cancel" button. Passes no arguments. -icon-selector.view.pad +icon-selector.aView.pad .toright button(onclick="{opts.oncancelled}") {vocGlob.cancel} h1(if="{opts.header}") {opts.header} .clear - ul.cards + ul.Cards li( each="{icon in iconList}" onclick="{parent.opts.onselected(icon)}" diff --git a/src/riotTags/shared/texture-selector.tag b/src/riotTags/shared/texture-selector.tag index 62eb20c56..3e41dba62 100644 --- a/src/riotTags/shared/texture-selector.tag +++ b/src/riotTags/shared/texture-selector.tag @@ -12,7 +12,7 @@ @attribute oncancelled (riot function) Calls the funtion when a user presses the "Cancel" button. Passes no arguments. -texture-selector.panel.view +texture-selector.aPanel.aView .flexfix.tall .flexfix-header .toleft @@ -29,7 +29,7 @@ texture-selector.panel.view input.inline(type="text" onkeyup="{fuseSearch}") .clear .flexfix-body - ul.cards + ul.Cards li(if="{opts.showempty}" onclick="{onselected(-1)}") span {window.languageJSON.common.none} img(src="data/img/notexture.png") diff --git a/src/riotTags/shared/type-input.tag b/src/riotTags/shared/type-input.tag index ed794fd16..87714b5f8 100644 --- a/src/riotTags/shared/type-input.tag +++ b/src/riotTags/shared/type-input.tag @@ -18,7 +18,7 @@ type-input value="{val && val !== -1 ? getTypeFromId(val).name : voc.select}" onclick="{openSelector}" ) - .spacer(if="{val && val !== -1}") + .aSpacer(if="{val && val !== -1}") button.nmr.square.inline(if="{val && val !== -1}" title="{voc.clear}" onclick="{clearInput}") svg.feather use(xlink:href="#x") diff --git a/src/riotTags/shared/type-selector.tag b/src/riotTags/shared/type-selector.tag index 7ff6a4156..d480ee0d3 100644 --- a/src/riotTags/shared/type-selector.tag +++ b/src/riotTags/shared/type-selector.tag @@ -9,7 +9,7 @@ @attribute oncancelled (riot function) Calls the funtion when a user presses the "Cancel" button. Passes no arguments. -type-selector.panel.view.flexfix +type-selector.aPanel.aView.flexfix .flexfix-body asset-viewer( collection="{global.currentProject.types}" diff --git a/src/riotTags/sounds/sound-editor.tag b/src/riotTags/sounds/sound-editor.tag index 9c23402bd..b5b7c9318 100644 --- a/src/riotTags/sounds/sound-editor.tag +++ b/src/riotTags/sounds/sound-editor.tag @@ -1,5 +1,5 @@ -sound-editor.panel.view - .modal +sound-editor.aPanel.aView + .aModal b {voc.name} br input.wide(type="text" value="{sound.name}" onchange="{wire('this.sound.name')}") diff --git a/src/riotTags/sounds/sound-recorder.tag b/src/riotTags/sounds/sound-recorder.tag index d60efa11e..b00beba75 100644 --- a/src/riotTags/sounds/sound-recorder.tag +++ b/src/riotTags/sounds/sound-recorder.tag @@ -1,5 +1,5 @@ -sound-recorder.panel.view - .modal.pad +sound-recorder.aPanel.aView + .aModal.pad .toright button.square.inline(onclick="{opts.onclose}" title="{vocGlob.close}") svg.feather diff --git a/src/riotTags/sounds/sounds-panel.tag b/src/riotTags/sounds/sounds-panel.tag index cfe8e4630..4fee4d50d 100644 --- a/src/riotTags/sounds/sounds-panel.tag +++ b/src/riotTags/sounds/sounds-panel.tag @@ -1,4 +1,4 @@ -sounds-panel.panel.view +sounds-panel.aPanel.aView asset-viewer( collection="{global.currentProject.sounds}" contextmenu="{popupMenu}" @@ -11,11 +11,11 @@ sounds-panel.panel.view button#soundcreate(onclick="{parent.soundNew}" title="Control+N" data-hotkey="Control+n") svg.feather use(xlink:href="#plus") - span {voc.create} + span {parent.voc.create} button#soundcreate(onclick="{parent.openRecorder}" title="Control+R" data-hotkey="Control+r") svg.feather use(xlink:href="#mic") - span {voc.record} + span {parent.voc.record} sound-editor(if="{editing}" sound="{editedSound}") sound-recorder(if="{recorderVisible}" onclose="{onCloseRecorder}") context-menu(menu="{soundMenu}" ref="soundMenu") diff --git a/src/riotTags/style-editor.tag b/src/riotTags/style-editor.tag index 13c272ad2..742f28b16 100644 --- a/src/riotTags/style-editor.tag +++ b/src/riotTags/style-editor.tag @@ -1,13 +1,13 @@ -style-editor.panel.view +style-editor.aPanel.aView #styleleft.tall.flexfix .flexfix-header - .panel.pad + .aPanel.pad b {vocGlob.name} br input.wide(type="text" value="{styleobj.name}" onchange="{wire('this.styleobj.name')}") .anErrorNotice(if="{nameTaken}" ref="errorNotice") {vocGlob.nametaken} .tabwrap.flexfix-body - ul.nav.tabs.nogrow.noshrink + ul.aNav.tabs.nogrow.noshrink li(onclick="{changeTab('stylefont')}" class="{active: tab === 'stylefont'}") {voc.font} li(onclick="{changeTab('stylefill')}" class="{active: tab === 'stylefill'}") {voc.fill} li(onclick="{changeTab('stylestroke')}" class="{active: tab === 'stylestroke'}") {voc.stroke} @@ -159,7 +159,7 @@ style-editor.panel.view height, transparent: true }); - this.refs.canvasSlot.appendChild(this.pixiApp.view); + this.refs.canvasSlot.appendChild(this.pixiApp.aView); var labelShort = window.languageJSON.styleview.testtext, labelMultiline = window.languageJSON.styleview.testtext.repeat(2) + '\n' + window.languageJSON.styleview.testtext.repeat(3) + '\n' + window.languageJSON.styleview.testtext, diff --git a/src/riotTags/styles-panel.tag b/src/riotTags/styles-panel.tag index 243c5cd1b..c0e118fa7 100644 --- a/src/riotTags/styles-panel.tag +++ b/src/riotTags/styles-panel.tag @@ -8,11 +8,11 @@ styles-panel.tall.fifty ref="styles" class="tall" ) - h1.nmt {voc.styles} + h1.nmt {parent.voc.styles} button#stylecreate(onclick="{parent.styleCreate}" title="Control+N" data-hotkey="Control+n") svg.feather use(xlink:href="#plus") - span {voc.create} + span {parent.voc.create} style-editor(if="{editingStyle}" styleobj="{editedStyle}") context-menu(menu="{styleMenu}" ref="styleMenu") script. diff --git a/src/riotTags/textures/texture-editor.tag b/src/riotTags/textures/texture-editor.tag index 60919eeb3..d14440b8e 100644 --- a/src/riotTags/textures/texture-editor.tag +++ b/src/riotTags/textures/texture-editor.tag @@ -1,4 +1,4 @@ -texture-editor.panel.view +texture-editor.aPanel.aView .flexrow.tall .column.borderright.tall.column1.flexfix.nogrow.noshrink .flexfix-body @@ -19,7 +19,7 @@ texture-editor.panel.view .flexrow button.wide.nml(onclick="{textureCenter}") span {voc.setcenter} - .spacer + .aSpacer button.square.nmr(onclick="{textureIsometrify}" title="{voc.isometrify}") svg.feather use(xlink:href="#map-pin") @@ -150,7 +150,7 @@ texture-editor.panel.view use(xlink:href="#clipboard") .textureview-zoom.flexrow b.aContrastingPlaque {Math.round(zoomFactor * 100)}% - .spacer + .aSpacer zoom-slider(onchanged="{setZoom}" ref="zoomslider" value="{zoomFactor}") .textureview-bg button.inline.forcebackground(onclick="{changePreviewBg}") diff --git a/src/riotTags/textures/texture-generator.tag b/src/riotTags/textures/texture-generator.tag index 774c88a84..c3d8a5947 100644 --- a/src/riotTags/textures/texture-generator.tag +++ b/src/riotTags/textures/texture-generator.tag @@ -1,10 +1,10 @@ // @attribute onclose (riot function) Called when a user presses the "Close" button. Passes no arguments. -texture-generator.view +texture-generator.aView .flexcol.tall .flexrow.tall - .panel.texture-generator-Settings.nogrow + .aPanel.texture-generator-Settings.nogrow fieldset label.block b {voc.name} diff --git a/src/riotTags/textures/textures-panel.tag b/src/riotTags/textures/textures-panel.tag index ded1eb161..4b3e5031f 100644 --- a/src/riotTags/textures/textures-panel.tag +++ b/src/riotTags/textures/textures-panel.tag @@ -1,10 +1,10 @@ -textures-panel.panel.view +textures-panel.aPanel.aView .flexfix.tall div asset-viewer( collection="{global.currentProject.textures}" contextmenu="{showTexturePopup}" - vocspace="texture" + assettype="textures" namespace="textures" click="{openTexture}" thumbnails="{textureThumbnails}" @@ -17,10 +17,10 @@ textures-panel.panel.view .button svg.feather use(xlink:href="#download") - span {voc.import} + span {parent.voc.import} button( onclick="{parent.pasteTexture}" - title="{voc.importFromClipboard}" + title="{parent.voc.importFromClipboard}" data-hotkey="Control+v" data-hotkey-require-scope="texture" ) @@ -28,20 +28,20 @@ textures-panel.panel.view use(xlink:href="#clipboard") button( onclick="{parent.openGenerator}" - title="{voc.generatePlaceholder}" + title="{parent.voc.generatePlaceholder}" ) svg.feather use(xlink:href="#loader") asset-viewer( collection="{global.currentProject.skeletons}" contextmenu="{showSkeletonPopup}" - vocspace="texture" + assettype="skeletons" namespace="skeletons" thumbnails="{skelThumbnails}" ref="skeletons" ) h2 - span {voc.skeletons} + span {parent.voc.skeletons} docs-shortcut(path="/skeletal-animation.html") label.file.flexfix-header input(type="file" multiple @@ -50,7 +50,7 @@ textures-panel.panel.view .button svg.feather use(xlink:href="#download") - span {voc.import} + span {parent.voc.import} texture-editor(if="{editing}" texture="{currentTexture}") texture-generator(if="{generating}" onclose="{closeGenerator}") context-menu(menu="{textureMenu}" ref="textureMenu") diff --git a/src/riotTags/type-editor.tag b/src/riotTags/type-editor.tag index b6ef68986..6627051fb 100644 --- a/src/riotTags/type-editor.tag +++ b/src/riotTags/type-editor.tag @@ -1,6 +1,6 @@ -type-editor.panel.view.flexrow +type-editor.aPanel.aView.flexrow .type-editor-Properties - .tall.flexfix.panel.pad + .tall.flexfix.aPanel.pad .flexfix-header texture-input.wide( large="yup" showempty="da" @@ -29,7 +29,7 @@ type-editor.panel.view.flexrow span {voc.done} .type-editor-aCodeEditor .tabwrap.tall(style="position: relative") - ul.tabs.nav.nogrow.noshrink + ul.tabs.aNav.nogrow.noshrink li(onclick="{changeTab('typeoncreate')}" class="{active: tab === 'typeoncreate'}" title="{voc.create} (Control+Q)" data-hotkey="Control+q") svg.feather use(xlink:href="#sun") diff --git a/src/riotTags/types-panel.tag b/src/riotTags/types-panel.tag index 0a6e1aee8..1d9f05bd7 100644 --- a/src/riotTags/types-panel.tag +++ b/src/riotTags/types-panel.tag @@ -1,4 +1,4 @@ -types-panel.panel.view +types-panel.aPanel.aView asset-viewer( collection="{global.currentProject.types}" contextmenu="{onTypeContextMenu}" @@ -11,7 +11,7 @@ types-panel.panel.view button#typecreate(onclick="{parent.typeCreate}" title="Control+N" data-hotkey="Control+n") svg.feather use(xlink:href="#plus") - span {voc.create} + span {parent.voc.create} type-editor(if="{editingType}" type="{editedType}") context-menu(menu="{typeMenu}" ref="typeMenu") script. diff --git a/src/riotTags/ui-panel.tag b/src/riotTags/ui-panel.tag index 2882dfe0e..e0f83bc9d 100644 --- a/src/riotTags/ui-panel.tag +++ b/src/riotTags/ui-panel.tag @@ -1,4 +1,4 @@ -ui-panel.panel.view +ui-panel.aPanel.aView styles-panel fonts-panel - .clear \ No newline at end of file + .clear diff --git a/src/riotTags/writable-folder-prompt.tag b/src/riotTags/writable-folder-prompt.tag index b3558f96d..67f03736e 100644 --- a/src/riotTags/writable-folder-prompt.tag +++ b/src/riotTags/writable-folder-prompt.tag @@ -1,6 +1,6 @@ writable-folder-prompt - .dimmer - .panel(ref="widget") + .aDimmer + .aPanel(ref="widget") h1 {voc.headerSelectFolderForData} .flexrow .sixty.npt.npl @@ -24,4 +24,4 @@ writable-folder-prompt this.opts.onsuccess(); } } - }; \ No newline at end of file + }; diff --git a/src/styl/buildingBlocks.styl b/src/styl/buildingBlocks.styl index 3fc997234..bf1fc1c81 100644 --- a/src/styl/buildingBlocks.styl +++ b/src/styl/buildingBlocks.styl @@ -1,8 +1,8 @@ -.spacer, .aSpacer +.aSpacer width 1rem height @width -.dimmer +.aDimmer position fixed background-color rgba(0, 0, 0, 0.3) left 0 @@ -13,14 +13,14 @@ height 100% z-index 20 -.modal, .panel +.aModal, .aPanel box-sizing border-box background background border 1px solid borderBright border-radius br position relative -.modal +.aModal position fixed left 50% top 50% @@ -31,7 +31,7 @@ overflow auto box-shadow 0 2px 5px rgba(0, 0, 0, 0.35) -.view +.aView overflow auto background backgroundDeeper position absolute @@ -40,7 +40,7 @@ top 0 bottom 0 border-top 0 - .view + .aView border 0 .inset @@ -85,11 +85,11 @@ top 0.65rem &:hover, &.hover padding 0.2em 0.5em 0.2em 1.5em - & > svg:first-child, & > .spacer:first-child + & > svg:first-child, & > .aSpacer:first-child color act margin-right 0.5rem {trans} - & > .spacer:first-child + & > .aSpacer:first-child width 1.5rem height 1.5rem display inline-block @@ -97,11 +97,11 @@ background act border-bottom-color transparent color background - & > svg:first-child, & > .spacer:first-child + & > svg:first-child, & > .aSpacer:first-child color background // панели управления -.nav +.aNav background background border-radius br border-top 1px solid borderBright @@ -164,14 +164,14 @@ // resource cards -.cards, .Cards +.Cards list-style none padding 0 display grid grid-template-columns repeat(auto-fill, minmax(17em, 1fr)) grid-gap 0.3em flex-grow 0 - li, .aCard + & > li, .aCard background background padding 0.8em margin 0 @@ -182,33 +182,46 @@ vertical-align top cursor pointer transition 0.35s ease all - &:hover + display flex + flex-flow row nowrap + align-items center + .Cards-aThumbnail + width 3rem + flex 0 0 3rem + margin-right 1rem + line-height 0 + svg + width 3rem + height 3rem + stroke-width 1 + // Images cheat a bit with negative margins + // to occupy a 4rem x 4rem box + img + width 4rem + height 4rem + max-width 4rem + margin -0.5rem 0 -0.5rem -0.5rem + border-radius br + &:hover + background rgba(act, 0.35) + .Cards-Properties + flex 1 1 auto + > .date + display none + span + font-family consolas, monospace + width 100% + display inline-block + vertical-align middle + text-overflow ellipsis + white-space nowrap + overflow hidden + &:hover, &.active border-color acttext &:active border-color accent1 background act color background - span - font-family consolas, monospace - width calc(14.5em - 64px) - display inline-block - text-overflow ellipsis - white-space nowrap - overflow hidden - > .date - display none - & > img, & > svg:not(.aStartingRoomIcon) - float left - height 64px - width 64px - margin -0.5em 1em -0.5em -0.5em - border-radius br - &:hover - background rgba(act, 0.35) - & > svg:not(.aStartingRoomIcon) - stroke-width 1 - width 48px - height 3.5rem &.list display block &.list li @@ -254,6 +267,7 @@ li text-align center position relative + flex-flow column nowrap img float none max-width 13.5em @@ -276,7 +290,7 @@ .aCard:hover &, .aCard:focus & opacity 1 sounds-panel, rooms-panel - .cards li img:hover + .Cards li img:hover background none .anErrorNotice @@ -302,7 +316,7 @@ sounds-panel, rooms-panel border-top 1px solid error transform translate(-0.25rem, 0) rotate(45deg) -.nicetable, .aNiceTable, .aPaddedTable +.aNiceTable, .aPaddedTable border-spacing 0 td, th padding 0.5rem 0.75rem @@ -314,7 +328,7 @@ sounds-panel, rooms-panel th border-bottom 1px solid borderBright text-align left -.nicetable, .aNiceTable +.aNiceTable margin 1rem 0 border 1px solid borderBright border-radius br @@ -326,7 +340,7 @@ sounds-panel, rooms-panel padding-right 1.5rem .aTableWrap overflow-y auto - .nicetable, .aNiceTable + .aNiceTable width max-content .anIllustration diff --git a/src/styl/common.styl b/src/styl/common.styl index f1aa971c4..99b7c2cc0 100644 --- a/src/styl/common.styl +++ b/src/styl/common.styl @@ -30,6 +30,10 @@ body bottom 0 position absolute +.act + color act +.accent1 + color accent1 .error color error .success diff --git a/src/styl/inputs.styl b/src/styl/inputs.styl index d5bb3a5ef..98843e632 100644 --- a/src/styl/inputs.styl +++ b/src/styl/inputs.styl @@ -220,7 +220,7 @@ input[type="button"], input[type="submit"], input[type="reset"], .button, -.nav +.aNav svg {trans} color act @@ -542,7 +542,7 @@ fieldset width 100% span margin-right 0.5rem - .spacer + .aSpacer flex 0 0 auto .anActionableIcon diff --git a/src/styl/tags/docs-panel.styl b/src/styl/tags/docs-panel.styl index 32f20e1f0..68d71a40e 100644 --- a/src/styl/tags/docs-panel.styl +++ b/src/styl/tags/docs-panel.styl @@ -51,4 +51,4 @@ docs-panel margin 0 auto table - @extends .nicetable + @extends .aNiceTable diff --git a/src/styl/tags/export-panel.styl b/src/styl/tags/export-panel.styl index a9a72f71d..3925e673e 100644 --- a/src/styl/tags/export-panel.styl +++ b/src/styl/tags/export-panel.styl @@ -1,5 +1,5 @@ export-panel - .modal + .aModal width 30rem label svg vertical-align -3px diff --git a/src/styl/tags/main-menu/main-menu.styl b/src/styl/tags/main-menu/main-menu.styl index 6d898f9d2..c3b13c798 100644 --- a/src/styl/tags/main-menu/main-menu.styl +++ b/src/styl/tags/main-menu/main-menu.styl @@ -1,5 +1,5 @@ main-menu - @extends .view + @extends .aView overflow-x hidden overflow-y scroll .&-aGrid diff --git a/src/styl/tags/new-project-onboarding.styl b/src/styl/tags/new-project-onboarding.styl index 003b1976a..0edd8f1c0 100644 --- a/src/styl/tags/new-project-onboarding.styl +++ b/src/styl/tags/new-project-onboarding.styl @@ -10,7 +10,7 @@ new-project-onboarding position fixed - .panel + .aPanel position fixed left 50% top 50% diff --git a/src/styl/tags/notepad-panel.styl b/src/styl/tags/notepad-panel.styl index 3304fd801..d515cb404 100644 --- a/src/styl/tags/notepad-panel.styl +++ b/src/styl/tags/notepad-panel.styl @@ -16,7 +16,7 @@ notepad-panel top 0 right 0 bottom 0 - .nav + .aNav flex 0 1 auto border-bottom-left-radius 0 border-bottom-right-radius 0 diff --git a/src/styl/tags/particles/emitter-tandem-editor.styl b/src/styl/tags/particles/emitter-tandem-editor.styl index 7c9cd7345..a9e904fd1 100644 --- a/src/styl/tags/particles/emitter-tandem-editor.styl +++ b/src/styl/tags/particles/emitter-tandem-editor.styl @@ -19,5 +19,5 @@ emitter-tandem-editor .zoom right 0 top 0 - .panel + .aPanel border-radius 0 \ No newline at end of file diff --git a/src/styl/tags/particles/particle-importer.styl b/src/styl/tags/particles/particle-importer.styl index 51515e74f..f0bcba2fe 100644 --- a/src/styl/tags/particles/particle-importer.styl +++ b/src/styl/tags/particles/particle-importer.styl @@ -2,7 +2,7 @@ particle-importer position fixed !important z-index 10 padding 1rem - .cards li > img + .Cards li > img background rgba(act, 0.2) &:hover background rgba(act, 0.5) \ No newline at end of file diff --git a/src/styl/tags/project-selector.styl b/src/styl/tags/project-selector.styl index 8eb3c2cb5..ab2dfeeec 100644 --- a/src/styl/tags/project-selector.styl +++ b/src/styl/tags/project-selector.styl @@ -9,7 +9,7 @@ project-selector z-index 30 label.file margin 1em 0 - .panel + .aPanel width 50rem max-width 95% max-height calc(100% - 10rem) @@ -61,7 +61,7 @@ project-selector background-position center center z-index 25 text-align center - .panel + .aPanel text-align initial #id diff --git a/src/styl/tags/rooms/copy-custom-properties-modal.styl b/src/styl/tags/rooms/copy-custom-properties-modal.styl index 1ac82ca31..0b29d741d 100644 --- a/src/styl/tags/rooms/copy-custom-properties-modal.styl +++ b/src/styl/tags/rooms/copy-custom-properties-modal.styl @@ -5,6 +5,6 @@ copy-custom-properties-modal left 50% margin-left -20rem top 10rem - .panel + .aPanel padding 1rem box-shadow 0 1rem 2rem rgba(foreground, 0.35) diff --git a/src/styl/tags/rooms/room-copy-properties.styl b/src/styl/tags/rooms/room-copy-properties.styl index 48a758e1c..1d7f834ca 100644 --- a/src/styl/tags/rooms/room-copy-properties.styl +++ b/src/styl/tags/rooms/room-copy-properties.styl @@ -1,7 +1,7 @@ room-copy-properties display block padding 1rem - room-editor &.panel + room-editor &.aPanel {shadamb} position absolute right 1rem diff --git a/src/styl/tags/rooms/room-editor.styl b/src/styl/tags/rooms/room-editor.styl index cad94ac6e..e28f47163 100644 --- a/src/styl/tags/rooms/room-editor.styl +++ b/src/styl/tags/rooms/room-editor.styl @@ -24,7 +24,7 @@ room-editor flex 1 1 auto .settings button margin 0.5em 0 - .nav + .aNav border-bottom-right-radius 0 border-bottom-left-radius 0 .palette diff --git a/src/styl/tags/rooms/room-events-editor.styl b/src/styl/tags/rooms/room-events-editor.styl index 1bd3c908f..51c454332 100644 --- a/src/styl/tags/rooms/room-events-editor.styl +++ b/src/styl/tags/rooms/room-events-editor.styl @@ -1,5 +1,5 @@ room-events-editor - @extends .view + @extends .aView border-top 0 none display flex flex-direction column diff --git a/src/styl/tags/rooms/rooms-panel.styl b/src/styl/tags/rooms/rooms-panel.styl index 31e57644e..49f689331 100644 --- a/src/styl/tags/rooms/rooms-panel.styl +++ b/src/styl/tags/rooms/rooms-panel.styl @@ -3,7 +3,7 @@ rooms-panel padding 1em overflow-x hidden - .cards + .Cards .starting svg position absolute right 0.5em diff --git a/src/styl/tags/settings/actions-input-selector.styl b/src/styl/tags/settings/actions-input-selector.styl index 02633cd43..52380bf70 100644 --- a/src/styl/tags/settings/actions-input-selector.styl +++ b/src/styl/tags/settings/actions-input-selector.styl @@ -6,7 +6,7 @@ actions-input-selector margin-left -20rem top 5rem bottom 5rem - .panel + .aPanel padding 1rem {shadamb} height 100% \ No newline at end of file diff --git a/src/styl/tags/settings/modules/modules-settings.styl b/src/styl/tags/settings/modules/modules-settings.styl index 683c1905f..dfbeeb0d9 100644 --- a/src/styl/tags/settings/modules/modules-settings.styl +++ b/src/styl/tags/settings/modules/modules-settings.styl @@ -1,4 +1,4 @@ -.view modules-settings +.aView modules-settings padding 1em display block background background @@ -11,7 +11,7 @@ module-meta height 100% .aModuleCard - @extends .panel + @extends .aPanel padding 1rem 1rem 1rem 1.5rem cursor pointer {trans} diff --git a/src/styl/tags/settings/project-settings.styl b/src/styl/tags/settings/project-settings.styl index 59c4fd70a..8a180b521 100644 --- a/src/styl/tags/settings/project-settings.styl +++ b/src/styl/tags/settings/project-settings.styl @@ -6,7 +6,7 @@ project-settings overflow auto aside width 18rem - .nav.tabs + .aNav.tabs border 1px solid borderBright border-right 0 border-radius br 0 0 br @@ -19,4 +19,4 @@ project-settings flex 1 1 auto padding 0.5rem 1.5rem border-radius 0 br br br - @extends .panel + @extends .aPanel diff --git a/src/styl/tags/shared/asset-viewer.styl b/src/styl/tags/shared/asset-viewer.styl index f1d93daf0..108cad620 100644 --- a/src/styl/tags/shared/asset-viewer.styl +++ b/src/styl/tags/shared/asset-viewer.styl @@ -4,7 +4,16 @@ asset-viewer margin-bottom 1rem &.fonts if (themeDark) - .cards li img + .Cards li img filter invert(1) &:hover - background transparent \ No newline at end of file + background transparent + .Cards .&-Icons, .Cards .&-Icons + color act + opacity 0.65 + line-height 1rem + svg + width 1rem + height @width + & + svg + margin-left 0.5rem diff --git a/src/styl/tags/shared/collapsible-section.styl b/src/styl/tags/shared/collapsible-section.styl index 2218b8693..ca1de5bd3 100644 --- a/src/styl/tags/shared/collapsible-section.styl +++ b/src/styl/tags/shared/collapsible-section.styl @@ -24,7 +24,7 @@ collapsible-section transform rotate(180deg) .&-aWrapper padding 1rem 0 0.5rem - &.panel + &.aPanel & > .flexrow h1, h2, h3, h4, h5, h6 margin 0 1rem diff --git a/src/styl/tags/shared/color-picker.styl b/src/styl/tags/shared/color-picker.styl index d536446df..d204d8bad 100644 --- a/src/styl/tags/shared/color-picker.styl +++ b/src/styl/tags/shared/color-picker.styl @@ -5,7 +5,7 @@ color-picker left 50% margin-left -20rem top 10rem - .panel + .aPanel padding 1rem box-shadow 0 1rem 2rem rgba(foreground, 0.35) .aRangePipeStack diff --git a/src/styl/tags/shared/extensions-editor.styl b/src/styl/tags/shared/extensions-editor.styl index 66934d42e..bf18be5ea 100644 --- a/src/styl/tags/shared/extensions-editor.styl +++ b/src/styl/tags/shared/extensions-editor.styl @@ -1,5 +1,5 @@ extensions-editor - type-selector.view, texture-selector.view + type-selector.aView, texture-selector.aView position fixed z-index 9 cursor default @@ -8,9 +8,9 @@ extensions-editor height 10rem box-sizing border-box max-width 100% - .nicetable dl + .aNiceTable dl margin 0 - collapsible-section.panel > .collapsible-section-aWrapper > & + collapsible-section.aPanel > .collapsible-section-aWrapper > & & > dl:first-child margin-top 0 & > dl:last-child diff --git a/src/styl/tags/shared/texture-input.styl b/src/styl/tags/shared/texture-input.styl index ddaff66fa..010828a0f 100644 --- a/src/styl/tags/shared/texture-input.styl +++ b/src/styl/tags/shared/texture-input.styl @@ -4,7 +4,7 @@ texture-input margin-right 1rem vertical-align bottom .texture-input-aBigInput - @extends .panel + @extends .aPanel margin 0 auto padding 0.5rem 0.5rem 1rem text-align center diff --git a/src/styl/tags/sounds/sound-editor.styl b/src/styl/tags/sounds/sound-editor.styl index 4ddd31372..e128dbf36 100644 --- a/src/styl/tags/sounds/sound-editor.styl +++ b/src/styl/tags/sounds/sound-editor.styl @@ -1,5 +1,5 @@ sound-editor - .modal + .aModal padding 1em calc(1em + 0.5px) width 21em vertical-align middle @@ -9,5 +9,5 @@ sound-editor audio filter invert(1) -sounds-panel .cards img +sounds-panel .Cards img border 0 none !important diff --git a/src/styl/tags/sounds/sound-recorder.styl b/src/styl/tags/sounds/sound-recorder.styl index b37e2d65c..87ace0188 100644 --- a/src/styl/tags/sounds/sound-recorder.styl +++ b/src/styl/tags/sounds/sound-recorder.styl @@ -1,5 +1,5 @@ sound-recorder - & > .modal + & > .aModal min-width 500px // The size of the waveform's canvas if (themeDark) audio diff --git a/src/styl/tags/styles/style-editor.styl b/src/styl/tags/styles/style-editor.styl index 6480ea998..7441a8fb2 100644 --- a/src/styl/tags/styles/style-editor.styl +++ b/src/styl/tags/styles/style-editor.styl @@ -2,7 +2,7 @@ style-editor display flex flex-direction row z-index 2 - .nav + .aNav border-bottom-left-radius 0 border-bottom-right-radius 0 .align diff --git a/src/styl/tags/styles/styles-panel.styl b/src/styl/tags/styles/styles-panel.styl index afcfe913a..3c9398d94 100644 --- a/src/styl/tags/styles/styles-panel.styl +++ b/src/styl/tags/styles/styles-panel.styl @@ -2,7 +2,7 @@ styles-panel padding 1em h1 margin-bottom 1rem - .cards li + .Cards li position relative img height auto \ No newline at end of file diff --git a/src/styl/tags/types/type-editor.styl b/src/styl/tags/types/type-editor.styl index 434a63fc4..775ad4ad9 100644 --- a/src/styl/tags/types/type-editor.styl +++ b/src/styl/tags/types/type-editor.styl @@ -1,5 +1,5 @@ type-editor - .nav + .aNav border-bottom-left-radius 0 border-bottom-right-radius 0 flex-grow 0 diff --git a/src/styl/tags/writable-folder-prompt.styl b/src/styl/tags/writable-folder-prompt.styl index 0a413bd6d..3ae67068f 100644 --- a/src/styl/tags/writable-folder-prompt.styl +++ b/src/styl/tags/writable-folder-prompt.styl @@ -5,7 +5,7 @@ writable-folder-prompt flex-flow column nowrap align-items center justify-content space-around - .panel + .aPanel padding 1rem 2rem {shadamb} max-width 50rem diff --git a/src/styl/themeGhost.styl b/src/styl/themeGhost.styl index ecb078a36..8c6bd0d2c 100644 --- a/src/styl/themeGhost.styl +++ b/src/styl/themeGhost.styl @@ -67,12 +67,12 @@ textarea, select, .button, .selectbox, -.panel, -.modal +.aPanel, +.aModal border-width 2px .tabbed border-width 2px -.nav +.aNav border-top-width 2px border-left-width 2px li diff --git a/src/styl/themeHCBlack.styl b/src/styl/themeHCBlack.styl index ec00ac765..b93f61aac 100644 --- a/src/styl/themeHCBlack.styl +++ b/src/styl/themeHCBlack.styl @@ -55,7 +55,7 @@ themeDark = true @require 'tags/**/*.styl' -button, .button, select, input[type="text"], input[type="number"], input[type="url"], input[type="password"], textarea, .panel +button, .button, select, input[type="text"], input[type="number"], input[type="url"], input[type="password"], textarea, .aPanel border-width 2px button, .button &:hover, &:focus, &:active, &.selected diff --git a/src/styl/themeHorizon.styl b/src/styl/themeHorizon.styl index 44ab4fd7c..35e387b5a 100644 --- a/src/styl/themeHorizon.styl +++ b/src/styl/themeHorizon.styl @@ -62,10 +62,10 @@ input[type="reset"], .selectbox border-width 2px -.view +.aView background background -.nav li +.aNav li border-right 0 border-left 0 &:hover, &.active diff --git a/src/styl/themeNord.styl b/src/styl/themeNord.styl index 6a0da2cd6..c19450b83 100644 --- a/src/styl/themeNord.styl +++ b/src/styl/themeNord.styl @@ -62,10 +62,10 @@ input[type="reset"], .selectbox border-width 2px -.view +.aView background background -.nav li +.aNav li border-right 0 border-left 0 &:hover, &.active diff --git a/src/styl/themePooxelGreen.styl b/src/styl/themePooxelGreen.styl index 382118f75..92d70bfb8 100644 --- a/src/styl/themePooxelGreen.styl +++ b/src/styl/themePooxelGreen.styl @@ -76,10 +76,10 @@ shadamb = button, .button, input[type="text"], input[type="number"], input[type="url"], input[type="password"], select, textarea, .checkbox [type="checkbox"], .checkbox [type="radio"], -.modal, .panel, .view modules-settings .aModuleCard, project-settings main, texture-input .texture-input-aBigInput, -.nav li, .nav.vertical li, project-settings aside .nav.tabs, +.aModal, .aPanel, .aView modules-settings .aModuleCard, project-settings main, texture-input .texture-input-aBigInput, +.aNav li, .aNav.vertical li, project-settings aside .aNav.tabs, .alertify .dialog > *, .alertify .alert > *, -.nav +.aNav .bigpower, context-menu, [type=range]::-webkit-slider-runnable-track, @@ -87,7 +87,7 @@ code.inline, p > code, li > code, pre border-width 2px border-radius 0 -.view +.aView border-width 0 audio::-webkit-media-controls-enclosure @@ -124,15 +124,15 @@ button, .button color background box-shadow -2px 0 0 accent1, 2px 0 0 accent1, 0 -2px 0 accent1, 0 2px 0 accent1 -.modal, .panel, .view modules-settings .aModuleCard, project-settings main, +.aModal, .aPanel, .aView modules-settings .aModuleCard, project-settings main, .alertify .dialog > *, .alertify .alert > * border-style outset -project-settings aside .nav.tabs +project-settings aside .aNav.tabs border-style outset border-right 0 -.view +.aView border-style solid .bigpower @@ -143,7 +143,7 @@ texture-input .texture-input-aBigInput, pre border-style inset -.aCard, .cards li, .Cards li, .cards .aCard, .Cards .aCard +.aCard, .Cards li, .Cards li, .Cards .aCard, .Cards .aCard border-style outset border-width 2px border-radius 0 diff --git a/src/styl/themeSpringStream.styl b/src/styl/themeSpringStream.styl index 23e708019..0c4d6efe5 100644 --- a/src/styl/themeSpringStream.styl +++ b/src/styl/themeSpringStream.styl @@ -113,7 +113,7 @@ input[type="reset"], #bg background introBg -.cards +.Cards box-sizing border-box padding 0.25rem gap 0.75rem