Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/richdocuments.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--appinfo/app.php1
-rw-r--r--css/admin.scss17
-rw-r--r--css/document.scss (renamed from css/style.css)0
-rw-r--r--css/templatePicker.scss10
-rw-r--r--css/viewer.scss8
-rw-r--r--img/x-office-document.svg1
-rw-r--r--img/x-office-presentation.svg1
-rw-r--r--img/x-office-spreadsheet.svg1
-rw-r--r--src/admin.js1
-rw-r--r--src/document.js2
-rw-r--r--src/personal.js2
-rw-r--r--src/viewer.js1
-rw-r--r--templates/admin.php1
-rw-r--r--templates/documents.php1
-rw-r--r--templates/personal.php1
-rw-r--r--templates/public.php26
16 files changed, 23 insertions, 51 deletions
diff --git a/appinfo/app.php b/appinfo/app.php
index cd8c3b99..9785bc7d 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -45,7 +45,6 @@ $eventDispatcher->addListener(
'OCA\Files_Sharing::loadAdditionalScripts',
function() {
\OCP\Util::addScript('richdocuments', 'viewer');
- \OCP\Util::addStyle('richdocuments', 'viewer');
}
);
diff --git a/css/admin.scss b/css/admin.scss
index fc3e9391..a6424c51 100644
--- a/css/admin.scss
+++ b/css/admin.scss
@@ -56,8 +56,7 @@
opacity: 0.7;
}
+ #emptycontent label {
- color: nc-lighten($color-main-text, 15%); // 12&13 fallback
- color: $color-text-light;
+ color: var(--color-text-light);
}
}
}
@@ -68,9 +67,8 @@
$size: 150px;
$sizeY: $size / 210 * 297;
$space: 10px;
- border-radius: 3px; // 12&13 fallback
- border-radius: $border-radius;
- border: 1px solid $color-border; // 12&13 fallback
+ border-radius: var(--border-radius);
+ border: 1px solid var(--color-border);
margin: $space;
position: relative;
figure {
@@ -81,8 +79,7 @@
img, .templatePlaceholder {
width: $size;
height: $sizeY;
- background-color: nc-darken($color-main-background, 7%); // 12&13 fallback
- background-color: $color-background-dark;
+ background-color: var(--color-background-dark);
}
figcaption {
margin-top: $space;
@@ -104,13 +101,11 @@
font-size: 20px;
background-size: 24px;
// text is set as bg
- color: nc-darken($color-main-background, 14%); // 12&13 fallback
- color: $color-background-darker;
+ color: var(--color-background-darker);
}
.delete-cover {
// bg is set as color
- background-color: nc-lighten($color-main-text, 30%); // 12&13 fallback
- background-color: $color-text-lighter;
+ background-color: var(--color-text-lighter);
z-index: 2;
}
&:hover .delete-template,
diff --git a/css/style.css b/css/document.scss
index abf502aa..abf502aa 100644
--- a/css/style.css
+++ b/css/document.scss
diff --git a/css/templatePicker.scss b/css/templatePicker.scss
index a69876d4..e0f362c0 100644
--- a/css/templatePicker.scss
+++ b/css/templatePicker.scss
@@ -28,15 +28,14 @@
$size: 170px;
$sizeY: $size / 210 * 297;
$space: 10px;
- border-radius: 3px; // 12&13 fallback
- border-radius: $border-radius;
- border: 1px solid $color-border; // 12&13 fallback
+ border-radius: var(--border-radius);
+ border: 1px solid var(--color-border);
margin: $space;
position: relative;
&:hover,
&:focus {
- border-color: $color-primary-element; // 12&13 fallback
+ border-color: var(--color-primary-element);
}
> span {
@@ -49,8 +48,7 @@
> span {
width: $size;
height: $sizeY;
- background-color: nc-darken($color-main-background, 7%); // 12&13 fallback
- background-color: $color-background-dark;
+ background-color: var(--color-background-dark);
background-size: 24px;
}
> h2 {
diff --git a/css/viewer.scss b/css/viewer.scss
index 8421702e..88f1e2c0 100644
--- a/css/viewer.scss
+++ b/css/viewer.scss
@@ -10,15 +10,15 @@
}
.icon-filetype-document{
- background-image: url('../../../core/img/filetypes/x-office-document.svg')
+ background-image: url('../img/x-office-document.svg')
}
.icon-filetype-spreadsheet{
- background-image: url('../../../core/img/filetypes/x-office-spreadsheet.svg');
+ background-image: url('../img/x-office-spreadsheet.svg');
}
.icon-filetype-presentation{
- background-image: url('../../../core/img/filetypes/x-office-presentation.svg');
+ background-image: url('../img/x-office-presentation.svg');
}
.richdocuments-sharing .icon-shared {
@@ -53,7 +53,7 @@
padding: 3px;
border-left: 3px solid transparent;
&.active {
- border-left: 3px solid var(--color-primary, $color-primary);
+ border-left: 3px solid var(--color-primary);
}
.label {
diff --git a/img/x-office-document.svg b/img/x-office-document.svg
new file mode 100644
index 00000000..d19fa659
--- /dev/null
+++ b/img/x-office-document.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#49abea" d="m2.5 1c-0.28 0-0.5 0.22-0.5 0.5v13c0 0.28 0.22 0.5 0.5 0.5h11c0.28 0 0.5-0.22 0.5-0.5v-10.5l-3-3h-8.5zm1.5 2h6v1h-6v-1zm0 3h5v1h-5v-1zm0 3h8v1h-8v-1zm0 3h4v1h-4v-1z"/></svg>
diff --git a/img/x-office-presentation.svg b/img/x-office-presentation.svg
new file mode 100644
index 00000000..523aa38e
--- /dev/null
+++ b/img/x-office-presentation.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="16" width="16" version="1.1"><path fill="#f0965f" d="m1.5 2c-0.25 0-0.5 0.25-0.5 0.5v11c0 0.25 0.25 0.5 0.5 0.5h13c0.25 0 0.5-0.25 0.5-0.5v-11c0-0.25-0.25-0.5-0.5-0.5zm0.5 3h12v6h-12z"/></svg>
diff --git a/img/x-office-spreadsheet.svg b/img/x-office-spreadsheet.svg
new file mode 100644
index 00000000..b7006a98
--- /dev/null
+++ b/img/x-office-spreadsheet.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" version="1.1" height="16"><path fill="#9abd4e" d="m2.5 1c-0.28 0-0.5 0.22-0.5 0.5v13c0 0.28 0.22 0.5 0.5 0.5h11c0.28 0 0.5-0.22 0.5-0.5v-10.5l-3-3h-8.5zm1.5 3h2v2h-2v-2zm3 0h5v2h-5v-2zm-3 3h2v2h-2v-2zm3 0h5v2h-5v-2zm-3 3h2v2h-2v-2zm3 0h5v2h-5v-2z"/></svg>
diff --git a/src/admin.js b/src/admin.js
index c4155aa6..17ffcb98 100644
--- a/src/admin.js
+++ b/src/admin.js
@@ -1,6 +1,7 @@
/* global OC, $ */
import Vue from 'vue'
import AdminSettings from './components/AdminSettings'
+import '../css/admin.scss'
// CSP config for webpack dynamic chunk loading
// eslint-disable-next-line
diff --git a/src/document.js b/src/document.js
index 9e80acca..e2f5f69e 100644
--- a/src/document.js
+++ b/src/document.js
@@ -11,6 +11,8 @@ import {
} from './helpers/mobile'
import { getWopiUrl } from './helpers/url'
+import '../css/document.scss'
+
const PostMessages = new PostMessageService({
parent: window.parent,
loolframe: () => document.getElementById('loleafletframe').contentWindow
diff --git a/src/personal.js b/src/personal.js
index 94cfec86..b84d7f92 100644
--- a/src/personal.js
+++ b/src/personal.js
@@ -1,3 +1,5 @@
+import '../css/admin.scss'
+
$(function() {
$('[data-toggle="tooltip"]').tooltip()
diff --git a/src/viewer.js b/src/viewer.js
index 197b1b1a..4118564f 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -3,6 +3,7 @@ import PostMessageService from './services/postMessage'
import Config from './services/config'
import Types from './helpers/types'
import FilesAppIntegration from './view/FilesAppIntegration'
+import '../css/viewer.scss'
const FRAME_DOCUMENT = 'FRAME_DOCUMENT'
const PostMessages = new PostMessageService({
diff --git a/templates/admin.php b/templates/admin.php
index 65b15635..713b751b 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -1,5 +1,4 @@
<?php
-style('richdocuments', 'admin');
script('richdocuments', 'admin');
script('files', 'jquery.fileupload');
diff --git a/templates/documents.php b/templates/documents.php
index 22e6435b..50d7b1a3 100644
--- a/templates/documents.php
+++ b/templates/documents.php
@@ -12,7 +12,6 @@
</script>
<?php
-style( 'richdocuments', 'style' );
script('richdocuments', 'document');
?>
<div id="loadingContainer" class="icon-loading"></div>
diff --git a/templates/personal.php b/templates/personal.php
index 57614cf5..26476693 100644
--- a/templates/personal.php
+++ b/templates/personal.php
@@ -1,5 +1,4 @@
<?php
-style('richdocuments', 'admin');
script('richdocuments', 'personal');
?>
<div class="section" id="richdocuments">
diff --git a/templates/public.php b/templates/public.php
deleted file mode 100644
index 11001dca..00000000
--- a/templates/public.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-style( 'richdocuments', 'style' );
-?>
-<div id="notification-container">
- <div id="notification" style="display: none;"></div>
-</div>
-<div id="documents-content">
- <?php if (isset($_['hasPassword'])): ?>
- <?php if (isset($_['wrongpw'])): ?>
- <div class="push"></div>
- <div class="warning"><?php p($l->t('Wrong password. Please retry.')) ?></div>
- <?php endif; ?>
- <form method="post">
- <input type="password" name="password" placeholder="<?php p($l->t('Password')) ?>" />
- <input type="submit" name="submit" value="<?php p($l->t('OK')) ?>" />
- </form>
- <?php endif; ?>
- <?php if (isset($_['document']) && !isset($_['wrongpw'])): ?>
- <input type="hidden" name="document" value ="<?php p($_['document']) ?>" />
- <input type="hidden" name="memberName" value ="<?php p($l->t('Guest %s' ,$_['total'])) ?>" />
- <?php endif; ?>
- <?php if (isset($_['notFound'])): ?>
- <div class="push"></div>
- <div class="warning"><?php p($l->t('This link has been expired or is never existed. Please contact the person who shared it with you for details.')) ?></div>
- <?php endif; ?>
-</div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-25 11:42:31 +0300