[Libreoffice-commits] online.git: loleaflet/dist
Jan Holesovsky
kendy at collabora.com
Tue Apr 19 08:23:30 UTC 2016
loleaflet/dist/loleaflet.css | 8 +
loleaflet/dist/loleaflet.html | 189 ---------------------------------
loleaflet/dist/partsPreviewControl.css | 6 -
loleaflet/dist/spreadsheet.css | 7 -
loleaflet/dist/toolbar.css | 166 ++++++++++++++++++++++++++++
5 files changed, 180 insertions(+), 196 deletions(-)
New commits:
commit aa158331fc82fbba8a338f5226f268d8b9adb451
Author: Jan Holesovsky <kendy at collabora.com>
Date: Tue Apr 19 10:09:44 2016 +0200
Move css stuff from loleaflet.htms to the appropriate .css files.
diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 854634e..2b0788f 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -2,8 +2,8 @@
border-top: 2px solid #B6B6B6;
background: #DFDFDF;
position: absolute;
- top: 70px;
- bottom: 0px;
+ top: 47px;
+ bottom: 29px;
right: 0px;
left: 0px;
}
@@ -16,3 +16,7 @@
right: 16px;
z-index: 10;
}
+
+body {
+ margin: 0;
+}
diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html
index 2012fb1..a0c48d3 100644
--- a/loleaflet/dist/loleaflet.html
+++ b/loleaflet/dist/loleaflet.html
@@ -70,195 +70,8 @@
</div>
<div id="spreadsheet-toolbar"></div>
<div id="toolbar-down"></div>
- <style type="text/css">
- #toolbar-up {
- left: 0;
- right: 0;
- text-align: center;
- padding: 10px;
- }
- #toolbar-down {
- left: 0;
- right: 0;
- text-align: center;
- padding: 0;
- position: fixed;
- bottom: 0;
- }
-
- #toolbar-up-more {
- position: absolute;
- right: 10px;
- width: 200px;
- top: 40px;
- border: 1px solid black;
- z-index: 8000;
- display: none;
- }
-
- #spreadsheet-toolbar {
- left: 0;
- text-align: center;
- bottom: 29px;
- padding: 0;
- position: absolute;
- }
-
-
- #zoomlevel {
- min-width: 36px;
- font-size: 12px;
- }
-
- body {
- margin: 0;
- }
-
- .w2ui-tb-image {
- width: 16px;
- height: 16px;
- }
-
- /* center the toolbar */
- #tb_toolbar-up_item_left,
- #tb_formulabar_item_left {
- width: 50%;
- }
-
- #tb_toolbar-up_item_right {
- width: 100%;
- }
-
- #tb_toolbar-down_item_left {
- width: 45%;
- }
- #tb_toolbar-down_item_right {
- width: 100%;
- }
- .search-not-found {
- background-color: red !important;
- -webkit-transition: background-color 0.8s linear;
- -moz-transition: background-color 0.8s linear;
- -o-transition: background-color 0.8s linear;
- transition: background-color 0.8s linear;
-
- }
- #formulaInput {
- height: 29px;
- width: 800px;
- }
-
- #document-container,
- .parts-preview {
- top: 47px;
- bottom: 29px;
- }
-
- .spreadsheet-document {
- top: 100px !important;
- bottom: 49px !important;
- }
-
- .spreadsheet-header-rows-container {
- bottom: 54px;
- }
-
- .spreadsheet-tab {
- left: 108px;
- bottom: 34px;
- }
-
- /* select box */
- .select2-results__option {
- padding: 5px;
- font-size: 14px;
- overflow: hidden;
- text-overflow: ellipsis;
- }
- .styles-select {
- width: 180px;
- }
- .fonts-select {
- width: 150px;
- }
- .fontsizes-select {
- width: 70px;
- }
- .evo-cp-wrap {
- /* hide the color pick div */
- width: 1px !important;
- }
- .font-color-indicator,
- .back-color-indicator {
- width: 16px;
- height: 5px;
- margin-top: -7px;
- margin-left: 5px;
- position: fixed;
- background: transparent;
- }
- .back-color-indicator {
- border-width: 1px;
- border-style: solid;
- }
-
- .w2ui-icon.accepttrackedchanges{ background: url('/loleaflet/dist/images/sc_accepttrackedchanges.png') no-repeat center !important; }
- .w2ui-icon.alignblock{ background: url('/loleaflet/dist/images/sc_alignblock.png') no-repeat center !important; }
- .w2ui-icon.alignhorizontal{ background: url('/loleaflet/dist/images/sc_alignhorizontal.png') no-repeat center !important; }
- .w2ui-icon.alignleft{ background: url('/loleaflet/dist/images/sc_alignleft.png') no-repeat center !important; }
- .w2ui-icon.alignright{ background: url('/loleaflet/dist/images/sc_alignright.png') no-repeat center !important; }
- .w2ui-icon.autosum{ background: url('/loleaflet/dist/images/sc_autosum.png') no-repeat center !important; }
- .w2ui-icon.backcolor{ background: url('/loleaflet/dist/images/sc_backcolor.png') no-repeat center !important; }
- .w2ui-icon.bold{ background: url('/loleaflet/dist/images/sc_bold.png') no-repeat center !important; }
- .w2ui-icon.bullet{ background: url('/loleaflet/dist/images/sc_bullet.png') no-repeat center !important; }
- .w2ui-icon.cancel{ background: url('/loleaflet/dist/images/sc_cancel.png') no-repeat center !important; }
- .w2ui-icon.color{ background: url('/loleaflet/dist/images/sc_color.png') no-repeat center !important; }
- .w2ui-icon.closedoc{ background: url('/loleaflet/dist/images/sc_closedoc.png') no-repeat center !important; }
- .w2ui-icon.decrementindent{ background: url('/loleaflet/dist/images/sc_decrementindent.png') no-repeat center !important; }
- .w2ui-icon.deletepage{ background: url('/loleaflet/dist/images/sc_deletepage.png') no-repeat center !important; }
- .w2ui-icon.duplicatepage{ background: url('/loleaflet/dist/images/sc_duplicatepage.png') no-repeat center !important; }
- .w2ui-icon.edit{ background: url('/loleaflet/dist/images/sc_edit.png') no-repeat center !important; }
- .w2ui-icon.equal{ background: url('/loleaflet/dist/images/sc_equal.png') no-repeat center !important; }
- .w2ui-icon.help{ background: url('/loleaflet/dist/images/sc_help.png') no-repeat center !important; }
- .w2ui-icon.incrementindent{ background: url('/loleaflet/dist/images/sc_incrementindent.png') no-repeat center !important; }
- .w2ui-icon.insertpage{ background: url('/loleaflet/dist/images/sc_insertpage.png') no-repeat center !important; }
- .w2ui-icon.italic{ background: url('/loleaflet/dist/images/sc_italic.png') no-repeat center !important; }
- .w2ui-icon.insertgraphic{ background: url('/loleaflet/dist/images/sc_gallery.png') no-repeat center !important; }
- .w2ui-icon.next{ background: url('/loleaflet/dist/images/sc_next.png') no-repeat center !important; }
- .w2ui-icon.numbering{ background: url('/loleaflet/dist/images/sc_numbering.png') no-repeat center !important; }
- .w2ui-icon.presentation{ background: url('/loleaflet/dist/images/sc_presentation.png') no-repeat center !important; }
- .w2ui-icon.prev{ background: url('/loleaflet/dist/images/sc_prev.png') no-repeat center !important; }
- .w2ui-icon.print{ background: url('/loleaflet/dist/images/sc_print.png') no-repeat center !important; }
- .w2ui-icon.redo{ background: url('/loleaflet/dist/images/sc_redo.png') no-repeat center !important; }
- .w2ui-icon.save{ background: url('/loleaflet/dist/images/sc_save.png') no-repeat center !important; }
- .w2ui-icon.saveas{ background: url('/loleaflet/dist/images/sc_saveas.png') no-repeat center !important; }
- .w2ui-icon.select{ background: url('/loleaflet/dist/images/sc_select.png') no-repeat center !important; }
- .w2ui-icon.strikeout{ background: url('/loleaflet/dist/images/sc_strikeout.png') no-repeat center !important; }
- .w2ui-icon.underline{ background: url('/loleaflet/dist/images/sc_underline.png') no-repeat center !important; }
- .w2ui-icon.undo{ background: url('/loleaflet/dist/images/sc_undo.png') no-repeat center !important; }
- .w2ui-icon.zoomin{ background: url('/loleaflet/dist/images/sc_zoomin.png') no-repeat center !important; }
- .w2ui-icon.zoomout{ background: url('/loleaflet/dist/images/sc_zoomout.png') no-repeat center !important; }
- .w2ui-icon.zoomreset{ background: url('/loleaflet/dist/images/sc_view100.png') no-repeat center !important; }
- .w2ui-icon.more{ background: url('/loleaflet/dist/images/sc_next.png') no-repeat center !important; }
- .w2ui-icon.firstrecord{ background: url('/loleaflet/dist/images/sc_firstrecord.png') no-repeat center !important; }
- .w2ui-icon.nextrecord{ background: url('/loleaflet/dist/images/sc_nextrecord.png') no-repeat center !important; }
- .w2ui-icon.prevrecord{ background: url('/loleaflet/dist/images/sc_prevrecord.png') no-repeat center !important; }
- .w2ui-icon.lastrecord{ background: url('/loleaflet/dist/images/sc_lastrecord.png') no-repeat center !important; }
-
- #simplemodal-container a.modalCloseImg {
- background:url('/loleaflet/dist/images/sc_closedoc.png') no-repeat;
- width:25px;
- height:29px;
- display:inline;
- z-index:3200;
- position:absolute;
- top:0px;
- right:-10px;
- cursor:pointer;
- }
- </style>
- <script>
+ <script>
function getParameterByName(name) {
name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
diff --git a/loleaflet/dist/partsPreviewControl.css b/loleaflet/dist/partsPreviewControl.css
index 09369e9..7e638ef 100644
--- a/loleaflet/dist/partsPreviewControl.css
+++ b/loleaflet/dist/partsPreviewControl.css
@@ -5,9 +5,9 @@
.parts-preview {
background: #DFDFDF;
position: absolute;
- top: 70px;
- left: 0px;
- bottom: 0px;
+ top: 47px;
+ left: 0px;
+ bottom: 29px;
max-width: 205px;
overflow: hidden;
border-top: 2px solid #B6B6B6;
diff --git a/loleaflet/dist/spreadsheet.css b/loleaflet/dist/spreadsheet.css
index 1ccfb1e..8278234 100644
--- a/loleaflet/dist/spreadsheet.css
+++ b/loleaflet/dist/spreadsheet.css
@@ -2,13 +2,14 @@
border-top: 1px solid #B6B6B6 !important;
top: 100px !important;
left: 50px !important;
- bottom: 20px !important;
+ bottom: 49px !important;
}
.spreadsheet-tab {
margin: 0;
padding: 0;
- bottom: 0;
+ left: 108px;
+ bottom: 34px;
position: absolute;
cursor: pointer;
height: 20px;
@@ -124,7 +125,7 @@
left: 0;
top: 100px;
width: 48px;
- bottom: 20px;
+ bottom: 54px;
overflow: hidden;
}
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 7859934..c6abe47 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -7,6 +7,67 @@
text-align: center;
}
+#toolbar-up {
+ left: 0;
+ right: 0;
+ text-align: center;
+ padding: 10px;
+}
+
+#toolbar-down {
+ left: 0;
+ right: 0;
+ text-align: center;
+ padding: 0;
+ position: fixed;
+ bottom: 0;
+}
+
+#toolbar-up-more {
+ position: absolute;
+ right: 10px;
+ width: 200px;
+ top: 40px;
+ border: 1px solid black;
+ z-index: 8000;
+ display: none;
+}
+
+#spreadsheet-toolbar {
+ left: 0;
+ text-align: center;
+ bottom: 29px;
+ padding: 0;
+ position: absolute;
+}
+
+/* center the toolbar */
+#tb_toolbar-up_item_left,
+#tb_formulabar_item_left {
+ width: 50%;
+}
+
+#formulaInput {
+ height: 29px;
+ width: 800px;
+}
+
+#tb_toolbar-up_item_right {
+ width: 100%;
+}
+
+#tb_toolbar-down_item_left {
+ width: 45%;
+}
+#tb_toolbar-down_item_right {
+ width: 100%;
+}
+
+.w2ui-tb-image {
+ width: 16px;
+ height: 16px;
+}
+
.leaflet-bar a {
float: left;
}
@@ -62,3 +123,108 @@ button.leaflet-control-search-next
, .leaflet-control-search {
background-color: #fff;
}
+
+.search-not-found {
+ background-color: red !important;
+ -webkit-transition: background-color 0.8s linear;
+ -moz-transition: background-color 0.8s linear;
+ -o-transition: background-color 0.8s linear;
+ transition: background-color 0.8s linear;
+
+}
+
+#zoomlevel {
+ min-width: 36px;
+ font-size: 12px;
+}
+
+/* select box */
+.select2-results__option {
+ padding: 5px;
+ font-size: 14px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+.styles-select {
+ width: 180px;
+}
+.fonts-select {
+ width: 150px;
+}
+.fontsizes-select {
+ width: 70px;
+}
+.evo-cp-wrap {
+ /* hide the color pick div */
+ width: 1px !important;
+}
+
+.font-color-indicator,
+.back-color-indicator {
+ width: 16px;
+ height: 5px;
+ margin-top: -7px;
+ margin-left: 5px;
+ position: fixed;
+ background: transparent;
+}
+
+.back-color-indicator {
+ border-width: 1px;
+ border-style: solid;
+}
+
+.w2ui-icon.accepttrackedchanges{ background: url('/loleaflet/dist/images/sc_accepttrackedchanges.png') no-repeat center !important; }
+.w2ui-icon.alignblock{ background: url('/loleaflet/dist/images/sc_alignblock.png') no-repeat center !important; }
+.w2ui-icon.alignhorizontal{ background: url('/loleaflet/dist/images/sc_alignhorizontal.png') no-repeat center !important; }
+.w2ui-icon.alignleft{ background: url('/loleaflet/dist/images/sc_alignleft.png') no-repeat center !important; }
+.w2ui-icon.alignright{ background: url('/loleaflet/dist/images/sc_alignright.png') no-repeat center !important; }
+.w2ui-icon.autosum{ background: url('/loleaflet/dist/images/sc_autosum.png') no-repeat center !important; }
+.w2ui-icon.backcolor{ background: url('/loleaflet/dist/images/sc_backcolor.png') no-repeat center !important; }
+.w2ui-icon.bold{ background: url('/loleaflet/dist/images/sc_bold.png') no-repeat center !important; }
+.w2ui-icon.bullet{ background: url('/loleaflet/dist/images/sc_bullet.png') no-repeat center !important; }
+.w2ui-icon.cancel{ background: url('/loleaflet/dist/images/sc_cancel.png') no-repeat center !important; }
+.w2ui-icon.color{ background: url('/loleaflet/dist/images/sc_color.png') no-repeat center !important; }
+.w2ui-icon.closedoc{ background: url('/loleaflet/dist/images/sc_closedoc.png') no-repeat center !important; }
+.w2ui-icon.decrementindent{ background: url('/loleaflet/dist/images/sc_decrementindent.png') no-repeat center !important; }
+.w2ui-icon.deletepage{ background: url('/loleaflet/dist/images/sc_deletepage.png') no-repeat center !important; }
+.w2ui-icon.duplicatepage{ background: url('/loleaflet/dist/images/sc_duplicatepage.png') no-repeat center !important; }
+.w2ui-icon.edit{ background: url('/loleaflet/dist/images/sc_edit.png') no-repeat center !important; }
+.w2ui-icon.equal{ background: url('/loleaflet/dist/images/sc_equal.png') no-repeat center !important; }
+.w2ui-icon.help{ background: url('/loleaflet/dist/images/sc_help.png') no-repeat center !important; }
+.w2ui-icon.incrementindent{ background: url('/loleaflet/dist/images/sc_incrementindent.png') no-repeat center !important; }
+.w2ui-icon.insertpage{ background: url('/loleaflet/dist/images/sc_insertpage.png') no-repeat center !important; }
+.w2ui-icon.italic{ background: url('/loleaflet/dist/images/sc_italic.png') no-repeat center !important; }
+.w2ui-icon.insertgraphic{ background: url('/loleaflet/dist/images/sc_gallery.png') no-repeat center !important; }
+.w2ui-icon.next{ background: url('/loleaflet/dist/images/sc_next.png') no-repeat center !important; }
+.w2ui-icon.numbering{ background: url('/loleaflet/dist/images/sc_numbering.png') no-repeat center !important; }
+.w2ui-icon.presentation{ background: url('/loleaflet/dist/images/sc_presentation.png') no-repeat center !important; }
+.w2ui-icon.prev{ background: url('/loleaflet/dist/images/sc_prev.png') no-repeat center !important; }
+.w2ui-icon.print{ background: url('/loleaflet/dist/images/sc_print.png') no-repeat center !important; }
+.w2ui-icon.redo{ background: url('/loleaflet/dist/images/sc_redo.png') no-repeat center !important; }
+.w2ui-icon.save{ background: url('/loleaflet/dist/images/sc_save.png') no-repeat center !important; }
+.w2ui-icon.saveas{ background: url('/loleaflet/dist/images/sc_saveas.png') no-repeat center !important; }
+.w2ui-icon.select{ background: url('/loleaflet/dist/images/sc_select.png') no-repeat center !important; }
+.w2ui-icon.strikeout{ background: url('/loleaflet/dist/images/sc_strikeout.png') no-repeat center !important; }
+.w2ui-icon.underline{ background: url('/loleaflet/dist/images/sc_underline.png') no-repeat center !important; }
+.w2ui-icon.undo{ background: url('/loleaflet/dist/images/sc_undo.png') no-repeat center !important; }
+.w2ui-icon.zoomin{ background: url('/loleaflet/dist/images/sc_zoomin.png') no-repeat center !important; }
+.w2ui-icon.zoomout{ background: url('/loleaflet/dist/images/sc_zoomout.png') no-repeat center !important; }
+.w2ui-icon.zoomreset{ background: url('/loleaflet/dist/images/sc_view100.png') no-repeat center !important; }
+.w2ui-icon.more{ background: url('/loleaflet/dist/images/sc_next.png') no-repeat center !important; }
+.w2ui-icon.firstrecord{ background: url('/loleaflet/dist/images/sc_firstrecord.png') no-repeat center !important; }
+.w2ui-icon.nextrecord{ background: url('/loleaflet/dist/images/sc_nextrecord.png') no-repeat center !important; }
+.w2ui-icon.prevrecord{ background: url('/loleaflet/dist/images/sc_prevrecord.png') no-repeat center !important; }
+.w2ui-icon.lastrecord{ background: url('/loleaflet/dist/images/sc_lastrecord.png') no-repeat center !important; }
+
+#simplemodal-container a.modalCloseImg {
+ background:url('/loleaflet/dist/images/sc_closedoc.png') no-repeat;
+ width:25px;
+ height:29px;
+ display:inline;
+ z-index:3200;
+ position:absolute;
+ top:0px;
+ right:-10px;
+ cursor:pointer;
+}
More information about the Libreoffice-commits
mailing list