Skip to content

Commit 2e987a6

Browse files
authored
Merge pull request #387 from wordpress-mobile/issue/386-update-format-buttons
Issue/386 update format buttons
2 parents c7ad53b + 723c504 commit 2e987a6

File tree

58 files changed

+286
-289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+286
-289
lines changed

aztec/src/main/res/drawable/format_bar_button_bold.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<vector
44
xmlns:android="http://schemas.android.com/apk/res/android"
5-
android:height="44dp"
6-
android:width="44dp"
7-
android:viewportHeight="44"
8-
android:viewportWidth="44" >
5+
android:height="48dp"
6+
android:width="48dp"
7+
android:viewportHeight="48"
8+
android:viewportWidth="48" >
99

1010
<!-- @color/grey_darken_20 -->
1111
<path
1212
android:fillColor="#ff4f748e"
13-
android:pathData="M17,15.009h4.547c2.126,0,3.671,0.303,4.632,0.907c0.962,0.605,1.442,1.567,1.442,2.887 c0,0.896-0.211,1.63-0.631,2.205c-0.421,0.574-0.98,0.919-1.678,1.036v0.103c0.951,0.212,1.637,0.608,2.057,1.189 C27.79,23.916,28,24.688,28,25.652c0,1.367-0.494,2.434-1.482,3.199C25.529,29.617,24.186,30,22.491,30H17V15.009z M20,20.946 h2.027c0.862,0,1.486-0.133,1.872-0.4c0.387-0.267,0.579-0.708,0.579-1.323c0-0.574-0.21-0.986-0.63-1.236 c-0.421-0.249-1.087-0.374-1.996-0.374H20V20.946z M20,23.469v3.906h2.253c0.876,0,1.521-0.167,1.939-0.502 s0.626-0.848,0.626-1.539c0-1.244-0.889-1.865-2.668-1.865H20z" >
13+
android:pathData="M18.5,16.4h5c2.3,0,4,0.3,5.1,1c1,0.7,1.6,1.7,1.6,3.1c0,1-0.2,1.8-0.7,2.4c-0.5,0.6-1.1,1-1.8,1.1v0.1 c1,0.2,1.8,0.7,2.2,1.3c0.5,0.6,0.7,1.5,0.7,2.5c0,1.5-0.5,2.7-1.6,3.5c-1.1,0.8-2.5,1.3-4.4,1.3h-6V16.4z M21.8,22.9H24 c0.9,0,1.6-0.1,2-0.4c0.4-0.3,0.6-0.8,0.6-1.4c0-0.6-0.2-1.1-0.7-1.3c-0.5-0.3-1.2-0.4-2.2-0.4h-2V22.9z M21.8,25.6v4.3h2.5 c1,0,1.7-0.2,2.1-0.5c0.5-0.4,0.7-0.9,0.7-1.7c0-1.4-1-2-2.9-2H21.8z" >
1414
</path>
1515

1616
</vector>

aztec/src/main/res/drawable/format_bar_button_bold_disabled.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<vector
44
xmlns:android="http://schemas.android.com/apk/res/android"
5-
android:height="44dp"
6-
android:width="44dp"
7-
android:viewportHeight="44"
8-
android:viewportWidth="44" >
5+
android:height="48dp"
6+
android:width="48dp"
7+
android:viewportHeight="48"
8+
android:viewportWidth="48" >
99

1010
<!-- @color/grey_lighten_20 -->
1111
<path
1212
android:fillColor="#ffc8d7e1"
13-
android:pathData="M17,15.009h4.547c2.126,0,3.671,0.303,4.632,0.907c0.962,0.605,1.442,1.567,1.442,2.887 c0,0.896-0.211,1.63-0.631,2.205c-0.421,0.574-0.98,0.919-1.678,1.036v0.103c0.951,0.212,1.637,0.608,2.057,1.189 C27.79,23.916,28,24.688,28,25.652c0,1.367-0.494,2.434-1.482,3.199C25.529,29.617,24.186,30,22.491,30H17V15.009z M20,20.946 h2.027c0.862,0,1.486-0.133,1.872-0.4c0.387-0.267,0.579-0.708,0.579-1.323c0-0.574-0.21-0.986-0.63-1.236 c-0.421-0.249-1.087-0.374-1.996-0.374H20V20.946z M20,23.469v3.906h2.253c0.876,0,1.521-0.167,1.939-0.502 s0.626-0.848,0.626-1.539c0-1.244-0.889-1.865-2.668-1.865H20z" >
13+
android:pathData="M18.5,16.4h5c2.3,0,4,0.3,5.1,1c1,0.7,1.6,1.7,1.6,3.1c0,1-0.2,1.8-0.7,2.4c-0.5,0.6-1.1,1-1.8,1.1v0.1 c1,0.2,1.8,0.7,2.2,1.3c0.5,0.6,0.7,1.5,0.7,2.5c0,1.5-0.5,2.7-1.6,3.5c-1.1,0.8-2.5,1.3-4.4,1.3h-6V16.4z M21.8,22.9H24 c0.9,0,1.6-0.1,2-0.4c0.4-0.3,0.6-0.8,0.6-1.4c0-0.6-0.2-1.1-0.7-1.3c-0.5-0.3-1.2-0.4-2.2-0.4h-2V22.9z M21.8,25.6v4.3h2.5 c1,0,1.7-0.2,2.1-0.5c0.5-0.4,0.7-0.9,0.7-1.7c0-1.4-1-2-2.9-2H21.8z" >
1414
</path>
1515

