Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
Weblate
commit
9f7823f2df
|
|
@ -270,7 +270,7 @@ module.exports = React.createClass({
|
||||||
clickPhase={this.Phase.GroupMemberList}
|
clickPhase={this.Phase.GroupMemberList}
|
||||||
analytics={['Right Panel', 'Group Member List Button', 'click']}
|
analytics={['Right Panel', 'Group Member List Button', 'click']}
|
||||||
/>,
|
/>,
|
||||||
<HeaderButton key="_roomsButton" title={_t('Rooms')} iconSrc="img/icons-files.svg"
|
<HeaderButton key="_roomsButton" title={_t('Rooms')} iconSrc="img/icons-room.svg"
|
||||||
isHighlighted={this.state.phase === this.Phase.GroupRoomList}
|
isHighlighted={this.state.phase === this.Phase.GroupRoomList}
|
||||||
clickPhase={this.Phase.GroupRoomList}
|
clickPhase={this.Phase.GroupRoomList}
|
||||||
analytics={['Right Panel', 'Group Room List Button', 'click']}
|
analytics={['Right Panel', 'Group Room List Button', 'click']}
|
||||||
|
|
@ -328,7 +328,7 @@ module.exports = React.createClass({
|
||||||
) : (
|
) : (
|
||||||
<AccessibleButton className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
|
<AccessibleButton className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
|
||||||
<div className="mx_RightPanel_icon" >
|
<div className="mx_RightPanel_icon" >
|
||||||
<TintableSvg src="img/icons-files.svg" width="35" height="35" />
|
<TintableSvg src="img/icons-room-add.svg" width="35" height="35" />
|
||||||
</div>
|
</div>
|
||||||
<div className="mx_RightPanel_message">{ _t('Add room to this group') }</div>
|
<div className="mx_RightPanel_message">{ _t('Add room to this group') }</div>
|
||||||
</AccessibleButton>
|
</AccessibleButton>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,159 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="25px"
|
||||||
|
height="25px"
|
||||||
|
viewBox="0 0 25 25"
|
||||||
|
version="1.1"
|
||||||
|
id="svg4196"
|
||||||
|
inkscape:version="0.48.4 r9939"
|
||||||
|
sodipodi:docname="icons-room.svg">
|
||||||
|
<metadata
|
||||||
|
id="metadata4216">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title>81230A28-D944-4572-B5DB-C03CAA2B1FCA</dc:title>
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="1918"
|
||||||
|
inkscape:window-height="1050"
|
||||||
|
id="namedview4214"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="18.441345"
|
||||||
|
inkscape:cx="-1.0720921"
|
||||||
|
inkscape:cy="5.6865774"
|
||||||
|
inkscape:window-x="0"
|
||||||
|
inkscape:window-y="28"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="text3879"
|
||||||
|
inkscape:snap-object-midpoints="true"
|
||||||
|
inkscape:snap-global="true"
|
||||||
|
inkscape:snap-bbox="true"
|
||||||
|
inkscape:bbox-paths="false"
|
||||||
|
inkscape:snap-bbox-midpoints="true"
|
||||||
|
inkscape:snap-page="true"
|
||||||
|
showguides="true"
|
||||||
|
inkscape:guide-bbox="true" />
|
||||||
|
<!-- Generator: sketchtool 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
|
||||||
|
<title
|
||||||
|
id="title4198">81230A28-D944-4572-B5DB-C03CAA2B1FCA</title>
|
||||||
|
<desc
|
||||||
|
id="desc4200">Created with sketchtool.</desc>
|
||||||
|
<defs
|
||||||
|
id="defs4202" />
|
||||||
|
<g
|
||||||
|
id="Symbols"
|
||||||
|
stroke="none"
|
||||||
|
stroke-width="1"
|
||||||
|
fill="none"
|
||||||
|
fill-rule="evenodd">
|
||||||
|
<g
|
||||||
|
id="Left-nav-default"
|
||||||
|
transform="translate(-50.000000, -725.000000)">
|
||||||
|
<g
|
||||||
|
id="Left-panel">
|
||||||
|
<g
|
||||||
|
id="g4207">
|
||||||
|
<g
|
||||||
|
id="icons_people"
|
||||||
|
transform="translate(50.000000, 725.000000)">
|
||||||
|
<path
|
||||||
|
d="M12.5,25 C19.4035594,25 25,19.4035594 25,12.5 C25,5.59644063 19.4035594,0 12.5,0 C5.59644063,0 0,5.59644063 0,12.5 C0,19.4035594 5.59644063,25 12.5,25 Z"
|
||||||
|
id="Oval-1-Copy-7"
|
||||||
|
fill="#76CFA6"
|
||||||
|
style="fill:#76cfa6;fill-opacity:1" />
|
||||||
|
<path
|
||||||
|
style="fill:#a0a0a0;stroke:none"
|
||||||
|
d="m 4.4538552,16.721536 c 0.680539,-0.0086 1.7786151,-0.0086 2.4401691,2.1e-5 0.6615541,0.0086 0.1047495,0.01567 -1.2373435,0.01565 -1.342093,-1.2e-5 -1.8833645,-0.0071 -1.2028256,-0.01567 z"
|
||||||
|
id="path3032"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<g
|
||||||
|
transform="matrix(1.0243293,0,0,0.97624855,-24.996028,0.15844144)"
|
||||||
|
style="font-size:20.13689613px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
|
||||||
|
id="text3879">
|
||||||
|
<g
|
||||||
|
id="g3249"
|
||||||
|
transform="matrix(0.69732039,0,0,0.73166379,24.402336,-0.16229621)"
|
||||||
|
style="opacity:1;fill:#de8787">
|
||||||
|
<g
|
||||||
|
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
|
||||||
|
id="g3183">
|
||||||
|
<g
|
||||||
|
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
|
||||||
|
id="g3169">
|
||||||
|
<g
|
||||||
|
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
|
||||||
|
id="g3156">
|
||||||
|
<g
|
||||||
|
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
|
||||||
|
id="Symbols-3">
|
||||||
|
<g
|
||||||
|
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
|
||||||
|
id="Right-panel/Footer"
|
||||||
|
transform="translate(-26,-34)">
|
||||||
|
<g
|
||||||
|
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
|
||||||
|
id="icon_invite_people"
|
||||||
|
transform="translate(26,34)">
|
||||||
|
<g
|
||||||
|
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
|
||||||
|
id="Group-5"
|
||||||
|
transform="translate(8,9)">
|
||||||
|
<g
|
||||||
|
style="opacity:0.80000000000000004;fill:none;fill-opacity:1;stroke-linecap:round;stroke:#ffffff;stroke-opacity:1"
|
||||||
|
id="Group-3"
|
||||||
|
transform="translate(14.4375,3.9375)">
|
||||||
|
<path
|
||||||
|
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
d="m 0,3.28125 6.5625,0"
|
||||||
|
id="Line" />
|
||||||
|
<path
|
||||||
|
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
d="m 3.28125,0 0,6.5625"
|
||||||
|
id="path3142" />
|
||||||
|
</g>
|
||||||
|
<g
|
||||||
|
style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
|
||||||
|
id="icons_people_svg" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
<path
|
||||||
|
d="m 37.394645,11.340164 -0.511365,2.634303 2.19267,0 0,0.999487 -2.378621,0 -0.650828,3.331619 -1.06147,0 0.650829,-3.331619 -2.34763,0 -0.635332,3.331619 -1.053721,0 0.619835,-3.331619 -2.029963,0 0,-0.999487 2.223663,0 0.52686,-2.634303 -2.146183,0 0,-0.98399 2.316638,0 0.635332,-3.3781075 1.076965,0 -0.635332,3.3781075 2.363126,0 0.650827,-3.3781075 1.038226,0 -0.650827,3.3781075 2.045459,0 0,0.98399 -2.239158,0 m -3.920464,2.634303 2.347629,0 0.511365,-2.634303 -2.347629,0 -0.511365,2.634303"
|
||||||
|
style="font-variant:normal;font-stretch:normal;fill:#ffffff;font-family:Open Sans;-inkscape-font-specification:Open Sans"
|
||||||
|
id="path3002"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 6.8 KiB |
|
|
@ -0,0 +1,109 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="25px"
|
||||||
|
height="25px"
|
||||||
|
viewBox="0 0 25 25"
|
||||||
|
version="1.1"
|
||||||
|
id="svg4196"
|
||||||
|
inkscape:version="0.48.4 r9939"
|
||||||
|
sodipodi:docname="lukes-icons-room.svg">
|
||||||
|
<metadata
|
||||||
|
id="metadata4216">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title>81230A28-D944-4572-B5DB-C03CAA2B1FCA</dc:title>
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<sodipodi:namedview
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1"
|
||||||
|
objecttolerance="10"
|
||||||
|
gridtolerance="10"
|
||||||
|
guidetolerance="10"
|
||||||
|
inkscape:pageopacity="0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:window-width="1918"
|
||||||
|
inkscape:window-height="1078"
|
||||||
|
id="namedview4214"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:zoom="13.04"
|
||||||
|
inkscape:cx="3.0259155"
|
||||||
|
inkscape:cy="11.779524"
|
||||||
|
inkscape:window-x="1920"
|
||||||
|
inkscape:window-y="0"
|
||||||
|
inkscape:window-maximized="0"
|
||||||
|
inkscape:current-layer="text3879"
|
||||||
|
inkscape:snap-object-midpoints="true"
|
||||||
|
inkscape:snap-global="true"
|
||||||
|
inkscape:snap-bbox="true"
|
||||||
|
inkscape:bbox-paths="false"
|
||||||
|
inkscape:snap-bbox-midpoints="true"
|
||||||
|
inkscape:snap-page="true"
|
||||||
|
showguides="true"
|
||||||
|
inkscape:guide-bbox="true">
|
||||||
|
<sodipodi:guide
|
||||||
|
orientation="0,1"
|
||||||
|
position="10.352761,19.555215"
|
||||||
|
id="guide4072" />
|
||||||
|
</sodipodi:namedview>
|
||||||
|
<!-- Generator: sketchtool 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
|
||||||
|
<title
|
||||||
|
id="title4198">81230A28-D944-4572-B5DB-C03CAA2B1FCA</title>
|
||||||
|
<desc
|
||||||
|
id="desc4200">Created with sketchtool.</desc>
|
||||||
|
<defs
|
||||||
|
id="defs4202" />
|
||||||
|
<g
|
||||||
|
id="Symbols"
|
||||||
|
stroke="none"
|
||||||
|
stroke-width="1"
|
||||||
|
fill="none"
|
||||||
|
fill-rule="evenodd">
|
||||||
|
<g
|
||||||
|
id="Left-nav-default"
|
||||||
|
transform="translate(-50.000000, -725.000000)">
|
||||||
|
<g
|
||||||
|
id="Left-panel">
|
||||||
|
<g
|
||||||
|
id="g4207">
|
||||||
|
<g
|
||||||
|
id="icons_people"
|
||||||
|
transform="translate(50.000000, 725.000000)">
|
||||||
|
<path
|
||||||
|
d="M12.5,25 C19.4035594,25 25,19.4035594 25,12.5 C25,5.59644063 19.4035594,0 12.5,0 C5.59644063,0 0,5.59644063 0,12.5 C0,19.4035594 5.59644063,25 12.5,25 Z"
|
||||||
|
id="Oval-1-Copy-7"
|
||||||
|
fill="#76CFA6"
|
||||||
|
style="fill:#76cfa6;fill-opacity:1" />
|
||||||
|
<path
|
||||||
|
style="fill:#a0a0a0;stroke:none"
|
||||||
|
d="m 4.4538552,16.721536 c 0.680539,-0.0086 1.7786151,-0.0086 2.4401691,2.1e-5 0.6615541,0.0086 0.1047495,0.01567 -1.2373435,0.01565 -1.342093,-1.2e-5 -1.8833645,-0.0071 -1.2028256,-0.01567 z"
|
||||||
|
id="path3032"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<g
|
||||||
|
transform="scale(1.0243293,0.97624855)"
|
||||||
|
style="font-size:20.13689613px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
|
||||||
|
id="text3879">
|
||||||
|
<path
|
||||||
|
d="m 15.354413,11.152262 -0.648943,3.343039 2.782589,0 0,1.268389 -3.018568,0 -0.825927,4.227962 -1.347049,0 0.825928,-4.227962 -2.979238,0 -0.8062628,4.227962 -1.3372158,0 0.7865976,-4.227962 -2.5761069,0 0,-1.268389 2.8219186,0 0.6686079,-3.343039 -2.7235939,0 0,-1.2487235 2.9399082,0 0.8062621,-4.2869564 1.366713,0 -0.806262,4.2869564 2.998903,0 0.825927,-4.2869564 1.317551,0 -0.825927,4.2869564 2.595772,0 0,1.2487235 -2.841584,0 m -4.975229,3.343039 2.979238,0 0.648943,-3.343039 -2.979238,0 -0.648943,3.343039"
|
||||||
|
style="font-variant:normal;font-stretch:normal;fill:#ffffff;font-family:Open Sans;-inkscape-font-specification:Open Sans"
|
||||||
|
id="path3002" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 4.2 KiB |
Loading…
Reference in New Issue