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 */ +@-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 @@ -@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; - } -}