Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
Material
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitriy Stepanets
Material
Commits
f714cc4c
Unverified
Commit
f714cc4c
authored
Sep 22, 2016
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
development: updated default Button cornerRadius values to match Material Design spec
parent
1dfde4b0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
Examples/Programmatic/Button/Button/ViewController.swift
+3
-3
Sources/iOS/FlatButton.swift
+1
-1
Sources/iOS/RaisedButton.swift
+1
-1
No files found.
Examples/Programmatic/Button/Button/ViewController.swift
View file @
f714cc4c
...
@@ -45,7 +45,7 @@ class ViewController: UIViewController {
...
@@ -45,7 +45,7 @@ class ViewController: UIViewController {
private
func
prepareFlatButton
()
{
private
func
prepareFlatButton
()
{
let
button
=
FlatButton
(
title
:
"Flat Button"
,
titleColor
:
Color
.
blue
.
base
)
let
button
=
FlatButton
(
title
:
"Flat Button"
,
titleColor
:
Color
.
blue
.
base
)
view
.
layout
(
button
)
.
width
(
120
)
.
height
(
40
)
.
center
(
offsetY
:
-
150
)
view
.
layout
(
button
)
.
width
(
120
)
.
height
(
36
)
.
center
(
offsetY
:
-
150
)
}
}
private
func
prepareRaisedButton
()
{
private
func
prepareRaisedButton
()
{
...
@@ -53,7 +53,7 @@ class ViewController: UIViewController {
...
@@ -53,7 +53,7 @@ class ViewController: UIViewController {
button
.
pulseColor
=
Color
.
white
button
.
pulseColor
=
Color
.
white
button
.
backgroundColor
=
Color
.
blue
.
base
button
.
backgroundColor
=
Color
.
blue
.
base
view
.
layout
(
button
)
.
width
(
150
)
.
height
(
40
)
.
center
(
offsetY
:
-
75
)
view
.
layout
(
button
)
.
width
(
150
)
.
height
(
36
)
.
center
(
offsetY
:
-
75
)
}
}
private
func
prepareFabButton
()
{
private
func
prepareFabButton
()
{
...
@@ -65,7 +65,7 @@ class ViewController: UIViewController {
...
@@ -65,7 +65,7 @@ class ViewController: UIViewController {
private
func
prepareIconButton
()
{
private
func
prepareIconButton
()
{
let
button
=
IconButton
(
image
:
Icon
.
cm
.
search
,
tintColor
:
Color
.
blue
.
base
)
let
button
=
IconButton
(
image
:
Icon
.
cm
.
search
,
tintColor
:
Color
.
blue
.
base
)
view
.
layout
(
button
)
.
width
(
120
)
.
height
(
4
0
)
.
center
(
offsetY
:
75
)
view
.
layout
(
button
)
.
width
(
120
)
.
height
(
4
8
)
.
center
(
offsetY
:
75
)
}
}
}
}
Sources/iOS/FlatButton.swift
View file @
f714cc4c
...
@@ -40,6 +40,6 @@ open class FlatButton: Button {
...
@@ -40,6 +40,6 @@ open class FlatButton: Button {
*/
*/
open
override
func
prepare
()
{
open
override
func
prepare
()
{
super
.
prepare
()
super
.
prepare
()
cornerRadiusPreset
=
.
cornerRadius
2
cornerRadiusPreset
=
.
cornerRadius
1
}
}
}
}
Sources/iOS/RaisedButton.swift
View file @
f714cc4c
...
@@ -41,7 +41,7 @@ open class RaisedButton: Button {
...
@@ -41,7 +41,7 @@ open class RaisedButton: Button {
open
override
func
prepare
()
{
open
override
func
prepare
()
{
super
.
prepare
()
super
.
prepare
()
depthPreset
=
.
depth1
depthPreset
=
.
depth1
cornerRadiusPreset
=
.
cornerRadius
2
cornerRadiusPreset
=
.
cornerRadius
1
backgroundColor
=
Color
.
white
backgroundColor
=
Color
.
white
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment