loleaflet/debug/document/document_simple_example.html | 7 loleaflet/dist/leaflet.css | 467 +++++------------- loleaflet/dist/loleaflet.css | 18 loleaflet/dist/partsPreviewControl.css | 37 + loleaflet/dist/scrollBar.css | 13 loleaflet/dist/searchControl.css | 8 loleaflet/dist/selectionMarkers.css | 13 loleaflet/dist/tabsControl.css | 29 + loleaflet/dist/toolbar.css | 64 ++ 9 files changed, 326 insertions(+), 330 deletions(-)
New commits: commit b75a80b78bb6870934cffcc9d1efdb1fa4d8e27d Author: Mihai Varga <mihai.va...@collabora.com> Date: Tue Dec 15 15:47:42 2015 +0200 loleaflet: fixed coding style issues in leaflet.css diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css index 4199cfe..858809f 100644 --- a/loleaflet/dist/leaflet.css +++ b/loleaflet/dist/leaflet.css @@ -562,62 +562,62 @@ a.leaflet-control-buttons:hover:first-child { .leaflet-cursor { position: absolute; text-align: center; -} + } .blinking-cursor { - background: black; - width: 2px; - pointer-events: none; - -webkit-animation: 1s blink step-end 0s infinite; - -moz-animation: 1s blink step-end 0s infinite; - -ms-animation: 1s blink step-end 0s infinite; - -o-animation: 1s blink step-end 0s infinite; - animation: 1s blink step-end 0s infinite; -} + background: black; + width: 2px; + pointer-events: none; + -webkit-animation: 1s blink step-end 0s infinite; + -moz-animation: 1s blink step-end 0s infinite; + -ms-animation: 1s blink step-end 0s infinite; + -o-animation: 1s blink step-end 0s infinite; + animation: 1s blink step-end 0s infinite; + } @keyframes "blink" { - from, to { - background: black; - } - 50% { - background: transparent; - } + from, to { + background: black; + } + 50% { + background: transparent; + } } @-moz-keyframes blink { - from, to { - background: black; - } - 50% { - background: transparent; - } + from, to { + background: black; + } + 50% { + background: transparent; + } } @-webkit-keyframes "blink" { - from, to { - background: black; - } - 50% { - background: transparent; - } + from, to { + background: black; + } + 50% { + background: transparent; + } } @-ms-keyframes "blink" { - from, to { - background: black; - } - 50% { - background: transparent; - } + from, to { + background: black; + } + 50% { + background: transparent; + } } @-o-keyframes "blink" { - from, to { - background: black; - } - 50% { - background: transparent; - } + from, to { + background: black; + } + 50% { + background: transparent; + } } .clipboard-container { @@ -628,13 +628,13 @@ a.leaflet-control-buttons:hover:first-child { height: 0px; z-index: 100; opacity: 0; -} + } .clipboard { width: 1px; height: 1px; padding: 0px; -} + } .resize-detector { position: absolute; @@ -642,132 +642,132 @@ a.leaflet-control-buttons:hover:first-child { height: 100%; z-index: 0; border: none; -} + } .spreadsheet-document { - border-top: 1px solid #B6B6B6 !important; - top: 100px !important; - left: 50px !important; + border-top: 1px solid #B6B6B6 !important; + top: 100px !important; + left: 50px !important; bottom: 20px !important; - } + } .spreadsheet-container-column { - position: absolute; - left: 0px; - top: 80px; - width: 100%; - height: 20px; - margin: 0px; - padding: 0px; - } + position: absolute; + left: 0px; + top: 80px; + width: 100%; + height: 20px; + margin: 0px; + padding: 0px; + } .spreadsheet-container-table { - table-layout: fixed; - width: 100%; - height: 100%; - border-spacing: 0px; - border-collapse: collapse; - border-width: 0px; - margin: 0px; - padding: 0px; - } + table-layout: fixed; + width: 100%; + height: 100%; + border-spacing: 0px; + border-collapse: collapse; + border-width: 0px; + margin: 0px; + padding: 0px; + } .spreadsheet-table-corner { - table-layout: fixed; - width: 100%; - height: 100%; - border-spacing: 0px; - margin: 0px; - padding: 0px; - border: 1px solid black; - background-color: darkgrey; - } + table-layout: fixed; + width: 100%; + height: 100%; + border-spacing: 0px; + margin: 0px; + padding: 0px; + border: 1px solid black; + background-color: darkgrey; + } .spreadsheet-container-th-corner { - padding: 0px; - margin: 0px; - width: 50px; - height: 20px; - } + padding: 0px; + margin: 0px; + width: 50px; + height: 20px; + } .spreadsheet-container-th-column { - padding: 0px; - margin: 0px; - border-width: 0px; - overflow: hidden; - } + padding: 0px; + margin: 0px; + border-width: 0px; + overflow: hidden; + } .spreadsheet-table-column { - table-layout: fixed; - left: 0px; - width: 100%; - height: 100%; - border-spacing: 0px; - position: relative; - margin: 0px; - padding: 0px; - } + table-layout: fixed; + left: 0px; + width: 100%; + height: 100%; + border-spacing: 0px; + position: relative; + margin: 0px; + padding: 0px; + } .spreadsheet-table-column-cell { - border-left: 0px; - border-right: 1px solid black; - border-top: 1px solid black; - border-bottom: 1px solid black; - background-color: darkgrey; - overflow: hidden; - font-size: 90%; - padding: 0px; - margin: 0px; - } + border-left: 0px; + border-right: 1px solid black; + border-top: 1px solid black; + border-bottom: 1px solid black; + background-color: darkgrey; + overflow: hidden; + font-size: 90%; + padding: 0px; + margin: 0px; + } .spreadsheet-table-column-cell-text { - text-overflow: ellipsis; - white-space: nowrap; - padding: 0px; - margin: 0px; - } + text-overflow: ellipsis; + white-space: nowrap; + padding: 0px; + margin: 0px; + } .spreadsheet-table-row-cell-text { - text-overflow: ellipsis; - white-space: nowrap; - padding: 0px; - margin: 0px; - height: 100%; - } + text-overflow: ellipsis; + white-space: nowrap; + padding: 0px; + margin: 0px; + height: 100%; + } .spreadsheet-container-row { - position: absolute; - left: 0; - top: 100px; - width: 50px; - bottom: 20px; - overflow: hidden; - } + position: absolute; + left: 0; + top: 100px; + width: 50px; + bottom: 20px; + overflow: hidden; + } .spreadsheet-table-row { - table-layout: fixed; - width: 100%; - height: 100%; - border-spacing: 0px !important; - position: relative; - margin: 0px; - padding: 0px; - } + table-layout: fixed; + width: 100%; + height: 100%; + border-spacing: 0px !important; + position: relative; + margin: 0px; + padding: 0px; + } .spreadsheet-table-row-cell { - border-top: 0px; - border-left: 1px solid black; - border-right: 1px solid black; - border-bottom: 1px solid black; - background-color: darkgrey; - font-size: 90%; - padding: 0px; - margin: 0px; - overflow: hidden; - } + border-top: 0px; + border-left: 1px solid black; + border-right: 1px solid black; + border-bottom: 1px solid black; + background-color: darkgrey; + font-size: 90%; + padding: 0px; + margin: 0px; + overflow: hidden; + } .slide-show { background: #FFF; display: block; margin: 0 auto; -} + } commit d9d201e74e4ff42861e3804880e2ca57d4f105b6 Author: Mihai Varga <mihai.va...@collabora.com> Date: Tue Dec 15 15:33:53 2015 +0200 loleaflet: individual css files for our additions to leaflet diff --git a/loleaflet/debug/document/document_simple_example.html b/loleaflet/debug/document/document_simple_example.html index 34352ae..be06964 100644 --- a/loleaflet/debug/document/document_simple_example.html +++ b/loleaflet/debug/document/document_simple_example.html @@ -7,6 +7,13 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <link rel="stylesheet" href="../../dist/leaflet.css"> +<link rel="stylesheet" href="../../dist/selectionMarkers.css"> +<link rel="stylesheet" href="../../dist/loleaflet.css"> +<link rel="stylesheet" href="../../dist/toolbar.css"> +<link rel="stylesheet" href="../../dist/partsPreviewControl.css"> +<link rel="stylesheet" href="../../dist/scrollBar.css"> +<link rel="stylesheet" href="../../dist/searchControl.css"> +<link rel="stylesheet" href="../../dist/tabsControl.css"> <link rel="stylesheet" href="../../plugins/draw-0.2.4/dist/leaflet.draw.css"> <link rel="stylesheet" href="../../src/scrollbar/jquery.mCustomScrollbar.css"> <link rel="stylesheet" href="../../dist/dialog/vex.css" /> diff --git a/loleaflet/dist/leaflet.css b/loleaflet/dist/leaflet.css index 8472eb3..4199cfe 100644 --- a/loleaflet/dist/leaflet.css +++ b/loleaflet/dist/leaflet.css @@ -41,20 +41,6 @@ display: block; } -.leaflet-selection-marker-start { - margin-left: -28px; - width: 30px; - height: 44px; - background-image: url(images/handle_start.png); - } - -.leaflet-selection-marker-end { - margin-left: -2px; - width: 30px; - height: 44px; - background-image: url(images/handle_end.png); - } - /* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */ /* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */ .leaflet-container svg, @@ -573,48 +559,6 @@ a.leaflet-control-buttons:hover:first-child { border: 1px solid #666; } -#document-container { - border-top: 2px solid #B6B6B6; - background: #DFDFDF; - position: absolute; - top: 70px; - bottom: 0px; - right: 0px; - left: 0px; -} - -#map -.scroll-container { - position: absolute; - left: 0; - top: 0; - right: 0; - bottom: 0; -} - -.scroll-container { - height: 100%; - width: 100%; - overflow: auto; -} - -#map { - top: 0px; - bottom: 16px; - left: 0px; - right: 16px; - z-index: 10; -} - -.search-not-found { - background-color: red; - -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; - -} - .leaflet-cursor { position: absolute; text-align: center; @@ -685,6 +629,7 @@ a.leaflet-control-buttons:hover:first-child { z-index: 100; opacity: 0; } + .clipboard { width: 1px; height: 1px; @@ -699,44 +644,6 @@ a.leaflet-control-buttons:hover:first-child { border: none; } -.parts-preview-document { - left: 195px !important; -} - -.parts-preview { - background: #DFDFDF; - position: absolute; - top: 70px; - left: 0px; - bottom: 0px; - max-width: 205px; - overflow: hidden; - border-top: 2px solid #B6B6B6; -} - -.preview-frame { - max-width: 190px; - white-space: nowrap; - text-align: center; margin: 1em 0; - } - -.preview-helper { - display: inline-block; - height: 100%; - vertical-align: middle; - } - -.preview-img { - vertical-align: middle; - max-width: 180px; - cursor: pointer; - border: 2px solid #dfdfdf; - } - -.preview-img-selected { - border-color: #000000; -} - .spreadsheet-document { border-top: 1px solid #B6B6B6 !important; top: 100px !important; @@ -859,106 +766,6 @@ a.leaflet-control-buttons:hover:first-child { overflow: hidden; } -.spreadsheet-tab { - margin: 0; - padding: 0; - bottom: 0; - position: absolute; - cursor: pointer; - } - -.spreadsheet-tab li { - float: left; - list-style: none; - margin: 0; - padding: 0; - margin-left: 2px; - } - -.spreadsheet-tab li { - display: block; - border: #B9B9B9 1px solid; - background: #A8A8A8; - color: #FFFFFF; - text-decoration: none; - } - -.spreadsheet-tab li.selected { - background: #FFFFFF; - color: #7E7E7E; - border-top: #FFF 1px solid; - } - -#toolbar { - position: fixed; - top: 0; - left: 0; - right: 0; - padding-bottom: 15px; - text-align: center; -} - -.leaflet-bar a { - float: left; -} - -div .leaflet-bar a:last-child { - border-bottom: 1px solid #ccc; -} - -.leaflet-control-editviewswitch.leaflet-bar -, leaflet-control-search.leaflet-bar { - -} - -label.leaflet-control-editviewswitch { - padding: 0.2em 0.4em 0.2em 0em; -} - -input.leaflet-control-search-bar { - padding: 0.3em; - max-width: 100px; -} - -.leaflet-control-fonts-container { - display: inline; -} - -select { - padding: 0.2em 0.4em 0.4em 0em; - background-color: white; -} - -.leaflet-control-zoom.leaflet-bar { - margin-left: 0.5em; -} - -div.leaflet-control-zoom leaflet-bar { - width: 53px; -} - -button.leaflet-control-search-prev { - margin-left: 0.2em; -} - -button.leaflet-control-search-next -, leaflet-control-search-cancel { - margin-right: 0.2em; -} - -#toolbar label -, .leaflet-control-search { - background-color: #fff; -} - -div .leaflet-bar a:first-child { - border-radius: 4px 0 0 4px; -} - -div .leaflet-bar a:last-child { - border-radius: 0 4px 4px 0; -} - .slide-show { background: #FFF; display: block; diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css new file mode 100644 index 0000000..854634e --- /dev/null +++ b/loleaflet/dist/loleaflet.css @@ -0,0 +1,18 @@ +#document-container { + border-top: 2px solid #B6B6B6; + background: #DFDFDF; + position: absolute; + top: 70px; + bottom: 0px; + right: 0px; + left: 0px; +} + +#map { + position: absolute; + top: 0px; + bottom: 16px; + left: 0px; + right: 16px; + z-index: 10; +} diff --git a/loleaflet/dist/partsPreviewControl.css b/loleaflet/dist/partsPreviewControl.css new file mode 100644 index 0000000..09369e9 --- /dev/null +++ b/loleaflet/dist/partsPreviewControl.css @@ -0,0 +1,37 @@ +.parts-preview-document { + left: 195px !important; +} + +.parts-preview { + background: #DFDFDF; + position: absolute; + top: 70px; + left: 0px; + bottom: 0px; + max-width: 205px; + overflow: hidden; + border-top: 2px solid #B6B6B6; +} + +.preview-frame { + max-width: 190px; + white-space: nowrap; + text-align: center; margin: 1em 0; + } + +.preview-helper { + display: inline-block; + height: 100%; + vertical-align: middle; + } + +.preview-img { + vertical-align: middle; + max-width: 180px; + cursor: pointer; + border: 2px solid #dfdfdf; + } + +.preview-img-selected { + border-color: #000000; +} diff --git a/loleaflet/dist/scrollBar.css b/loleaflet/dist/scrollBar.css new file mode 100644 index 0000000..87ba215 --- /dev/null +++ b/loleaflet/dist/scrollBar.css @@ -0,0 +1,13 @@ +.scroll-container { + position: absolute; + left: 0; + top: 0; + right: 0; + bottom: 0; +} + +.scroll-container { + height: 100%; + width: 100%; + overflow: auto; +} diff --git a/loleaflet/dist/searchControl.css b/loleaflet/dist/searchControl.css new file mode 100644 index 0000000..85928da --- /dev/null +++ b/loleaflet/dist/searchControl.css @@ -0,0 +1,8 @@ +.search-not-found { + background-color: red; + -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; + +} diff --git a/loleaflet/dist/selectionMarkers.css b/loleaflet/dist/selectionMarkers.css new file mode 100644 index 0000000..109d2f7 --- /dev/null +++ b/loleaflet/dist/selectionMarkers.css @@ -0,0 +1,13 @@ +.leaflet-selection-marker-start { + margin-left: -28px; + width: 30px; + height: 44px; + background-image: url(images/handle_start.png); + } + +.leaflet-selection-marker-end { + margin-left: -2px; + width: 30px; + height: 44px; + background-image: url(images/handle_end.png); + } diff --git a/loleaflet/dist/tabsControl.css b/loleaflet/dist/tabsControl.css new file mode 100644 index 0000000..030cb95 --- /dev/null +++ b/loleaflet/dist/tabsControl.css @@ -0,0 +1,29 @@ +.spreadsheet-tab { + margin: 0; + padding: 0; + bottom: 0; + position: absolute; + cursor: pointer; + } + +.spreadsheet-tab li { + float: left; + list-style: none; + margin: 0; + padding: 0; + margin-left: 2px; + } + +.spreadsheet-tab li { + display: block; + border: #B9B9B9 1px solid; + background: #A8A8A8; + color: #FFFFFF; + text-decoration: none; + } + +.spreadsheet-tab li.selected { + background: #FFFFFF; + color: #7E7E7E; + border-top: #FFF 1px solid; + } diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css new file mode 100644 index 0000000..7859934 --- /dev/null +++ b/loleaflet/dist/toolbar.css @@ -0,0 +1,64 @@ +#toolbar { + position: fixed; + top: 0; + left: 0; + right: 0; + padding-bottom: 15px; + text-align: center; +} + +.leaflet-bar a { + float: left; +} + +div .leaflet-bar a:last-child { + border-bottom: 1px solid #ccc; +} + +.leaflet-control-zoom.leaflet-bar { + margin-left: 0.5em; +} + +div.leaflet-control-zoom leaflet-bar { + width: 53px; +} + +div .leaflet-bar a:first-child { + border-radius: 4px 0 0 4px; +} + +div .leaflet-bar a:last-child { + border-radius: 0 4px 4px 0; +} + +label.leaflet-control-editviewswitch { + padding: 0.2em 0.4em 0.2em 0em; +} + +input.leaflet-control-search-bar { + padding: 0.3em; + max-width: 100px; +} + +.leaflet-control-fonts-container { + display: inline; +} + +select { + padding: 0.2em 0.4em 0.4em 0em; + background-color: white; +} + +button.leaflet-control-search-prev { + margin-left: 0.2em; +} + +button.leaflet-control-search-next +, leaflet-control-search-cancel { + margin-right: 0.2em; +} + +#toolbar label +, .leaflet-control-search { + background-color: #fff; +} _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits