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
d8adf5a0
Commit
d8adf5a0
authored
Sep 03, 2015
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
issue-27: updated some logic
parent
a5a35b4c
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
Source/FlatButton.swift
+1
-1
Source/MaterialButton.swift
+1
-1
Source/MaterialCardView.swift
+1
-1
Source/RaisedButton.swift
+1
-1
No files found.
Source/FlatButton.swift
View file @
d8adf5a0
...
...
@@ -24,7 +24,7 @@ public class FlatButton : MaterialButton {
//
internal
override
func
prepareView
()
{
super
.
prepareView
()
setTitleColor
(
MaterialTheme
.
blue
Grey
.
darken1
,
forState
:
.
Normal
)
setTitleColor
(
MaterialTheme
.
blue
.
accent2
,
forState
:
.
Normal
)
backgroundColor
=
MaterialTheme
.
clear
.
color
contentEdgeInsets
=
UIEdgeInsetsMake
(
4
,
16
,
4
,
16
)
}
...
...
Source/MaterialButton.swift
View file @
d8adf5a0
...
...
@@ -44,7 +44,7 @@ public class MaterialButton : UIButton {
/**
:name: pulseColor
*/
public
var
pulseColor
:
UIColor
?
=
MaterialTheme
.
blue
Grey
.
lighten3
public
var
pulseColor
:
UIColor
?
=
MaterialTheme
.
blue
.
lighten3
/**
:name: init
...
...
Source/MaterialCardView.swift
View file @
d8adf5a0
...
...
@@ -49,7 +49,7 @@ public class MaterialCardView : UIView {
/**
:name: pulseColor
*/
public
var
pulseColor
:
UIColor
=
MaterialTheme
.
blue
Grey
.
lighten3
public
var
pulseColor
:
UIColor
=
MaterialTheme
.
blue
.
lighten3
/**
:name: init
...
...
Source/RaisedButton.swift
View file @
d8adf5a0
...
...
@@ -25,7 +25,7 @@ public class RaisedButton : MaterialButton {
internal
override
func
prepareView
()
{
super
.
prepareView
()
setTitleColor
(
MaterialTheme
.
white
.
color
,
forState
:
.
Normal
)
backgroundColor
=
MaterialTheme
.
blue
Grey
.
darken1
backgroundColor
=
MaterialTheme
.
blue
.
accent2
contentEdgeInsets
=
UIEdgeInsetsMake
(
4
,
16
,
4
,
16
)
}
...
...
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