1616
</vector>

aztec/src/main/res/drawable/format_bar_button_bold_highlighted.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<vector
44
xmlns:android="http://schemas.android.com/apk/res/android"
5-
android:height="44dp"
6-
android:width="44dp"
7-
android:viewportHeight="44"
8-
android:viewportWidth="44" >
5+
android:height="48dp"
6+
android:width="48dp"
7+
android:viewportHeight="48"
8+
android:viewportWidth="48" >
99

1010
<!-- @color/blue_wordpress -->
1111
<path
1212
android:fillColor="#ff0087be"
13-
android:pathData="M17,15.009h4.547c2.126,0,3.671,0.303,4.632,0.907c0.962,0.605,1.442,1.567,1.442,2.887 c0,0.896-0.211,1.63-0.631,2.205c-0.421,0.574-0.98,0.919-1.678,1.036v0.103c0.951,0.212,1.637,0.608,2.057,1.189 C27.79,23.916,28,24.688,28,25.652c0,1.367-0.494,2.434-1.482,3.199C25.529,29.617,24.186,30,22.491,30H17V15.009z M20,20.946 h2.027c0.862,0,1.486-0.133,1.872-0.4c0.387-0.267,0.579-0.708,0.579-1.323c0-0.574-0.21-0.986-0.63-1.236 c-0.421-0.249-1.087-0.374-1.996-0.374H20V20.946z M20,23.469v3.906h2.253c0.876,0,1.521-0.167,1.939-0.502 s0.626-0.848,0.626-1.539c0-1.244-0.889-1.865-2.668-1.865H20z" >
13+
android:pathData="M18.5,16.4h5c2.3,0,4,0.3,5.1,1c1,0.7,1.6,1.7,1.6,3.1c0,1-0.2,1.8-0.7,2.4c-0.5,0.6-1.1,1-1.8,1.1v0.1 c1,0.2,1.8,0.7,2.2,1.3c0.5,0.6,0.7,1.5,0.7,2.5c0,1.5-0.5,2.7-1.6,3.5c-1.1,0.8-2.5,1.3-4.4,1.3h-6V16.4z M21.8,22.9H24 c0.9,0,1.6-0.1,2-0.4c0.4-0.3,0.6-0.8,0.6-1.4c0-0.6-0.2-1.1-0.7-1.3c-0.5-0.3-1.2-0.4-2.2-0.4h-2V22.9z M21.8,25.6v4.3h2.5 c1,0,1.7-0.2,2.1-0.5c0.5-0.4,0.7-0.9,0.7-1.7c0-1.4-1-2-2.9-2H21.8z" >
1414
</path>
1515

1616
</vector>

aztec/src/main/res/drawable/format_bar_button_heading.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<vector
44
xmlns:android="http://schemas.android.com/apk/res/android"
5-
android:height="44dp"
6-
android:width="44dp"
7-
android:viewportHeight="44"
8-
android:viewportWidth="44" >
5+
android:height="48dp"
6+
android:width="48dp"
7+
android:viewportHeight="48"
8+
android:viewportWidth="48" >
99

1010
<!-- @color/grey_darken_20 -->
1111
<path
1212
android:fillColor="#ff4f748e"
13-
android:pathData="M28,30h-3v-6h-6v6h-3V15h3v6h6v-6h3V30z" >
13+
android:pathData="M30.5,32.7h-3.3v-6.5h-6.5v6.5h-3.3V16.4h3.3v6.5h6.5v-6.5h3.3V32.7z" >
1414
</path>
1515

1616
</vector>

