Unity

Merge lp:~unity-team/unity/match-designed-sizings into lp:unity

  1. match-designed-sizings
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 2681
Proposed branch: lp:~unity-team/unity/match-designed-sizings
Merge into: lp:unity
Diff against target: 251 lines (+62/-61)
11 files modified
dash/LensBar.cpp (+3/-1)
dash/PlacesGroup.cpp (+4/-3)
dash/previews/ActionButton.cpp (+1/-1)
plugins/unityshell/resources/lens-nav-app.svg (+12/-12)
plugins/unityshell/resources/lens-nav-file.svg (+3/-8)
plugins/unityshell/resources/lens-nav-gwibber.svg (+14/-0)
plugins/unityshell/resources/lens-nav-home.svg (+4/-4)
plugins/unityshell/resources/lens-nav-music.svg (+6/-11)
plugins/unityshell/resources/lens-nav-photo.svg (+6/-11)
plugins/unityshell/resources/lens-nav-video.svg (+8/-9)
unity-shared/PreviewStyle.cpp (+1/-1)
To merge this branch: bzr merge lp:~unity-team/unity/match-designed-sizings
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Xi Zhu (community) design Approve
John Lea design Pending
Review via email: mp+123745@code.launchpad.net

Commit message

Update sizing of elements to match designs, update assets

Description of the change

Update sizing of elements to match designs, plus assets update.

Trivial changes, no tests.

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

Please provide screenshots for the design team.

Revision history for this message
Michal Hruby (mhr3) wrote :

> Please provide screenshots for the design team.

They were the initiators of this change, so already saw them ;)

Revision history for this message
Andrea Azzarone (azzar1) wrote :

Ok let's wait design approval.

Btw I'm sure that one 24 in PlaceGroup.cpp was/is for the height of the focus highlight (that by design should be 24 iirc).

