Merge style-improvements
This commit is contained in:
commit
7d10107ce8
@ -30,7 +30,7 @@ OCP\App::addNavigationEntry(array(
|
||||
'id' => 'documents_index',
|
||||
'order' => 80,
|
||||
'href' => OCP\Util::linkTo('documents', 'index.php'),
|
||||
'icon' => OCP\Util::imagePath('documents', 'documents.png'),
|
||||
'icon' => OCP\Util::imagePath('documents', 'documents.svg'),
|
||||
'name' => 'Documents')
|
||||
);
|
||||
|
||||
|
@ -31,7 +31,6 @@ html, body, #mainContainer {
|
||||
text-align: center;
|
||||
background-color: #FAFAFA;
|
||||
overflow: auto;
|
||||
|
||||
position: absolute;
|
||||
top: 30px;
|
||||
bottom: 0;
|
||||
|
@ -9,8 +9,10 @@
|
||||
display: inline-block;
|
||||
height: 200px;
|
||||
width: 200px;
|
||||
background-color: #e8e8e8;
|
||||
margin: 1em;
|
||||
vertical-align: top;
|
||||
border-radius: 5px;
|
||||
}
|
||||
.add-document a {
|
||||
display: inline-block;
|
||||
@ -31,17 +33,26 @@
|
||||
position: absolute;
|
||||
bottom: 5px;
|
||||
width: 100%;
|
||||
color: white;
|
||||
text-shadow: 0 0 10px #000;
|
||||
font-weight: normal;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.documentslist .document {
|
||||
display: inline-block;
|
||||
height: 200px;
|
||||
width: 200px;
|
||||
background-color: #e8e8e8;
|
||||
margin: 1em;
|
||||
vertical-align: top;
|
||||
border-radius: 5px;
|
||||
}
|
||||
.documentslist .document:hover,
|
||||
.documentslist .document:focus,
|
||||
.documentslist .add-document:hover,
|
||||
.documentslist .add-document:focus {
|
||||
background-color: #ddd;
|
||||
}
|
||||
|
||||
.documentslist .session-active {
|
||||
position: relative;
|
||||
margin-left: 128px;
|
||||
@ -61,9 +72,15 @@
|
||||
position: absolute;
|
||||
bottom: 5px;
|
||||
width: 100%;
|
||||
color: white;
|
||||
text-shadow: 0 0 10px #000;
|
||||
font-weight: normal;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
text-align: center;
|
||||
padding: 0 8px;
|
||||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
#odf-toolbar{
|
||||
@ -86,16 +103,11 @@
|
||||
margin-left:-50%;
|
||||
}
|
||||
#odf-close{
|
||||
float:left;
|
||||
}
|
||||
|
||||
#odf-invite{
|
||||
float: right;
|
||||
}
|
||||
|
||||
#mainContainer #collaboration{
|
||||
float:right;position: relative;z-index: 1;
|
||||
width: 70px;padding:5px;
|
||||
#odf-invite{
|
||||
float: left;
|
||||
}
|
||||
|
||||
#invite-block{
|
||||
@ -124,10 +136,11 @@
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
filter:alpha(opacity=30);
|
||||
opacity: 0.3;
|
||||
opacity: .3;
|
||||
z-index: 1000;
|
||||
background: #000 url('%webroot%/core/img/loading-dark.gif') 50% 50% no-repeat;
|
||||
background: #111 url('%webroot%/core/img/loading-dark.gif') 50% 50% no-repeat;
|
||||
}
|
||||
|
||||
#documents-overlay-below{
|
||||
left:0;
|
||||
top:0;
|
||||
@ -137,10 +150,6 @@
|
||||
z-index: 999;
|
||||
}
|
||||
|
||||
#members{
|
||||
padding-top: 3em !important;
|
||||
}
|
||||
|
||||
#file_upload_start{
|
||||
position:relative;
|
||||
left:0; top:0; width:200px; height:200px;
|
||||
@ -150,3 +159,29 @@
|
||||
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0;
|
||||
z-index:20;
|
||||
}
|
||||
|
||||
|
||||
/* override WebODF styling here */
|
||||
|
||||
#mainContainer #collaboration{
|
||||
float:right;position: relative;z-index: 1;
|
||||
width: 70px;padding:5px;
|
||||
}
|
||||
|
||||
#members{
|
||||
padding-top: 3em !important;
|
||||
}
|
||||
|
||||
#editor {
|
||||
box-shadow: 0px 0px 14px #555 !important;
|
||||
}
|
||||
|
||||
#toolbar {
|
||||
border-bottom: none !important;
|
||||
padding: 6px 0 !important;
|
||||
}
|
||||
|
||||
#container {
|
||||
background-color: #ddd !important;
|
||||
top: 38px !important;
|
||||
}
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 328 B After Width: | Height: | Size: 403 B |
@ -1,128 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="32"
|
||||
height="32"
|
||||
id="svg3349"
|
||||
version="1.1"
|
||||
inkscape:version="0.48.3.1 r9886"
|
||||
sodipodi:docname="files.svg"
|
||||
inkscape:export-filename="files.png"
|
||||
inkscape:export-xdpi="90"
|
||||
inkscape:export-ydpi="90">
|
||||
<defs
|
||||
id="defs3351">
|
||||
<linearGradient
|
||||
id="linearGradient3754">
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop3756" />
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:0.70779222;"
|
||||
offset="1"
|
||||
id="stop3758" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
y2="1013.451"
|
||||
x2="209.34245"
|
||||
y1="998.45801"
|
||||
x1="209.34245"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
id="linearGradient3528"
|
||||
xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
|
||||
inkscape:collect="always" />
|
||||
<linearGradient
|
||||
id="linearGradient3587-6-5-3-4-5-4-0-1-55-2">
|
||||
<stop
|
||||
offset="0"
|
||||
style="stop-color:#000000;stop-opacity:1"
|
||||
id="stop3589-9-2-2-3-2-53-4-3-95-4" />
|
||||
<stop
|
||||
offset="1"
|
||||
style="stop-color:#363636;stop-opacity:1"
|
||||
id="stop3591-7-4-73-7-9-86-9-3-6-3" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient3587-6-5-2-1">
|
||||
<stop
|
||||
id="stop3589-9-2-8-2"
|
||||
style="stop-color:#000000;stop-opacity:1"
|
||||
offset="0" />
|
||||
<stop
|
||||
id="stop3591-7-4-0-2"
|
||||
style="stop-color:#363636;stop-opacity:1"
|
||||
offset="1" />
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="16"
|
||||
inkscape:cx="9.6005683"
|
||||
inkscape:cy="17.34375"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="true"
|
||||
fit-margin-top="0"
|
||||
fit-margin-left="0"
|
||||
fit-margin-right="0"
|
||||
fit-margin-bottom="0"
|
||||
inkscape:window-width="1280"
|
||||
inkscape:window-height="773"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="-1"
|
||||
inkscape:window-maximized="1">
|
||||
<inkscape:grid
|
||||
type="xygrid"
|
||||
id="grid4530"
|
||||
empspacing="4"
|
||||
visible="true"
|
||||
enabled="true"
|
||||
snapvisiblegridlinesonly="true"
|
||||
dotted="true" />
|
||||
</sodipodi:namedview>
|
||||
<metadata
|
||||
id="metadata3354">
|
||||
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
|
||||
<metadata>
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<cc:Work rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
|
||||
<dc:title/>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(573.14286,110.2963)">
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
d="m -570.22204,-108.29572 c -0.50115,0 -0.92082,0.41966 -0.92082,0.92081 l 0,24.157882 c 0,0.51739 0.40324,0.920728 0.92082,0.920728 l 26.15768,0 c 0.51756,0 0.92081,-0.403165 0.92081,-0.920728 l 6.9e-4,-14.154116 c 0,-0.501097 -0.41966,-0.925235 -0.92081,-0.925235 l -21.07897,0 -7e-4,11.004713 c 0,0.480123 -0.52409,0.97706 -1.00422,0.97706 -0.48012,0 -0.99573,-0.496937 -0.99573,-0.97706 l 7e-4,-12.142797 c 0,-0.480124 0.40484,-0.862147 0.88497,-0.862147 l 4.59443,0 14.52051,5.2e-4 -7e-4,-2.95163 c 0,-0.56713 -0.42551,-1.04812 -0.99245,-1.04812 l -13.00724,0 0,-3.07907 c 0,-0.50118 -0.40586,-0.92081 -0.90701,-0.92081 z"
|
||||
id="path5073"
|
||||
sodipodi:nodetypes="ccccccccccsccccccccccc"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
|
||||
<path
|
||||
style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline"
|
||||
sodipodi:nodetypes="ccccccccccsccccccccccc"
|
||||
id="rect3845-5"
|
||||
d="m -570.22204,-107.2957 c -0.50115,0 -0.92082,0.41966 -0.92082,0.92081 l 0,24.157884 c 0,0.51739 0.40324,0.920728 0.92082,0.920728 l 26.15768,0 c 0.51756,0 0.92081,-0.403165 0.92081,-0.920728 l 6.9e-4,-14.154116 c 0,-0.501097 -0.41966,-0.925235 -0.92081,-0.925235 l -21.07897,0 -7e-4,11.004713 c 0,0.480123 -0.52409,0.97706 -1.00422,0.97706 -0.48012,0 -0.99573,-0.496937 -0.99573,-0.97706 l 7e-4,-12.142797 c 0,-0.480124 0.40484,-0.862143 0.88497,-0.862143 l 4.59443,0 14.52051,5.2e-4 -7e-4,-2.951636 c 0,-0.56713 -0.42551,-1.04812 -0.99245,-1.04812 l -13.00724,0 0,-3.07907 c 0,-0.50118 -0.40586,-0.92081 -0.90701,-0.92081 z"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<defs></defs>
|
||||
<path opacity="0.9" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;" d="M5.7001,1.0041c-0.3949,0.0765-0.7071,0.4666-0.7,0.8748v26.246c0,0.458,0.4105,0.875,0.8616,0.875h20.278c0.4511-0.000012,0.86025-0.4168,0.86027-0.87489v-20.286c-0.007-0.1337-0.042-0.2658-0.106-0.3828-1.931-2.7792-4.071-4.8382-6.623-6.3976-0.086-0.0327-0.178-0.0512-0.27-0.0547h-14.139c-0.053686-0.0052-0.10786-0.0052-0.16155,0zm11.3,4.996c0-0.4714,0.5286-1,1-1h1v4h4v1c0,0.4714-0.5286,1-1,1h-4c-0.4714,0-1-0.5286-1-1,0-0.92823,0.000003-2.9834,0-4z" fill="#000"/>
|
||||
<path opacity="0.1" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;" d="M5.7001,3.0041c-0.3949,0.0765-0.7071,0.4666-0.7,0.8748v26.246c0,0.458,0.4105,0.875,0.8616,0.875h20.278c0.4511-0.000012,0.86025-0.4168,0.86027-0.87489v-20.286c-0.007-0.1337-0.042-0.2658-0.106-0.3828-1.931-2.7792-4.071-4.8382-6.623-6.3976-0.086-0.0327-0.178-0.0512-0.27-0.0547h-14.139c-0.053686-0.0052-0.10786-0.0052-0.16155,0zm11.3,4.996c0-0.4714,0.5286-1,1-1h1v4h4v1c0,0.4714-0.5286,1-1,1h-4c-0.4714,0-1-0.5286-1-1,0-0.92823,0.000003-2.9834,0-4z" fill="#FFF"/>
|
||||
<rect style="color:#000000;" fill-opacity="0" height="97.986" width="163.31" y="-16.993" x="-62.897"/>
|
||||
<path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;" d="M5.7001,2.0041c-0.3949,0.0765-0.7071,0.4666-0.7,0.8748v26.246c0,0.458,0.4105,0.875,0.8616,0.875h20.278c0.4511-0.000012,0.86025-0.4168,0.86027-0.87489v-20.286c-0.007-0.1337-0.042-0.2658-0.106-0.3828-1.931-2.7792-4.071-4.8382-6.623-6.3976-0.086-0.0327-0.178-0.0512-0.27-0.0547h-14.139c-0.053686-0.0052-0.10786-0.0052-0.16155,0zm11.3,4.996c0-0.4714,0.5286-1,1-1h1v4h4v1c0,0.4714-0.5286,1-1,1h-4c-0.4714,0-1-0.5286-1-1,0-0.92823,0.000003-2.9834,0-4z" fill="#FFF"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 2.2 KiB |
Loading…
x
Reference in New Issue
Block a user