aztec/src/main/res/drawable/format_bar_button_heading_1.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<vector
44
xmlns:android="http://schemas.android.com/apk/res/android"
5-
android:height="44dp"
6-
android:width="44dp"
7-
android:viewportHeight="44"
8-
android:viewportWidth="44" >
5+
android:height="48dp"
6+
android:width="48dp"
7+
android:viewportHeight="48"
8+
android:viewportWidth="48" >
99

1010
<!-- @color/grey_darken_20 -->
1111
<path
1212
android:fillColor="#ff4f748e"
13-
android:pathData="M21,17h2v10h-2v-4h-4v4h-2V17h2v4h4V17z M27.6,17c-0.6,0.9-1.5,1.7-2.6,2v1h2v7h2V17H27.6z" >
13+
android:pathData="M22.9,18.5h2.2v10.9h-2.2v-4.4h-4.4v4.4h-2.2V18.5h2.2v4.4h4.4V18.5z M30.1,18.5c-0.6,1-1.6,1.8-2.8,2.2v1.1h2.2v7.6h2.2 V18.5H30.1z" >
1414
</path>
1515

1616
</vector>

aztec/src/main/res/drawable/format_bar_button_heading_1_disabled.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<vector
44
xmlns:android="http://schemas.android.com/apk/res/android"
5-
android:height="44dp"
6-
android:width="44dp"
7-
android:viewportHeight="44"
8-
android:viewportWidth="44" >
5+
android:height="48dp"
6+
android:width="48dp"
7+
android:viewportHeight="48"
8+
android:viewportWidth="48" >
99

1010
<!-- @color/grey_lighten_20 -->
1111
<path
1212
android:fillColor="#ffc8d7e1"
13-
android:pathData="M21,17h2v10h-2v-4h-4v4h-2V17h2v4h4V17z M27.6,17c-0.6,0.9-1.5,1.7-2.6,2v1h2v7h2V17H27.6z" >
13+
android:pathData="M22.9,18.5h2.2v10.9h-2.2v-4.4h-4.4v4.4h-2.2V18.5h2.2v4.4h4.4V18.5z M30.1,18.5c-0.6,1-1.6,1.8-2.8,2.2v1.1h2.2v7.6h2.2 V18.5H30.1z" >
1414
</path>
1515

1616
</vector>

aztec/src/main/res/drawable/format_bar_button_heading_1_highlighted.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<vector
44
xmlns:android="http://schemas.android.com/apk/res/android"
5-
android:height="44dp"
6-
android:width="44dp"
7-
android:viewportHeight="44"
8-
android:viewportWidth="44" >
5+
android:height="48dp"
6+
android:width="48dp"
7+
android:viewportHeight="48"
8+
android:viewportWidth="48" >
99

1010
<!-- @color/blue_wordpress -->
1111
<path
1212
android:fillColor="#ff0087be"
13-
android:pathData="M21,17h2v10h-2v-4h-4v4h-2V17h2v4h4V17z M27.6,17c-0.6,0.9-1.5,1.7-2.6,2v1h2v7h2V17H27.6z" >
13+
android:pathData="M22.9,18.5h2.2v10.9h-2.2v-4.4h-4.4v4.4h-2.2V18.5h2.2v4.4h4.4V18.5z M30.1,18.5c-0.6,1-1.6,1.8-2.8,2.2v1.1h2.2v7.6h2.2 V18.5H30.1z" >
1414
</path>
1515

1616
</vector>

aztec/src/main/res/drawable/format_bar_button_heading_2.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<vector
44
xmlns:android="http://schemas.android.com/apk/res/android"
5-
android:height="44dp"
6-
android:width="44dp"
7-
android:viewportHeight="44"
8-
android:viewportWidth="44" >
5+
android:height="48dp"
6+
android:width="48dp"
7+
android:viewportHeight="48"
8+
android:viewportWidth="48" >
99

