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

github.com/nextcloud/text.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2019-06-11 12:25:41 +0300
committerJulius Härtl <jus@bitgrid.net>2019-06-11 12:25:41 +0300
commitce74e603cdffaa422651cfdc3ce47d9c58d98dc4 (patch)
treed40cacf23685427ee9f3298cc16c3ca8a20d9ed2
parent5d8afd3290d5e0d3efecc6a61bdd53e1be63dc91 (diff)
Fix icons on dark mode (closes #34)
Signed-off-by: Julius Härtl <jus@bitgrid.net>
-rw-r--r--appinfo/app.php2
-rw-r--r--css/icons.scss45
-rw-r--r--css/style.scss35
-rw-r--r--img/add_col_after.svg (renamed from img/icons/add_col_after.svg)0
-rw-r--r--img/add_col_before.svg (renamed from img/icons/add_col_before.svg)0
-rw-r--r--img/add_row_after.svg (renamed from img/icons/add_row_after.svg)0
-rw-r--r--img/add_row_before.svg (renamed from img/icons/add_row_before.svg)0
-rw-r--r--img/bold.svg (renamed from img/icons/bold.svg)0
-rw-r--r--img/checklist.svg (renamed from img/icons/checklist.svg)0
-rw-r--r--img/code.svg (renamed from img/icons/code.svg)0
-rw-r--r--img/combine_cells.svg (renamed from img/icons/combine_cells.svg)0
-rw-r--r--img/delete_col.svg (renamed from img/icons/delete_col.svg)0
-rw-r--r--img/delete_row.svg (renamed from img/icons/delete_row.svg)0
-rw-r--r--img/delete_table.svg (renamed from img/icons/delete_table.svg)0
-rw-r--r--img/github.svg (renamed from img/icons/github.svg)0
-rw-r--r--img/hr.svg (renamed from img/icons/hr.svg)0
-rw-r--r--img/image.svg (renamed from img/icons/image.svg)0
-rw-r--r--img/italic.svg (renamed from img/icons/italic.svg)0
-rw-r--r--img/link.svg (renamed from img/icons/link.svg)0
-rw-r--r--img/mention.svg (renamed from img/icons/mention.svg)0
-rw-r--r--img/ol.svg (renamed from img/icons/ol.svg)0
-rw-r--r--img/paragraph.svg (renamed from img/icons/paragraph.svg)0
-rw-r--r--img/quote.svg (renamed from img/icons/quote.svg)0
-rw-r--r--img/redo.svg (renamed from img/icons/redo.svg)0
-rw-r--r--img/remove.svg (renamed from img/icons/remove.svg)0
-rw-r--r--img/strike.svg (renamed from img/icons/strike.svg)0
-rw-r--r--img/table.svg (renamed from img/icons/table.svg)0
-rw-r--r--img/ul.svg (renamed from img/icons/ul.svg)0
-rw-r--r--img/underline.svg (renamed from img/icons/underline.svg)0
-rw-r--r--img/undo.svg (renamed from img/icons/undo.svg)0
30 files changed, 47 insertions, 35 deletions
diff --git a/appinfo/app.php b/appinfo/app.php
index 2487dd64a..935ac66aa 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -9,9 +9,11 @@ $eventDispatcher = \OC::$server->getEventDispatcher();
if (\OC::$server->getUserSession()->isLoggedIn()) {
$eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', function () {
\OCP\Util::addScript('text', 'files');
+ \OCP\Util::addStyle('text', 'icons');
});
}
$eventDispatcher->addListener('OCA\Files_Sharing::loadAdditionalScripts', function () {
\OCP\Util::addScript('text', 'public');
+ \OCP\Util::addStyle('text', 'icons');
});
diff --git a/css/icons.scss b/css/icons.scss
new file mode 100644
index 000000000..386225aa6
--- /dev/null
+++ b/css/icons.scss
@@ -0,0 +1,45 @@
+.icon-bold {
+ background-image: url('./../../img/icons/bold.svg');
+}
+.icon-italic {
+ background-image: url('./../../img/icons/italic.svg');
+}
+.icon-underline {
+ background-image: url('./../../img/icons/underline.svg');
+}
+.icon-link {
+ background-image: url('./../../img/icons/link.svg');
+}
+.icon-ol {
+ background-image: url('./../../img/icons/ol.svg');
+}
+.icon-ul {
+ background-image: url('./../../img/icons/ul.svg');
+}
+.icon-hr {
+ background-image: url('./../../img/icons/hr.svg');
+}
+.icon-quote {
+ background-image: url('./../../img/icons/quote.svg');
+}
+.icon-paragraph {
+ background-image: url('./../../img/icons/paragraph.svg');
+}
+.icon-code {
+ background-image: url('./../../img/icons/code.svg');
+}
+.icon-image {
+ background-image: url('./../../img/icons/image.svg');
+}
+
+@include icon-black-white('bold', 'text', 1);
+@include icon-black-white('italic', 'text', 1);
+@include icon-black-white('underline', 'text', 1);
+@include icon-black-white('link', 'text', 1);
+@include icon-black-white('ol', 'text', 1);
+@include icon-black-white('ul', 'text', 1);
+@include icon-black-white('hr', 'text', 1);
+@include icon-black-white('quote', 'text', 1);
+@include icon-black-white('paragraph', 'text', 1);
+@include icon-black-white('code', 'text', 1);
+@include icon-black-white('image', 'text', 1);
diff --git a/css/style.scss b/css/style.scss
index cf2d2aa81..f41fb9877 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -83,38 +83,3 @@ div[contenteditable=false] {
color: var(--color-main-text);
opacity: 1;
}
-
-
-.icon-bold {
- background-image: url('./../../img/icons/bold.svg');
-}
-.icon-italic {
- background-image: url('./../../img/icons/italic.svg');
-}
-.icon-underline {
- background-image: url('./../../img/icons/underline.svg');
-}
-.icon-link {
- background-image: url('./../../img/icons/link.svg');
-}
-.icon-ol {
- background-image: url('./../../img/icons/ol.svg');
-}
-.icon-ul {
- background-image: url('./../../img/icons/ul.svg');
-}
-.icon-hr {
- background-image: url('./../../img/icons/hr.svg');
-}
-.icon-quote {
- background-image: url('./../../img/icons/quote.svg');
-}
-.icon-paragraph {
- background-image: url('./../../img/icons/paragraph.svg');
-}
-.icon-code {
- background-image: url('./../../img/icons/code.svg');
-}
-.icon-image {
- background-image: url('./../../img/icons/image.svg');
-}
diff --git a/img/icons/add_col_after.svg b/img/add_col_after.svg
index e75b431c0..e75b431c0 100644
--- a/img/icons/add_col_after.svg
+++ b/img/add_col_after.svg
diff --git a/img/icons/add_col_before.svg b/img/add_col_before.svg
index d4c331569..d4c331569 100644
--- a/img/icons/add_col_before.svg
+++ b/img/add_col_before.svg
diff --git a/img/icons/add_row_after.svg b/img/add_row_after.svg
index 7467302ce..7467302ce 100644
--- a/img/icons/add_row_after.svg
+++ b/img/add_row_after.svg
diff --git a/img/icons/add_row_before.svg b/img/add_row_before.svg
index 822ef89aa..822ef89aa 100644
--- a/img/icons/add_row_before.svg
+++ b/img/add_row_before.svg
diff --git a/img/icons/bold.svg b/img/bold.svg
index 985854b30..985854b30 100644
--- a/img/icons/bold.svg
+++ b/img/bold.svg
diff --git a/img/icons/checklist.svg b/img/checklist.svg
index 20e8dc03d..20e8dc03d 100644
--- a/img/icons/checklist.svg
+++ b/img/checklist.svg
diff --git a/img/icons/code.svg b/img/code.svg
index 18b960bf1..18b960bf1 100644
--- a/img/icons/code.svg
+++ b/img/code.svg
diff --git a/img/icons/combine_cells.svg b/img/combine_cells.svg
index a4035e515..a4035e515 100644
--- a/img/icons/combine_cells.svg
+++ b/img/combine_cells.svg
diff --git a/img/icons/delete_col.svg b/img/delete_col.svg
index 55fa1450e..55fa1450e 100644
--- a/img/icons/delete_col.svg
+++ b/img/delete_col.svg
diff --git a/img/icons/delete_row.svg b/img/delete_row.svg
index 7844f92d9..7844f92d9 100644
--- a/img/icons/delete_row.svg
+++ b/img/delete_row.svg
diff --git a/img/icons/delete_table.svg b/img/delete_table.svg
index a7509520e..a7509520e 100644
--- a/img/icons/delete_table.svg
+++ b/img/delete_table.svg
diff --git a/img/icons/github.svg b/img/github.svg
index cf089e63c..cf089e63c 100644
--- a/img/icons/github.svg
+++ b/img/github.svg
diff --git a/img/icons/hr.svg b/img/hr.svg
index 2469e43c7..2469e43c7 100644
--- a/img/icons/hr.svg
+++ b/img/hr.svg
diff --git a/img/icons/image.svg b/img/image.svg
index 388c745f4..388c745f4 100644
--- a/img/icons/image.svg
+++ b/img/image.svg
diff --git a/img/icons/italic.svg b/img/italic.svg
index 1916b10a0..1916b10a0 100644
--- a/img/icons/italic.svg
+++ b/img/italic.svg
diff --git a/img/icons/link.svg b/img/link.svg
index 223282be4..223282be4 100644
--- a/img/icons/link.svg
+++ b/img/link.svg
diff --git a/img/icons/mention.svg b/img/mention.svg
index 96460714f..96460714f 100644
--- a/img/icons/mention.svg
+++ b/img/mention.svg
diff --git a/img/icons/ol.svg b/img/ol.svg
index 1e524f7f2..1e524f7f2 100644
--- a/img/icons/ol.svg
+++ b/img/ol.svg
diff --git a/img/icons/paragraph.svg b/img/paragraph.svg
index 4c23b826f..4c23b826f 100644
--- a/img/icons/paragraph.svg
+++ b/img/paragraph.svg
diff --git a/img/icons/quote.svg b/img/quote.svg
index 64c4d3fb4..64c4d3fb4 100644
--- a/img/icons/quote.svg
+++ b/img/quote.svg
diff --git a/img/icons/redo.svg b/img/redo.svg
index fbfc27a52..fbfc27a52 100644
--- a/img/icons/redo.svg
+++ b/img/redo.svg
diff --git a/img/icons/remove.svg b/img/remove.svg
index 533979589..533979589 100644
--- a/img/icons/remove.svg
+++ b/img/remove.svg
diff --git a/img/icons/strike.svg b/img/strike.svg
index 5bf1e8861..5bf1e8861 100644
--- a/img/icons/strike.svg
+++ b/img/strike.svg
diff --git a/img/icons/table.svg b/img/table.svg
index c959363a8..c959363a8 100644
--- a/img/icons/table.svg
+++ b/img/table.svg
diff --git a/img/icons/ul.svg b/img/ul.svg
index ab7548009..ab7548009 100644
--- a/img/icons/ul.svg
+++ b/img/ul.svg
diff --git a/img/icons/underline.svg b/img/underline.svg
index 26f856516..26f856516 100644
--- a/img/icons/underline.svg
+++ b/img/underline.svg
diff --git a/img/icons/undo.svg b/img/undo.svg
index 833ab39da..833ab39da 100644
--- a/img/icons/undo.svg
+++ b/img/undo.svg