Skip to content

Commit

Permalink
Merge pull request #1006 from ONLYOFFICE/refactor/stylelint
Browse files Browse the repository at this point in the history
Refactor/stylelint
  • Loading branch information
LinneyS authored Jul 15, 2024
2 parents 73d7602 + 594fe0e commit 31ee331
Show file tree
Hide file tree
Showing 12 changed files with 1,027 additions and 80 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/lint-eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: ESLint
on:
workflow_dispatch:
push:
branches: [master, develop, refactor/eslint]
branches: [master, develop, refactor/eslint, refactor/stylelint]
pull_request:
branches: [master, develop, refactor/eslint]
branches: [master, develop, refactor/eslint, refactor/stylelint]

env:
NODE_VERSION: 20
Expand All @@ -30,4 +30,7 @@ jobs:
run: npm ci

- name: Code Linting
run: npx eslint *.js
run: npx eslint *.js

- name: CSS Linting
run: npx stylelint ../css/*.css
1 change: 1 addition & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ "extends": ["@nextcloud/stylelint-config"] }
2 changes: 2 additions & 0 deletions css/editor.css
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,13 @@
.AscDesktopEditor #body-user #header {
display: none;
}

.AscDesktopEditor #body-user #content {
min-height: 100%;
padding-top: 0;
margin-top: 0px;
}

.AscDesktopEditor #app > iframe {
height: 100% !important;
}
3 changes: 3 additions & 0 deletions css/format.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,19 @@
background-position: 12px !important;
background-image: url("../img/new-docx.svg");
}

.icon-onlyoffice-new-xlsx {
background-size: 20px !important;
background-position: 12px !important;
background-image: url("../img/new-xlsx.svg");
}

.icon-onlyoffice-new-pptx {
background-size: 20px !important;
background-position: 12px !important;
background-image: url("../img/new-pptx.svg");
}

.icon-onlyoffice-new-pdf {
background-size: 20px !important;
background-position: 12px !important;
Expand Down
11 changes: 11 additions & 0 deletions css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@
#body-user.onlyoffice-inline .files-list__header {
display: none;
}

#body-user.onlyoffice-inline #app-navigation-toggle {
display: none !important;
}

#body-public.onlyoffice-inline #content #app-content,
#body-user.onlyoffice-inline #content #app-content,
#body-user.onlyoffice-inline #content #app-content-vue,
Expand All @@ -61,6 +63,7 @@
overflow: hidden;
overscroll-behavior-y: none;
}

#body-public.onlyoffice-inline footer {
display: none !important;
}
Expand All @@ -84,32 +87,40 @@
.AscDesktopEditor #body-user #header {
display: none;
}

.AscDesktopEditor #body-user #content {
padding-top: 0;
margin-top: 0px;
height: 100%;
}

.AscDesktopEditor #body-user #app-navigation,
.AscDesktopEditor #body-user #controls,
.AscDesktopEditor #body-user #app-sidebar {
top: 0;
}

.AscDesktopEditor #body-user #app-navigation {
height: 100%;
}

.AscDesktopEditor #body-user #app-sidebar {
height: 100vh;
}

.AscDesktopEditor #body-user table.multiselect thead,
.AscDesktopEditor #app-content-files thead {
top: 44px;
}

.AscDesktopEditor #body-user #gallery-button {
display: none;
}

.onlyoffice-download-container {
display: flex;
}

.onlyoffice-download-container p {
margin-right: 10px;
padding-top: 10px;
Expand Down
11 changes: 11 additions & 0 deletions css/settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -30,31 +30,39 @@
box-sizing: content-box;
padding-top: 6px;
}

.onlyoffice-header {
display: inline-block;
margin-top: 16px;
}

.section-onlyoffice input {
display: block;
width: 250px;
}

.onlyoffice-hide {
display: none;
}

#onlyofficeAdv {
cursor: pointer;
text-decoration: none;
}

#onlyofficeAdv .icon {
display: inline-block;
margin-bottom: -3px;
}

#onlyofficeAddrSave {
float: left;
}

.onlyoffice-demo {
margin-left: 90px;
}

#s2id_onlyofficeLimitGroups,
#s2id_onlyofficeWatermark_allGroupsList,
#s2id_onlyofficeWatermark_allTagsList,
Expand All @@ -64,18 +72,21 @@
margin-top: 6px;
width: 250px;
}

.onlyoffice-exts {
column-width: 100px;
-moz-column-width: 100px;
-webkit-column-width: 100px;
}

.onlyoffice-tables {
margin-top: 4px;
line-height: initial;
column-width: 140px;
-moz-column-width: 140px;
-webkit-column-width: 140px;
}

#onlyofficeSecret-show {
left: 205px;
}
9 changes: 9 additions & 0 deletions css/share.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,33 +33,41 @@
-webkit-mask: url("../img/app-dark.svg") no-repeat 50% 50%;
-webkit-mask-size: 16px 16px;
}

.onlyoffice-share-item {
display: flex;
list-style-type: none;
}

.onlyoffice-share-item img {
width: 32px;
height: 32px;
}

.onlyoffice-share-popup {
margin-right: 14px;
margin-top: 44px;
}

.onlyoffice-share-item span {
margin-left: 10px;
margin-top: 5px;
}

#onlyoffice-share-menu {
margin-left: auto;
}

.onlyoffice-share-action {
line-height: 44px;
}

.onlyoffice-share-label {
padding-right: 14px !important;
padding-left: 14px !important;
opacity: .7;
}

.onlyoffice-share-link-avatar {
height: 32px;
width: 32px;
Expand All @@ -68,6 +76,7 @@
display: flex;
justify-content: center;
}

.onlyoffice-share-link-avatar img {
height: 16px;
width: 16px;
Expand Down
10 changes: 10 additions & 0 deletions css/template.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
.onlyoffice-template-container li {
margin-bottom: 10px;
}

.onlyoffice-template-item img,
.onlyoffice-template-delete,
.onlyoffice-template-download,
Expand All @@ -37,37 +38,46 @@
margin-right: 10px;
cursor: pointer;
}

.onlyoffice-template-delete,
.onlyoffice-template-download {
margin-bottom: -4px;
}

.onlyoffice-template-delete {
opacity: .6;
}

.onlyoffice-template-download {
background-image: url("../../../core/img/actions/download.svg");
height: 16px;
width: 16px;
opacity: .6;
}

.section-onlyoffice-templates .icon-add {
opacity: 0.5;
padding-left: 44px;
}

.section-onlyoffice-templates .icon-add:hover {
opacity: 0.7;
}

.onlyoffice-template-item img {
float: left;
margin-top: 5px;
}

.onlyoffice-template-item input {
position: absolute;
left: -10000px;
}

.onlyoffice-template-item input:checked + label {
color: rgb(55, 137, 243);
}

.section-onlyoffice-templates input {
display: none;
}
1 change: 1 addition & 0 deletions css/viewer.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
top: 50px;
z-index: 110;
}

.modal-wrapper--full #onlyofficeViewerFrame {
top: 0;
}
Loading

0 comments on commit 31ee331

Please sign in to comment.