1010
<!-- @color/grey_darken_20 -->
1111
<path
1212
android:fillColor="#ff4f748e"
13-
android:pathData="M19,17h2v10h-2v-4h-4v4h-2V17h2v4h4V17z M27,25c0.5-0.4,0.6-0.6,1.1-1c0.4-0.4,0.8-0.8,1.2-1.3c0.3-0.4,0.6-0.8,0.9-1.3 c0.2-0.4,0.3-0.8,0.3-1.3c0-0.4-0.1-0.9-0.3-1.3c-0.2-0.4-0.4-0.7-0.8-1c-0.3-0.3-0.7-0.5-1.2-0.6c-0.5-0.2-1-0.2-1.5-0.2 c-0.4,0-0.7,0-1.1,0.1c-0.3,0.1-0.7,0.2-1,0.3c-0.3,0.1-0.6,0.3-0.9,0.5c-0.3,0.2-0.6,0.4-0.8,0.7l1.2,1.2c0.3-0.3,0.6-0.5,1-0.7 c0.4-0.2,0.7-0.3,1.1-0.3c0.5,0,0.9,0.1,1.3,0.4c0.3,0.3,0.5,0.7,0.5,1.1c0,0.4-0.1,0.8-0.4,1.1c-0.3,0.5-0.6,0.9-1,1.2 c-0.4,0.4-1,0.9-1.6,1.4s-1.4,1.1-2.2,1.6V27h8v-2H27z" >
13+
android:pathData="M20.7,18.5h2.2v10.9h-2.2v-4.4h-4.4v4.4h-2.2V18.5h2.2v4.4h4.4V18.5z M29.5,27.3c0.6-0.4,0.7-0.7,1.2-1.1 c0.5-0.4,0.9-0.9,1.3-1.4c0.4-0.4,0.7-0.9,0.9-1.4c0.2-0.4,0.3-0.9,0.3-1.4c0-0.5-0.1-1-0.3-1.4c-0.2-0.4-0.5-0.8-0.8-1.1 c-0.4-0.3-0.8-0.5-1.3-0.7c-0.5-0.2-1.1-0.2-1.6-0.2c-0.4,0-0.8,0-1.2,0.1c-0.4,0.1-0.7,0.2-1.1,0.3c-0.3,0.1-0.6,0.3-0.9,0.5 c-0.3,0.2-0.6,0.5-0.9,0.7l1.4,1.3c0.3-0.3,0.7-0.5,1.1-0.8c0.4-0.2,0.8-0.3,1.3-0.3c0.5,0,1,0.1,1.4,0.4c0.3,0.3,0.5,0.7,0.5,1.2 c0,0.4-0.2,0.9-0.4,1.2c-0.3,0.5-0.7,1-1.1,1.4c-0.5,0.5-1.1,1-1.7,1.6s-1.5,1.2-2.4,1.8v1.4h8.7v-2.2H29.5z" >
1414
</path>
1515

1616
</vector>

aztec/src/main/res/drawable/format_bar_button_heading_2_disabled.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<vector
44
xmlns:android="http://schemas.android.com/apk/res/android"
5-
android:height="44dp"
6-
android:width="44dp"
7-
android:viewportHeight="44"
8-
android:viewportWidth="44" >
5+
android:height="48dp"
6+
android:width="48dp"
7+
android:viewportHeight="48"
8+
android:viewportWidth="48" >
99

1010
<!-- @color/grey_lighten_20 -->
1111
<path
1212
android:fillColor="#ffc8d7e1"
13-
android:pathData="M19,17h2v10h-2v-4h-4v4h-2V17h2v4h4V17z M27,25c0.5-0.4,0.6-0.6,1.1-1c0.4-0.4,0.8-0.8,1.2-1.3c0.3-0.4,0.6-0.8,0.9-1.3 c0.2-0.4,0.3-0.8,0.3-1.3c0-0.4-0.1-0.9-0.3-1.3c-0.2-0.4-0.4-0.7-0.8-1c-0.3-0.3-0.7-0.5-1.2-0.6c-0.5-0.2-1-0.2-1.5-0.2 c-0.4,0-0.7,0-1.1,0.1c-0.3,0.1-0.7,0.2-1,0.3c-0.3,0.1-0.6,0.3-0.9,0.5c-0.3,0.2-0.6,0.4-0.8,0.7l1.2,1.2c0.3-0.3,0.6-0.5,1-0.7 c0.4-0.2,0.7-0.3,1.1-0.3c0.5,0,0.9,0.1,1.3,0.4c0.3,0.3,0.5,0.7,0.5,1.1c0,0.4-0.1,0.8-0.4,1.1c-0.3,0.5-0.6,0.9-1,1.2 c-0.4,0.4-1,0.9-1.6,1.4s-1.4,1.1-2.2,1.6V27h8v-2H27z" >
13+
android:pathData="M20.7,18.5h2.2v10.9h-2.2v-4.4h-4.4v4.4h-2.2V18.5h2.2v4.4h4.4V18.5z M29.5,27.3c0.6-0.4,0.7-0.7,1.2-1.1 c0.5-0.4,0.9-0.9,1.3-1.4c0.4-0.4,0.7-0.9,0.9-1.4c0.2-0.4,0.3-0.9,0.3-1.4c0-0.5-0.1-1-0.3-1.4c-0.2-0.4-0.5-0.8-0.8-1.1 c-0.4-0.3-0.8-0.5-1.3-0.7c-0.5-0.2-1.1-0.2-1.6-0.2c-0.4,0-0.8,0-1.2,0.1c-0.4,0.1-0.7,0.2-1.1,0.3c-0.3,0.1-0.6,0.3-0.9,0.5 c-0.3,0.2-0.6,0.5-0.9,0.7l1.4,1.3c0.3-0.3,0.7-0.5,1.1-0.8c0.4-0.2,0.8-0.3,1.3-0.3c0.5,0,1,0.1,1.4,0.4c0.3,0.3,0.5,0.7,0.5,1.2 c0,0.4-0.2,0.9-0.4,1.2c-0.3,0.5-0.7,1-1.1,1.4c-0.5,0.5-1.1,1-1.7,1.6s-1.5,1.2-2.4,1.8v1.4h8.7v-2.2H29.5z" >
1414
</path>
1515

