Skip to content
Snippets Groups Projects
Commit 006dbe93 authored by frank.paczynski's avatar frank.paczynski :bulb:
Browse files

Revert "Fix: help.css does not contain content of inline_help.css and inline_help_capabilities.css"

This reverts commit acc73972.
parent acc73972
Branches stable-8.33
No related tags found
No related merge requests found
@import "node_modules/bootstrap/dist/css/bootstrap.css";
@import "./inline_help_capabilities.css";
html.in-modal .help-hide-inline { html.in-modal .help-hide-inline {
display: none; display: none;
} }
...@@ -70,7 +73,9 @@ html.embedded .container-fluid { ...@@ -70,7 +73,9 @@ html.embedded .container-fluid {
} }
} }
@media (min-width: 620px) { @screen-sm: 620px;
@media (min-width: @screen-sm) {
html.embedded .navbar-collapse, html.embedded .navbar-collapse,
html.embedded .navbar-header { html.embedded .navbar-header {
margin-left: -8px; margin-left: -8px;
......
html.embedded [class^="cap-"], html.embedded {
html.embedded [class*=" cap-"], /* hide all capabilities and features initially */
html.embedded [class^="feat-"], & [class^="cap-"],
html.embedded [class*=" feat-"] { & [class*=" cap-"],
display: none; & [class^="feat-"],
} & [class*=" feat-"] {
display: none;
/* display again for enabled capabilities */ }
html.embedded.cap-appointments .cap-appointments, /* display again for enabled capabilities */
html.embedded.cap-calendar .cap-calendar, &.cap-appointments .cap-appointments,
html.embedded.cap-calendar_google .cap-calendar_google, &.cap-calendar .cap-calendar,
html.embedded.cap-call .cap-call, &.cap-calendar_google .cap-calendar_google,
html.embedded.cap-chat .cap-chat, &.cap-call .cap-call,
html.embedded.cap-contacts .cap-contacts, &.cap-chat .cap-chat,
html.embedded.cap-dataexport .cap-dataexport, &.cap-contacts .cap-contacts,
html.embedded.cap-deputy .cap-deputy, &.cap-dataexport .cap-dataexport,
html.embedded.cap-dumpster .cap-dumpster, &.cap-deputy .cap-deputy,
html.embedded.cap-edit_group .cap-edit_group, &.cap-dumpster .cap-dumpster,
html.embedded.cap-edit_resource .cap-edit_resource, &.cap-edit_group .cap-edit_group,
html.embedded.cap-gab .cap-gab, &.cap-edit_resource .cap-edit_resource,
html.embedded.cap-guard .cap-guard, &.cap-gab .cap-gab,
html.embedded.cap-infostore .cap-infostore, &.cap-guard .cap-guard,
html.embedded.cap-multifactor .cap-multifactor, &.cap-infostore .cap-infostore,
html.embedded.cap-portal .cap-portal, &.cap-multifactor .cap-multifactor,
html.embedded.cap-presenter .cap-presenter, &.cap-portal .cap-portal,
html.embedded.cap-share_links .cap-share_links, &.cap-presenter .cap-presenter,
html.embedded.cap-share_mail_attachments .cap-share_mail_attachments, &.cap-share_links .cap-share_links,
html.embedded.cap-smime .cap-smime, &.cap-share_mail_attachments .cap-share_mail_attachments,
html.embedded.cap-spreadsheet .cap-spreadsheet, &.cap-smime .cap-smime,
html.embedded.cap-switchboard .cap-switchboard, &.cap-spreadsheet .cap-spreadsheet,
html.embedded.cap-tasks .cap-tasks, &.cap-switchboard .cap-switchboard,
html.embedded.cap-text .cap-text, &.cap-tasks .cap-tasks,
html.embedded.cap-webdav .cap-webdav, &.cap-text .cap-text,
html.embedded.cap-webmail .cap-webmail, &.cap-webdav .cap-webdav,
html.embedded.cap-xing .cap-xing, &.cap-webmail .cap-webmail,
/* display again for enabled features */ &.cap-xing .cap-xing,
html.embedded.feat-io-ox-core-ai .feat-io-ox-core-ai, /* display again for enabled features */
html.embedded.feat-io-ox-core-categories .feat-io-ox-core-categories, &.feat-io-ox-core-ai .feat-io-ox-core-ai,
html.embedded.feat-io-ox-core-countdown .feat-io-ox-core-countdown, &.feat-io-ox-core-categories .feat-io-ox-core-categories,
html.embedded.feat-io-ox-core-dragDropICAL .feat-io-ox-core-dragDropICAL, &.feat-io-ox-core-countdown .feat-io-ox-core-countdown,
html.embedded.feat-io-ox-core-enterprisePicker .feat-io-ox-core-enterprisePicker, &.feat-io-ox-core-dragDropICAL .feat-io-ox-core-dragDropICAL,
html.embedded.feat-io-ox-core-firstStartWizard .feat-io-ox-core-firstStartWizard, &.feat-io-ox-core-enterprisePicker .feat-io-ox-core-enterprisePicker,
html.embedded.feat-io-ox-core-implicitCancel .feat-io-ox-core-implicitCancel, &.feat-io-ox-core-firstStartWizard .feat-io-ox-core-firstStartWizard,
html.embedded.feat-io-ox-core-mailPDFExport .feat-io-ox-core-mailPDFExport, &.feat-io-ox-core-implicitCancel .feat-io-ox-core-implicitCancel,
html.embedded.feat-io-ox-core-managedResources .feat-io-ox-core-managedResources, &.feat-io-ox-core-mailPDFExport .feat-io-ox-core-mailPDFExport,
html.embedded.feat-io-ox-core-navigation .feat-io-ox-core-navigation, &.feat-io-ox-core-managedResources .feat-io-ox-core-managedResources,
html.embedded.feat-io-ox-core-resourceCalendars .feat-io-ox-core-resourceCalendars, &.feat-io-ox-core-navigation .feat-io-ox-core-navigation,
html.embedded.feat-io-ox-core-scheduleSend .feat-io-ox-core-scheduleSend, &.feat-io-ox-core-resourceCalendars .feat-io-ox-core-resourceCalendars,
html.embedded.feat-io-ox-core-templates .feat-io-ox-core-templates, &.feat-io-ox-core-scheduleSend .feat-io-ox-core-scheduleSend,
html.embedded.feat-io-ox-core-undoSend .feat-io-ox-core-undoSend, &.feat-io-ox-core-templates .feat-io-ox-core-templates,
html.embedded.feat-io-ox-mail-editRealNames .feat-io-ox-mail-editRealNames, &.feat-io-ox-core-undoSend .feat-io-ox-core-undoSend,
html.embedded.feat-jitsi .feat-jitsi, &.feat-io-ox-mail-editRealNames .feat-io-ox-mail-editRealNames,
html.embedded.feat-zoom .feat-zoom { &.feat-jitsi .feat-jitsi,
/* using `:not` to get the node type into the full selector here */ &.feat-zoom .feat-zoom {
&:not(li) { /* using `:not` to get the node type into the full selector here */
display: inherit; &:not(li) {
display: inherit;
}
/* list-item is browser specific and not covered by inherit */
display: list-item;
} }
/* list-item is browser specific and not covered by inherit */
display: list-item;
} }
...@@ -6,11 +6,10 @@ ...@@ -6,11 +6,10 @@
"scripts": { "scripts": {
"check-links": "npx --yes link-checker help/ --disable-external", "check-links": "npx --yes link-checker help/ --disable-external",
"test": "echo VGhpcyBpcyBmaW5lLi4u8J+UpQo= | base64 -d && true", "test": "echo VGhpcyBpcyBmaW5lLi4u8J+UpQo= | base64 -d && true",
"build": "npm run build:copy-help && npm run build:copy-bootstrap && npm run build:copy-jquery && npm run build:append-styles", "build": "npm run build:copy-help && npm run build:copy-bootstrap && npm run build:copy-jquery",
"build:copy-help": "npx --yes cpx 'help/**/*' build/help", "build:copy-help": "npx --yes cpx 'help/**/*' build/help",
"build:copy-bootstrap": "npx --yes cpx 'node_modules/bootstrap/dist/js/bootstrap.min.js' 'build/help' && npx --yes cpx 'node_modules/bootstrap/dist/css/bootstrap.min.css' 'build/help'", "build:copy-bootstrap": "npx --yes cpx 'node_modules/bootstrap/dist/js/bootstrap.min.js' 'build/help' && npx --yes cpx 'node_modules/bootstrap/dist/css/bootstrap.min.css' 'build/help'",
"build:copy-jquery": "npx --yes cpx 'node_modules/jquery/dist/jquery.min.js' 'build/help'", "build:copy-jquery": "npx --yes cpx 'node_modules/jquery/dist/jquery.min.js' 'build/help'"
"build:append-styles": "cat build/help/inline_help.css >> build/help/help.css && cat build/help/inline_help_capabilities.css >> build/help/help.css"
}, },
"dependencies": { "dependencies": {
"bootstrap": "^3.4.1", "bootstrap": "^3.4.1",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment