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:36:57 +0300
committerJulius Härtl <jus@bitgrid.net>2019-06-11 12:36:57 +0300
commit1e159cc03d16ec4e0f755e25a9d36a9d0cde30a2 (patch)
tree7f47f47fa9713b941f3ca58d36c1a551fb014d88
parentce74e603cdffaa422651cfdc3ce47d9c58d98dc4 (diff)
Fix menububble style
Signed-off-by: Julius Härtl <jus@bitgrid.net>
-rw-r--r--l10n/.gitkeep0
-rw-r--r--src/components/EditorWrapper.vue20
-rw-r--r--templates/main.php4
3 files changed, 6 insertions, 18 deletions
diff --git a/l10n/.gitkeep b/l10n/.gitkeep
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/l10n/.gitkeep
diff --git a/src/components/EditorWrapper.vue b/src/components/EditorWrapper.vue
index 478463e3f..785456963 100644
--- a/src/components/EditorWrapper.vue
+++ b/src/components/EditorWrapper.vue
@@ -83,7 +83,7 @@
<form v-if="linkMenuIsActive" class="menububble__form" @submit.prevent="setLinkUrl(commands.link, linkUrl)">
<input ref="linkInput" v-model="linkUrl" class="menububble__input"
type="text" placeholder="https://" @keydown.esc="hideLinkMenu">
- <button class="menububble__button" type="button" @click="setLinkUrl(commands.link, null)" />
+ <button class="menububble__button icon-confirm" type="button" @click="setLinkUrl(commands.link, null)" />
</form>
<template v-else>
@@ -529,14 +529,12 @@ export default {
}
}
- $color-white: #fff;
- $color-black: #000;
-
.menububble {
position: absolute;
display: flex;
z-index: 220;
- background: $color-black;
+ background: var(--color-main-background-translucent);
+ box-shadow: 0 1px 5px var(--color-box-shadow);
border-radius: 5px;
padding: 0.3rem;
margin-bottom: 0.5rem;
@@ -551,9 +549,7 @@ export default {
&__button {
display: inline-flex;
- background: transparent;
border: 0;
- color: $color-white;
padding: 0.2rem 0.5rem;
margin-right: 0.2rem;
border-radius: 3px;
@@ -562,14 +558,6 @@ export default {
&:last-child {
margin-right: 0;
}
-
- &:hover {
- background-color: rgba($color-white, 0.1);
- }
-
- &.is-active {
- background-color: rgba($color-white, 0.2);
- }
}
&__form {
@@ -581,7 +569,7 @@ export default {
font: inherit;
border: none;
background: transparent;
- color: $color-white;
+ min-width: 150px;
}
}
diff --git a/templates/main.php b/templates/main.php
index 77a116127..5b7e8b4a7 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -1,6 +1,6 @@
<?php
-script('text', 'type');
-style('text', 'style');
+script('text', 'text');
+style('text', 'icons');
?>
<div id="app-content">
<div id="maineditor"></div>