1616
</vector>

aztec/src/main/res/drawable/format_bar_button_heading_2_highlighted.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<vector
44
xmlns:android="http://schemas.android.com/apk/res/android"
5-
android:height="44dp"
6-
android:width="44dp"
7-
android:viewportHeight="44"
8-
android:viewportWidth="44" >
5+
android:height="48dp"
6+
android:width="48dp"
7+
android:viewportHeight="48"
8+
android:viewportWidth="48" >
99

1010
<!-- @color/blue_wordpress -->
1111
<path
1212
android:fillColor="#ff0087be"
13-
android:pathData="M19,17h2v10h-2v-4h-4v4h-2V17h2v4h4V17z M27,25c0.5-0.4,0.6-0.6,1.1-1c0.4-0.4,0.8-0.8,1.2-1.3c0.3-0.4,0.6-0.8,0.9-1.3 c0.2-0.4,0.3-0.8,0.3-1.3c0-0.4-0.1-0.9-0.3-1.3c-0.2-0.4-0.4-0.7-0.8-1c-0.3-0.3-0.7-0.5-1.2-0.6c-0.5-0.2-1-0.2-1.5-0.2 c-0.4,0-0.7,0-1.1,0.1c-0.3,0.1-0.7,0.2-1,0.3c-0.3,0.1-0.6,0.3-0.9,0.5c-0.3,0.2-0.6,0.4-0.8,0.7l1.2,1.2c0.3-0.3,0.6-0.5,1-0.7 c0.4-0.2,0.7-0.3,1.1-0.3c0.5,0,0.9,0.1,1.3,0.4c0.3,0.3,0.5,0.7,0.5,1.1c0,0.4-0.1,0.8-0.4,1.1c-0.3,0.5-0.6,0.9-1,1.2 c-0.4,0.4-1,0.9-1.6,1.4s-1.4,1.1-2.2,1.6V27h8v-2H27z" >
13+
android:pathData="M20.7,18.5h2.2v10.9h-2.2v-4.4h-4.4v4.4h-2.2V18.5h2.2v4.4h4.4V18.5z M29.5,27.3c0.6-0.4,0.7-0.7,1.2-1.1 c0.5-0.4,0.9-0.9,1.3-1.4c0.4-0.4,0.7-0.9,0.9-1.4c0.2-0.4,0.3-0.9,0.3-1.4c0-0.5-0.1-1-0.3-1.4c-0.2-0.4-0.5-0.8-0.8-1.1 c-0.4-0.3-0.8-0.5-1.3-0.7c-0.5-0.2-1.1-0.2-1.6-0.2c-0.4,0-0.8,0-1.2,0.1c-0.4,0.1-0.7,0.2-1.1,0.3c-0.3,0.1-0.6,0.3-0.9,0.5 c-0.3,0.2-0.6,0.5-0.9,0.7l1.4,1.3c0.3-0.3,0.7-0.5,1.1-0.8c0.4-0.2,0.8-0.3,1.3-0.3c0.5,0,1,0.1,1.4,0.4c0.3,0.3,0.5,0.7,0.5,1.2 c0,0.4-0.2,0.9-0.4,1.2c-0.3,0.5-0.7,1-1.1,1.4c-0.5,0.5-1.1,1-1.7,1.6s-1.5,1.2-2.4,1.8v1.4h8.7v-2.2H29.5z" >
1414
</path>
1515

1616
</vector>

0 commit comments

Comments
 (0)