diff options
author | Andrew Dolgov <[email protected]> | 2017-12-11 09:06:38 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2017-12-11 09:06:38 +0300 |
commit | f443cebd219878a5d591171c1c79b93f982fb1e0 (patch) | |
tree | 4ee87ca26c7bed5a6bf687fa616262c7563a9a4c /org.fox.ttrss | |
parent | bf5528dd5e245276af373b615d35c1f18b98f769 (diff) |
sync accent colors with trunk
Diffstat (limited to 'org.fox.ttrss')
-rw-r--r-- | org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png | bin | 18306 -> 18004 bytes | |||
-rw-r--r-- | org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header.png | bin | 35380 -> 36635 bytes | |||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/colors.xml | 2 | ||||
-rwxr-xr-x | org.fox.ttrss/src/main/res/values/style.xml | 4 | ||||
-rw-r--r-- | org.fox.ttrss/src_drawable/s_drawer_header.svg | 45 |
5 files changed, 15 insertions, 36 deletions
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png Binary files differindex 8c733c4b..d556700b 100644 --- a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png +++ b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header.png Binary files differindex 2163ae96..80c578ba 100644 --- a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header.png +++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header.png diff --git a/org.fox.ttrss/src/main/res/values/colors.xml b/org.fox.ttrss/src/main/res/values/colors.xml index 478e24ac..85910101 100755 --- a/org.fox.ttrss/src/main/res/values/colors.xml +++ b/org.fox.ttrss/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <item name="window_background" type="color">#FF526A8E</item> + <item name="window_background" type="color">#257eae</item> <item name="window_background_dark" type="color">#FF455A64</item> </resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index 71c8b612..5982b87b 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -39,8 +39,8 @@ <item name="headlineFooterColor">?colorPrimary</item> <item name="articleHeaderSeparator">#cccccc</item> - <item name="colorPrimary">#6482af</item> - <item name="colorPrimaryDark">#526A8E</item> + <item name="colorPrimary">#257eae</item> + <item name="colorPrimaryDark">#216d96</item> <item name="colorAccent">#F4511E</item> <item name="ic_rss_box">@drawable/ic_rss_box_dark</item> diff --git a/org.fox.ttrss/src_drawable/s_drawer_header.svg b/org.fox.ttrss/src_drawable/s_drawer_header.svg index b5bc1407..d613c406 100644 --- a/org.fox.ttrss/src_drawable/s_drawer_header.svg +++ b/org.fox.ttrss/src_drawable/s_drawer_header.svg @@ -15,10 +15,10 @@ id="svg2" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="blahblah.svg" - inkscape:export-filename="C:\Users\fox\Documents\Projects\tt-rss-android\org.fox.ttrss\src\main\res\drawable-xxhdpi\drawer_header.png" - inkscape:export-xdpi="307.20001" - inkscape:export-ydpi="307.20001"> + sodipodi:docname="s_drawer_header.svg" + inkscape:export-filename="C:\Users\fox\Projects\tt-rss-android\org.fox.ttrss\src\main\res\drawable-xxhdpi\drawer_header.png" + inkscape:export-xdpi="307.5" + inkscape:export-ydpi="307.5"> <defs id="defs4"> <filter @@ -158,7 +158,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="2.8" - inkscape:cx="52.474107" + inkscape:cx="107.011" inkscape:cy="70.376366" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -167,8 +167,8 @@ borderlayer="true" inkscape:window-width="1920" inkscape:window-height="1137" - inkscape:window-x="-9" - inkscape:window-y="-9" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" /> <metadata id="metadata7"> @@ -178,7 +178,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -188,43 +188,22 @@ id="layer1" transform="translate(0,-932.36214)"> <path - style="fill:#c1cddf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:#c6e3f3;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 96.7857,905.93357 63.21428,60.35714 -55.35714,95.71429 -32.857141,-1.0714 z" id="path4208" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" /> <path - style="fill:#3a4b64;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + style="fill:#1d6185;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 198.57141,994.505 64.64286,68.9286 -126.78572,-2.5 z" id="path4162" inkscape:connector-curvature="0" /> <path - style="fill:#6482af;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4234)" + style="fill:#2374a1;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4234)" d="M 219.2857,1007.3621 71.071414,1113.0764 161.78572,948.79071 Z" id="path4154" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc" /> - <rect - style="opacity:1;fill:#6482af;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4136" - width="18.214285" - height="16.428572" - x="-104.28573" - y="839.14783" /> - <rect - style="opacity:1;fill:#526a8e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4138" - width="18.928572" - height="19.642857" - x="-81.071442" - y="834.14783" /> - <rect - style="opacity:1;fill:#f4511e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect4140" - width="15" - height="20.357143" - x="-56.428585" - y="834.86212" /> <path style="fill:#ab2f08;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 58.214271,1057.3621 -62.1428577,0.3572 -0.7142858,-157.14287 24.6428575,-0.71429 z" @@ -237,7 +216,7 @@ inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" /> <path - style="fill:#526a8e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4306)" + style="fill:#257eae;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4306)" d="m 83.571414,898.07643 163.214276,159.99997 63.21429,-0.7143 -3.57143,-161.42853 z" id="path4142" inkscape:connector-curvature="0" /> |