[Libreoffice-commits] online.git: 2 commits - loleaflet/css loleaflet/Makefile.am
Jan Holesovsky (via logerrit)
logerrit at kemper.freedesktop.org
Thu Apr 2 07:07:01 UTC 2020
loleaflet/Makefile.am | 1
loleaflet/css/device-mobile.css | 192 +++++++++++++++++++++++++++++++++++
loleaflet/css/spreadsheet-mobile.css | 89 ----------------
loleaflet/css/vex.css | 105 -------------------
4 files changed, 192 insertions(+), 195 deletions(-)
New commits:
commit f3635714fd93102d22fc7d921360d8bf1e2a68c7
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Apr 1 12:22:10 2020 +0200
Commit: Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Apr 2 09:06:54 2020 +0200
mobile: Move the vex-related pieces.
Change-Id: I5b21d6adfef1443ecea8936788d5eca8d4b83c34
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91480
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 34f584a48..1dc1040fc 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -239,3 +239,106 @@ div#w2ui-overlay-actionbar.w2ui-overlay{
background-color: #eeeeee;
border-radius: 0px;
}
+
+/* Related to vex.css */
+.vex-open .loleaflet-user-idle {
+ background: rgba(0, 0, 0, 0)!important;
+ font-size: xx-large!important;
+ color: #fff!important;
+ text-align: center!important;
+}
+.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input select, .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input textarea, .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="date"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="datetime"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="datetime-local"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="email"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="month"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="number"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="password"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="search"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="tel"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="text"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="time"], .vex.vex
-theme-plain .vex-dialog-form .vex-dialog-input input[type="url"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="week"]{
+ padding: 0 !important
+}
+.vex-dialog-input > textarea.loleaflet-annotation-textarea {
+ height: 198px;
+ border: 4px solid #f0f0f0 !important;
+ box-shadow: 0 0 1px 1px #dfdfdf;
+}
+.vex-dialog-input > textarea.loleaflet-annotation-textarea:focus {
+ height: 198px;
+ border: 4px solid #f0f0f0 !important;
+ box-shadow: 0 0 1px 1px #0b87e7 !important;
+}
+.vex-dialog-message {
+ text-align: center;
+ font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !important;
+ font-size: 1em !important;
+ font-weight: 600 !important;
+}
+.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="text"] {
+ border-radius: 4px !important;
+ background-color: #fff !important;
+ width: 100%;
+ width: -moz-available !important;
+ width: -webkit-fill-available !important;
+ width: fill-available !important;
+ border: 4px solid #fff !important;
+ box-shadow: 0 0 1px 1px #dfdfdf;
+}
+.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="text"]:focus {
+ border: 4px solid #fff !important;
+ box-shadow: 0 0 1px 1px #0b87e7 !important;
+ color: #0b87e7 !important;
+}
+.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="text"]:focus input{
+ color: #000 !important;
+}
+.vex-dialog-input {
+ font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !important;
+ font-size: 0.8em;
+}
+.vex.vex-theme-plain .vex-content {
+ height: 100% !important;
+ max-width: 100% !important;
+ width: auto !important;
+ border: none;
+ box-shadow: none;
+ border-radius: none;
+}
+.vex.vex-theme-plain {
+ padding: 0px !important;
+ position: relative !important;
+ top: -42px !important;
+}
+.vex-open .vex-overlay {
+ z-index: 2000;
+ min-height: 100%;
+ position: absolute;
+ width: 100%;
+ width: -moz-available !important;
+ width: -webkit-fill-available !important;
+ width: fill-available !important;
+ top: 0;
+ background-color: white;
+}
+.vex.vex-theme-plain input {
+ font-size: 1.1em !important;
+}
+textarea.loleaflet-annotation-textarea {
+ min-width: -moz-available !important;
+ min-width: -webkit-fill-available !important;
+ min-width: fill-available !important;
+}
+button.vex-dialog-button-primary.vex-dialog-button.vex-first {
+ border: 1px solid #0b87e7 !important;
+ border-radius: 4px !important;
+ background-color: #0b87e7 !important;
+ color: #fff !important;
+}
+button.vex-dialog-button-secondary.vex-dialog-button.vex-last {
+ border-radius: 4px;
+ background-color: #fff !important;
+ border: 1px solid #aaa !important;
+}
+.vex.vex-theme-plain .vex-dialog-button{
+ line-height: 1em !important;
+ height: auto !important;
+}
+.vex-overlay.loleaflet-user-idle-overlay {
+ background-color: #05396180;
+}
+.vex-content.loleaflet-user-idle{
+ padding-top: 160px !important;
+ padding-bottom: 160px !important;
+}
diff --git a/loleaflet/css/vex.css b/loleaflet/css/vex.css
index a59a9d9e4..7a1260cb5 100644
--- a/loleaflet/css/vex.css
+++ b/loleaflet/css/vex.css
@@ -62,108 +62,3 @@
top: 0;
bottom: 0;
}
-
-/*mobile*/
- at media (max-width: 767px), (max-device-height: 767px) {
- .vex-open .loleaflet-user-idle {
- background: rgba(0, 0, 0, 0)!important;
- font-size: xx-large!important;
- color: #fff!important;
- text-align: center!important;
- }
- .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input select, .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input textarea, .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="date"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="datetime"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="datetime-local"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="email"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="month"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="number"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="password"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="search"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="tel"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="text"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="time"], .vex.ve
x-theme-plain .vex-dialog-form .vex-dialog-input input[type="url"], .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="week"]{
- padding: 0 !important
- }
- .vex-dialog-input > textarea.loleaflet-annotation-textarea {
- height: 198px;
- border: 4px solid #f0f0f0 !important;
- box-shadow: 0 0 1px 1px #dfdfdf;
- }
- .vex-dialog-input > textarea.loleaflet-annotation-textarea:focus {
- height: 198px;
- border: 4px solid #f0f0f0 !important;
- box-shadow: 0 0 1px 1px #0b87e7 !important;
- }
- .vex-dialog-message {
- text-align: center;
- font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !important;
- font-size: 1em !important;
- font-weight: 600 !important;
- }
- .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="text"] {
- border-radius: 4px !important;
- background-color: #fff !important;
- width: 100%;
- width: -moz-available !important;
- width: -webkit-fill-available !important;
- width: fill-available !important;
- border: 4px solid #fff !important;
- box-shadow: 0 0 1px 1px #dfdfdf;
- }
- .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="text"]:focus {
- border: 4px solid #fff !important;
- box-shadow: 0 0 1px 1px #0b87e7 !important;
- color: #0b87e7 !important;
- }
- .vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="text"]:focus input{
- color: #000 !important;
- }
- .vex-dialog-input {
- font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !important;
- font-size: 0.8em;
- }
- .vex.vex-theme-plain .vex-content {
- height: 100% !important;
- max-width: 100% !important;
- width: auto !important;
- border: none;
- box-shadow: none;
- border-radius: none;
- }
- .vex.vex-theme-plain {
- padding: 0px !important;
- position: relative !important;
- top: -42px !important;
- }
- .vex-open .vex-overlay {
- z-index: 2000;
- min-height: 100%;
- position: absolute;
- width: 100%;
- width: -moz-available !important;
- width: -webkit-fill-available !important;
- width: fill-available !important;
- top: 0;
- background-color: white;
- }
- .vex.vex-theme-plain input {
- font-size: 1.1em !important;
- }
- textarea.loleaflet-annotation-textarea {
- min-width: -moz-available !important;
- min-width: -webkit-fill-available !important;
- min-width: fill-available !important;
- }
- button.vex-dialog-button-primary.vex-dialog-button.vex-first {
- border: 1px solid #0b87e7 !important;
- border-radius: 4px !important;
- background-color: #0b87e7 !important;
- color: #fff !important;
- }
- button.vex-dialog-button-secondary.vex-dialog-button.vex-last {
- border-radius: 4px;
- background-color: #fff !important;
- border: 1px solid #aaa !important;
- }
- .vex.vex-theme-plain .vex-dialog-button{
- line-height: 1em !important;
- height: auto !important;
- }
- .vex-overlay.loleaflet-user-idle-overlay {
- background-color: #05396180;
- }
- .vex-content.loleaflet-user-idle{
- padding-top: 160px !important;
- padding-bottom: 160px !important;
- }
-}
commit e42987ecf50413c79a5c081e393c6dbdc28265d2
Author: Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Apr 1 11:52:12 2020 +0200
Commit: Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Apr 2 09:06:40 2020 +0200
mobile: Move the spreadsheet.css related bits to device-mobile.css.
Change-Id: I711a578462729e3f1b5f7029565dd8edd1f7caf8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91479
Tested-by: Jan Holesovsky <kendy at collabora.com>
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index f022227bb..3a31b27d6 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -105,7 +105,6 @@ LOLEAFLET_CSS =\
$(srcdir)/css/impress.css \
$(srcdir)/css/impress-mobile.css \
$(srcdir)/css/spreadsheet.css \
- $(srcdir)/css/spreadsheet-mobile.css \
$(srcdir)/css/writer.css \
$(srcdir)/css/writer-mobile.css \
$(srcdir)/css/editor.css \
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index ad605dfc8..34f584a48 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -150,3 +150,92 @@ div#w2ui-overlay-actionbar.w2ui-overlay{
#tb_formulabar_item_formula > div, #tb_formulabar_item_address > div {
margin-top: -16px;
}
+
+/* Related to spreadsheet.css */
+ at -moz-document url-prefix() {
+ #spreadsheet-row-column-frame.readonly {
+ top: 36px !important;
+ }
+ #document-container.spreadsheet-document.readonly {
+ top: 56px !important;
+ }
+ #spreadsheet-row-column-frame {
+ top: 75px !important
+ }
+ #document-container.spreadsheet-document {
+ top: 95px !important;
+ }
+}
+#spreadsheet-toolbar {
+ bottom: 0;
+}
+
+.spreadsheet-tabs-container {
+ bottom: 0;
+}
+
+#spreadsheet-row-column-frame.readonly {
+ top: 37px !important;
+}
+#document-container.spreadsheet-document.readonly {
+ top: 57px !important;
+}
+#spreadsheet-row-column-frame {
+ top: 73px;
+ bottom: 36px;
+}
+
+.spreadsheet-tab{
+ background-color: #eaf5ff;
+ color: #4c4c4c;
+ border-radius: 3px;
+ border-color: #fbfbfb;
+ padding-top: 2px;
+ padding-bottom: 6px;
+ margin-top: 4px;
+}
+
+.spreadsheet-tab-selected{
+ color: #0b87e7 !important;
+ border-color: #0b87e7;
+ border-top-left-radius: 0px;
+ border-top-right-radius: 0px;
+ margin-top: 2px;
+ padding-top: 5px;
+ padding-bottom: 7px;
+}
+
+.spreadsheet-tabs-container {
+ left: 24px;
+}
+
+.spreadsheet-tab-scroll {
+ overflow-x: scroll;
+ scrollbar-width: none; /*css draft (firefox only)*/
+ -ms-scrollbar: none; /*ie*/
+ -webkit-overflow-scrolling: touch;
+}
+
+.spreadsheet-tabs-container, #spreadsheet-toolbar{
+ background-color: #fff;
+ border-top: 1px solid #eceff4;
+}
+#spreadsheet-toolbar{
+ background-color: #fbfbfb;
+ border-top: 1px solid #eceff4;
+ height: 40px;
+ padding-top: 6px;
+ padding-left: 1px;
+ padding-bottom: 0px;
+ padding-right: 0px;
+}
+#spreadsheet-toolbar .w2ui-tb-image{
+ padding-top: 0px !important;
+ margin-top: 0px !important;
+ margin-bottom: 0px !important;
+}
+#toolbar-down table.w2ui-button.over {
+ border: 1px solid #eee;
+ background-color: #eeeeee;
+ border-radius: 0px;
+}
diff --git a/loleaflet/css/spreadsheet-mobile.css b/loleaflet/css/spreadsheet-mobile.css
deleted file mode 100644
index a981eb030..000000000
--- a/loleaflet/css/spreadsheet-mobile.css
+++ /dev/null
@@ -1,89 +0,0 @@
- at media (max-width: 767px), (max-device-height: 767px) {
- @-moz-document url-prefix() {
- #spreadsheet-row-column-frame.readonly {
- top: 36px !important;
- }
- #document-container.spreadsheet-document.readonly {
- top: 56px !important;
- }
- #spreadsheet-row-column-frame {
- top: 75px !important
- }
- #document-container.spreadsheet-document {
- top: 95px !important;
- }
- }
- #spreadsheet-toolbar {
- bottom: 0;
- }
-
- .spreadsheet-tabs-container {
- bottom: 0;
- }
-
- #spreadsheet-row-column-frame.readonly {
- top: 37px !important;
- }
- #document-container.spreadsheet-document.readonly {
- top: 57px !important;
- }
- #spreadsheet-row-column-frame {
- top: 73px;
- bottom: 36px;
- }
-
- .spreadsheet-tab{
- background-color: #eaf5ff;
- color: #4c4c4c;
- border-radius: 3px;
- border-color: #fbfbfb;
- padding-top: 2px;
- padding-bottom: 6px;
- margin-top: 4px;
- }
-
- .spreadsheet-tab-selected{
- color: #0b87e7 !important;
- border-color: #0b87e7;
- border-top-left-radius: 0px;
- border-top-right-radius: 0px;
- margin-top: 2px;
- padding-top: 5px;
- padding-bottom: 7px;
- }
-
- .spreadsheet-tabs-container {
- left: 24px;
- }
-
- .spreadsheet-tab-scroll {
- overflow-x: scroll;
- scrollbar-width: none; /*css draft (firefox only)*/
- -ms-scrollbar: none; /*ie*/
- -webkit-overflow-scrolling: touch;
- }
-
- .spreadsheet-tabs-container, #spreadsheet-toolbar{
- background-color: #fff;
- border-top: 1px solid #eceff4;
- }
- #spreadsheet-toolbar{
- background-color: #fbfbfb;
- border-top: 1px solid #eceff4;
- height: 40px;
- padding-top: 6px;
- padding-left: 1px;
- padding-bottom: 0px;
- padding-right: 0px;
- }
- #spreadsheet-toolbar .w2ui-tb-image{
- padding-top: 0px !important;
- margin-top: 0px !important;
- margin-bottom: 0px !important;
- }
- #toolbar-down table.w2ui-button.over {
- border: 1px solid #eee;
- background-color: #eeeeee;
- border-radius: 0px;
- }
-}
More information about the Libreoffice-commits
mailing list