summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro Pinto Silva <pedro.silva@collabora.com>2020-12-08 12:23:14 +0100
committerpedropintosilva <65948705+pedropintosilva@users.noreply.github.com>2020-12-08 20:05:19 +0100
commit30846b341d534068dbe7fbd67fba85abee6bc1b0 (patch)
tree3de8040e4c94977da7630aa800c06049aac0ee33
parentJSDialog: Fix new close button alignment and style and its parent (diff)
downloadonline-30846b341d534068dbe7fbd67fba85abee6bc1b0.tar.gz
online-30846b341d534068dbe7fbd67fba85abee6bc1b0.zip
JSDialog: style btns, add generic btns file and reuse, fix font-family..
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com> Change-Id: Ib4518c60a6304ac175290e5231ed25738c0d44ef
-rw-r--r--loleaflet/Makefile.am1
-rw-r--r--loleaflet/css/btns.css24
-rw-r--r--loleaflet/css/jquery-ui-lightness.css1
-rw-r--r--loleaflet/css/jsdialogs.css1
4 files changed, 27 insertions, 0 deletions
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index e8c8445434..c1cc9a9308 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -136,6 +136,7 @@ LOLEAFLET_CSS =\
$(srcdir)/css/menubar.css \
$(srcdir)/css/mobilewizard.css \
$(srcdir)/css/jsdialogs.css \
+ $(srcdir)/css/btns.css \
$(srcdir)/css/notebookbar.css \
$(srcdir)/css/vex.css \
$(srcdir)/css/jquery-ui-lightness.css
diff --git a/loleaflet/css/btns.css b/loleaflet/css/btns.css
new file mode 100644
index 0000000000..ae45be1d7a
--- /dev/null
+++ b/loleaflet/css/btns.css
@@ -0,0 +1,24 @@
+.loleaflet-annotation-edit #annotation-cancel,
+#table-buttonbox #cancel,
+.cell.jsdialog > button:not(#ok) {
+ height: 32px;
+ line-height: 0em;
+ color: #222;
+ min-width: 62px;
+ background-color: #f1f1f1;
+ border: 1px solid #ccc;
+ border-radius: 3px;
+}
+
+.loleaflet-annotation-edit #annotation-save,
+#annotation-reply,
+#table-buttonbox #ok,
+.cell.jsdialog > button {
+ height: 32px;
+ line-height: 0em;
+ color: #111;
+ min-width: 62px;
+ background-color: #f4f4f4;
+ border: 1px solid #777;
+ border-radius: 3px;
+} \ No newline at end of file
diff --git a/loleaflet/css/jquery-ui-lightness.css b/loleaflet/css/jquery-ui-lightness.css
index b5732cfced..501fe7e5b6 100644
--- a/loleaflet/css/jquery-ui-lightness.css
+++ b/loleaflet/css/jquery-ui-lightness.css
@@ -906,6 +906,7 @@ button.ui-button::-moz-focus-inner {
background: #f6a828 url("images/ui-bg_gloss-wave_35_f6a828_500x100.png") 50% 50% repeat-x;
color: #ffffff;
font-weight: bold;
+ font-family: var(--jquery-ui-font);
}
.ui-widget-header a {
color: #ffffff;
diff --git a/loleaflet/css/jsdialogs.css b/loleaflet/css/jsdialogs.css
index 5f55e51599..d4a5e7ddb1 100644
--- a/loleaflet/css/jsdialogs.css
+++ b/loleaflet/css/jsdialogs.css
@@ -7,6 +7,7 @@
.jsdialog-container .ui-dialog-content {
background-color: white !important;
+ font-family: var(--jquery-ui-font);
}
.jsdialog.row {