Revision history for this message
Xi Zhu (xi.zhu) :
review: Approve (design)
Revision history for this message
Andrea Azzarone (azzar1) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dash/LensBar.cpp'
2--- dash/LensBar.cpp 2012-08-09 14:28:50 +0000
3+++ dash/LensBar.cpp 2012-09-12 10:02:20 +0000
4@@ -31,7 +31,9 @@
5
6 nux::logging::Logger logger("unity.dash.lensbar");
7
8-const int LENSBAR_HEIGHT = 44;
9+// according to Q design the inner area of the lensbar should be 40px
10+// (without any borders)
11+const int LENSBAR_HEIGHT = 41;
12
13 }
14
15
16=== modified file 'dash/PlacesGroup.cpp'
17--- dash/PlacesGroup.cpp 2012-08-20 16:49:10 +0000
18+++ dash/PlacesGroup.cpp 2012-09-12 10:02:20 +0000
19@@ -58,6 +58,7 @@
20 const nux::Color kExpandDefaultTextColor(1.0f, 1.0f, 1.0f, 0.5f);
21 const float kExpandDefaultIconOpacity = 0.5f;
22
23+const int kCategoryIconSize = 22;
24 // Category highlight
25 const int kHighlightHeight = 24;
26 const int kHighlightRightPadding = 10 - 3; // -3 because the scrollbar is not a real overlay scrollbar!
27@@ -142,8 +143,8 @@
28 _header_layout->SetSpaceBetweenChildren(10);
29 _header_view->SetLayout(_header_layout);
30
31- _icon = new IconTexture("", 24);
32- _icon->SetMinMaxSize(24, 24);
33+ _icon = new IconTexture("", kCategoryIconSize);
34+ _icon->SetMinMaxSize(kCategoryIconSize, kCategoryIconSize);
35 _header_layout->AddView(_icon, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
36
37 _text_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
38@@ -277,7 +278,7 @@
39 void
40 PlacesGroup::SetIcon(std::string const& path_to_emblem)
41 {
42- _icon->SetByIconName(path_to_emblem, 24);
43+ _icon->SetByIconName(path_to_emblem, kCategoryIconSize);
44 }
45
46 void
47
48=== modified file 'dash/previews/ActionButton.cpp'
49--- dash/previews/ActionButton.cpp 2012-08-28 08:30:00 +0000
50+++ dash/previews/ActionButton.cpp 2012-09-12 10:02:20 +0000
51@@ -29,7 +29,7 @@
52
53 namespace
54 {
55-const int kMinButtonHeight = 36;
56+const int kMinButtonHeight = 34;
57 const int kMinButtonWidth = 48;
58
59 const int icon_size = 24;
60
61=== modified file 'plugins/unityshell/resources/lens-nav-app.svg'
62--- plugins/unityshell/resources/lens-nav-app.svg 2011-06-30 17:24:25 +0000
63+++ plugins/unityshell/resources/lens-nav-app.svg 2012-09-12 10:02:20 +0000
64@@ -1,17 +1,17 @@
65 <?xml version="1.0" encoding="utf-8"?>
66-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
67+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
68 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
69 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
70 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
71-<g>
72- <g>
73- <path fill="#FFFFFF" d="M9.5,21c0,0.55,0.45,1,1,1h3c0.55,0,1-0.45,1-1V8h-5V21z M6.5,2H3.501c-0.55,0-1,0.45-1,1L2.5,21
74- c0,0.55,0.45,1,1,1h2.999c0.55,0,1-0.45,1-1v-2.969H5.5v-1h1.999V14H5.5v-1h2v-3h-2V9h2V6h-2V5h2V3C7.5,2.45,7.05,2,6.5,2z
75- M7.5,10V9V10L7.5,10z M7.5,14v-1h0L7.5,14L7.5,14z M7.5,18.031v-1H7.499L7.5,18.031L7.5,18.031z M19,8.015
76- c1.104,0,2.5-1.119,2.5-2.5c0-0.933-1.408-2.79-2-3.515v1.515c0.293,0.174,0.5,0.48,0.5,0.847c0,0.553-0.447,1-1,1s-1-0.447-1-1
77- c0-0.366,0.207-0.673,0.5-0.847V2c-0.592,0.725-2,2.582-2,3.515C16.5,6.896,17.896,8.015,19,8.015z M9.438,7H14.5l-2.531-5
78- L9.438,7z M16.5,21c0,0.55,0.45,1,1,1h3c0.55,0,1-0.45,1-1V9h-5V21z"/>
79- </g>
80-</g>
81+<path fill="#FFFFFF" d="M14,8v12c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1V8H14z"/>
82+<path fill="#FFFFFF" d="M8,11H6v-1h2V8H6V7h2V4c0-0.55-0.45-1-1-1H5.001c-0.55,0-1,0.45-1,1L4,20c0,0.55,0.45,1,1,1h2
83+ c0.55,0,1-0.45,1-1v-3H6v-1h2v-2H6v-1h2V11z"/>
84+<path fill="#FFFFFF" d="M8,8L8,8V7l0,0V8z"/>
85+<path fill="#FFFFFF" d="M18.366,3v1.542C18.602,4.681,18.8,4.925,18.8,5.217c0,0.441-0.358,0.799-0.8,0.799s-0.8-0.358-0.8-0.799
86+ c0-0.292,0.198-0.537,0.433-0.675V3C17.16,3.578,16,5.26,16,6.005C16,7.106,17.116,8,18,8s2-0.894,2-1.995
87+ C20,5.26,18.84,3.578,18.366,3z"/>
88+<path fill="#FFFFFF" d="M20,9v11c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1V9H20z"/>
89+<path fill="#FFFFFF" d="M12.552,3.991c0.191,0.349,0.378,0.7,0.56,1.056c0.182,0.355,0.349,0.701,0.502,1.038
90+ C13.766,6.42,13.895,6.726,14,7h-4c0.105-0.262,0.234-0.561,0.387-0.897c0.153-0.336,0.318-0.682,0.495-1.038
91+ c0.177-0.354,0.36-0.71,0.552-1.065c0.191-0.355,0.377-0.688,0.559-1C12.175,3.312,12.36,3.642,12.552,3.991z"/>
92 </svg>
93-
94\ No newline at end of file
95
96=== modified file 'plugins/unityshell/resources/lens-nav-file.svg'
97--- plugins/unityshell/resources/lens-nav-file.svg 2011-06-30 17:24:25 +0000
98+++ plugins/unityshell/resources/lens-nav-file.svg 2012-09-12 10:02:20 +0000
99@@ -1,13 +1,8 @@
100 <?xml version="1.0" encoding="utf-8"?>
101-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
102+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
103 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
104 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
105 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
106-<g>
107- <g>
108- <path fill="#FFFFFF" d="M14.969,2H14v6h6V7L14.969,2z M13,2H5C4.45,2,4,2.45,4,3v18c0,0.55,0.45,1,1,1h14c0.551,0,1-0.45,1-1
109- V9.007h-7V2z"/>
110- </g>
111-</g>
112+<path fill="#FFFFFF" d="M15,3v4h4V6l-3.031-3H15z"/>
113+<path fill="#FFFFFF" d="M18,21H6c-0.55,0-1-0.45-1-1V4c0-0.55,0.45-1,1-1h8v5.007h5V20C19,20.55,18.551,21,18,21z"/>
114 </svg>
115-
116\ No newline at end of file
117
118=== added file 'plugins/unityshell/resources/lens-nav-gwibber.svg'
119--- plugins/unityshell/resources/lens-nav-gwibber.svg 1970-01-01 00:00:00 +0000
120+++ plugins/unityshell/resources/lens-nav-gwibber.svg 2012-09-12 10:02:20 +0000
121@@ -0,0 +1,14 @@
122+<?xml version="1.0" encoding="utf-8"?>
123+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
124+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
125+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
126+ width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
127+<path fill="#FFFFFF" d="M23,11.38c-0.774,0.14-1.897-0.005-2.492-0.267c1.236-0.108,2.073-0.701,2.396-1.505
128+ c-0.445,0.29-1.829,0.604-2.593,0.304c-0.038-0.189-0.078-0.369-0.121-0.533c-0.581-2.256-2.576-4.074-4.663-3.854
129+ c0.169-0.073,0.34-0.139,0.512-0.2c0.229-0.087,1.577-0.318,1.365-0.82c-0.179-0.442-1.828,0.332-2.138,0.435
130+ c0.41-0.162,1.087-0.441,1.159-0.939c-0.627,0.091-1.243,0.404-1.72,0.86c0.173-0.195,0.304-0.432,0.331-0.689
131+ c-1.675,1.129-2.652,3.405-3.443,5.613c-0.621-0.637-1.173-1.136-1.667-1.416C8.541,7.584,6.883,6.766,4.282,5.746
132+ c-0.08,0.909,0.426,2.118,1.881,2.92C5.848,8.621,5.271,8.722,4.811,8.838c0.188,1.042,0.801,1.899,2.463,2.312
133+ c-0.759,0.053-1.153,0.237-1.508,0.629c0.346,0.725,1.191,1.576,2.708,1.401c-1.689,0.769-0.688,2.19,0.686,1.979
134+ C6.817,17.715,3.122,17.525,1,15.39c5.539,7.969,17.581,4.712,19.374-2.963C21.721,12.438,22.51,11.936,23,11.38z"/>
135+</svg>
136
137=== modified file 'plugins/unityshell/resources/lens-nav-home.svg'
138--- plugins/unityshell/resources/lens-nav-home.svg 2011-06-30 17:24:25 +0000
139+++ plugins/unityshell/resources/lens-nav-home.svg 2012-09-12 10:02:20 +0000
140@@ -1,9 +1,9 @@
141 <?xml version="1.0" encoding="utf-8"?>
142-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
143+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
144 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
145 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
146 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
147-<path fill="#FFFFFF" d="M12.707,2.298C12.513,2.1,12.256,2,12,2s-0.513,0.1-0.707,0.298L2,11.788h2v9.191C4,21.539,4.45,22,5,22
148- h5.02v-6.127h3.968V22H19c0.55,0,1-0.461,1-1.021v-9.191h2L12.707,2.298z"/>
149+<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M12.678,3.268C12.5,3.089,12.266,3,12.031,3
150+ c-0.235,0-0.47,0.089-0.647,0.268L3,12h2v8c0,0.553,0.447,1,1,1h12c0.553,0,1-0.447,1-1v-8h2L12.678,3.268z M14,20.998h-4v-5h4
151+ V20.998z"/>
152 </svg>
153-
154\ No newline at end of file
155
156=== modified file 'plugins/unityshell/resources/lens-nav-music.svg'
157--- plugins/unityshell/resources/lens-nav-music.svg 2011-06-30 17:24:25 +0000
158+++ plugins/unityshell/resources/lens-nav-music.svg 2012-09-12 10:02:20 +0000
159@@ -1,16 +1,11 @@
160 <?xml version="1.0" encoding="utf-8"?>
161-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
162+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
163 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
164 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
165 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
166-<g>
167- <g>
168- <path fill="#FFFFFF" d="M21,2.85c0-0.55-0.443-0.927-0.986-0.837L9.986,3.687C9.444,3.776,9,4.301,9,4.851v10.268l0.02,0.026
169- c-1.062-0.301-2.393-0.131-3.61,0.578c-2.025,1.178-2.956,3.379-2.079,4.911s3.232,1.819,5.258,0.637
170- c1.437-0.835,2.307-2.182,2.389-3.441l0.022,0.03V7.155c0-0.55,0.444-1.075,0.986-1.165l6.028-1.006
171- C18.557,4.894,19,5.271,19,5.821v7.296l0.02,0.026c-1.062-0.3-2.393-0.131-3.609,0.578c-2.025,1.179-2.957,3.379-2.079,4.911
172- c0.877,1.533,3.231,1.82,5.257,0.638c1.438-0.835,2.308-2.183,2.39-3.442L21,15.859V2.85z"/>
173- </g>
174-</g>
175+<path fill="#FFFFFF" d="M19.964,14.964L20,15V3.849c0-0.55-0.444-0.926-0.986-0.835l-8.027,1.67C10.444,4.774,10,5.299,10,5.849
176+ v9.603c-0.984-0.633-2.52-0.61-3.892,0.172c-1.772,1.009-2.587,2.895-1.819,4.207c0.767,1.312,2.828,1.559,4.6,0.545
177+ c1.441-0.819,2.232-2.213,2.074-3.412L11,17V6.849c0-0.55,0.444-1.075,0.986-1.167l6.028-1.365C18.557,4.224,19,4.599,19,5.148
178+ v8.302c-0.984-0.632-2.521-0.609-3.891,0.174c-1.773,1.01-2.588,2.894-1.82,4.206c0.768,1.312,2.828,1.56,4.601,0.546
179+ C19.331,17.557,20.122,16.163,19.964,14.964z"/>
180 </svg>
181-
182\ No newline at end of file
183
184=== modified file 'plugins/unityshell/resources/lens-nav-photo.svg'
185--- plugins/unityshell/resources/lens-nav-photo.svg 2011-06-30 17:24:25 +0000
186+++ plugins/unityshell/resources/lens-nav-photo.svg 2012-09-12 10:02:20 +0000
187@@ -1,16 +1,11 @@
188 <?xml version="1.0" encoding="utf-8"?>
189-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
190+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
191 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
192 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
193 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
194-<g>
195- <g>
196- <path fill="#FFFFFF" d="M12.009,9.51c-2.218,0-4.016,1.797-4.016,4.013s1.798,4.013,4.016,4.013s4.016-1.797,4.016-4.013
197- S14.227,9.51,12.009,9.51z M21,6.511H3c-0.55,0-1,0.45-1,0.999v11.991c0,0.55,0.45,0.999,1,0.999h18c0.55,0,1-0.449,1-0.999V7.51
198- C22,6.961,21.55,6.511,21,6.511z M12,19.501c-3.313,0-6-2.684-6-5.995c0-3.312,2.687-5.996,6-5.996s6,2.684,6,5.996
199- C18,16.817,15.313,19.501,12,19.501z M15.664,5.55l-0.368-1.102C15.122,3.927,14.53,3.5,13.979,3.5h-4
200- c-0.55,0-1.142,0.427-1.316,0.948L8.296,5.55C8.122,6.071,7.53,6.498,6.98,6.498h10C16.431,6.498,15.838,6.071,15.664,5.55z"/>
201- </g>
202-</g>
203+<path fill="#FFFFFF" d="M16,13.5c0,2.21-1.79,4-4,4s-4-1.79-4-4s1.79-4,4-4S16,11.29,16,13.5z"/>
204+<path fill="#FFFFFF" d="M20,7.5h-3c-0.55,0-1.162-0.433-1.336-0.956l-0.368-1.103C15.122,4.92,14.55,4.5,14,4.5h-4
205+ c-0.55,0-1.162,0.42-1.337,0.942L8.296,6.544C8.122,7.067,7.55,7.5,7,7.5H4c-0.55,0-1,0.45-1,1v10c0,0.551,0.45,1,1,1h16
206+ c0.55,0,1-0.449,1-1v-10C21,7.95,20.55,7.5,20,7.5z M12,18.5c-2.762,0-5-2.238-5-5c0-2.763,2.238-5,5-5c2.761,0,5,2.237,5,5
207+ C17,16.262,14.761,18.5,12,18.5z"/>
208 </svg>
209-
210\ No newline at end of file
211
212=== modified file 'plugins/unityshell/resources/lens-nav-video.svg'
213--- plugins/unityshell/resources/lens-nav-video.svg 2011-06-30 17:24:25 +0000
214+++ plugins/unityshell/resources/lens-nav-video.svg 2012-09-12 10:02:20 +0000
215@@ -1,14 +1,13 @@
216 <?xml version="1.0" encoding="utf-8"?>
217-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
218+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
219 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
220 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
221 width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
222-<g>
223- <g>
224- <path fill="#FFFFFF" d="M21,4H3C2.45,4,2,4.45,2,5v14c0,0.55,0.45,1,1,1h18c0.55,0,1-0.45,1-1V5C22,4.45,21.55,4,21,4z M5,19H3v-2
225- h2V19z M5,16H3v-2h2V16z M5,13H3v-2h2V13z M5,10H3V8h2V10z M5,7H3V5h2V7z M9,15.98V8l7.036,4L9,15.98z M21,19h-2v-2h2V19z M21,16
226- h-2v-2h2V16z M21,13h-2v-2h2V13z M21,10h-2V8h2V10z M21,7h-2V5h2V7z"/>
227- </g>
228-</g>
229+<path fill="#FFFFFF" d="M20,4.5H4c-0.532,0-1,0.467-1,1v13c0,0.533,0.468,1,1,1h16c0.533,0,1-0.467,1-1v-13
230+ C21,4.967,20.533,4.5,20,4.5z M5.5,18.5h-1v-1h1V18.5z M5.5,16.5h-1v-1h1V16.5z M5.5,14.5h-1v-1h1V14.5z M5.5,12.5h-1v-1h1V12.5z
231+ M5.5,10.5h-1v-1h1V10.5z M5.5,8.5h-1v-1h1V8.5z M5.5,6.5h-1v-1h1V6.5z M14.267,13.241c-0.61,0.431-1.226,0.85-1.849,1.259
232+ c-0.621,0.408-1.226,0.785-1.815,1.129C10.015,15.973,9.479,16.263,9,16.5v-9c0.458,0.236,0.981,0.527,1.57,0.871
233+ c0.588,0.343,1.194,0.715,1.816,1.113c0.621,0.398,1.243,0.812,1.864,1.242c0.622,0.429,1.205,0.849,1.75,1.257
234+ C15.455,12.392,14.877,12.812,14.267,13.241z M19.5,18.5h-1v-1h1V18.5z M19.5,16.5h-1v-1h1V16.5z M19.5,14.5h-1v-1h1V14.5z
235+ M19.5,12.5h-1v-1h1V12.5z M19.5,10.5h-1v-1h1V10.5z M19.5,8.5h-1v-1h1V8.5z M19.5,6.5h-1v-1h1V6.5z"/>
236 </svg>
237-
238\ No newline at end of file
239
240=== modified file 'unity-shared/PreviewStyle.cpp'
241--- unity-shared/PreviewStyle.cpp 2012-09-06 07:03:54 +0000
242+++ unity-shared/PreviewStyle.cpp 2012-09-12 10:02:20 +0000
243@@ -224,7 +224,7 @@
244
245 int Style::GetActionButtonHeight() const
246 {
247- return 36;
248+ return 34;
249 }
250
251 int Style::GetActionButtonMaximumWidth() const