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
7a5e826d
Commit
7a5e826d
authored
Oct 15, 2015
by
Daniel Dahan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated color cyan name to correct spelling
parent
6f5aa6bc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
Source/FabButton.swift
+2
-2
Source/FlatButton.swift
+1
-1
Source/MaterialColor.swift
+1
-1
No files found.
Source/FabButton.swift
View file @
7a5e826d
...
@@ -18,14 +18,14 @@
...
@@ -18,14 +18,14 @@
import
UIKit
import
UIKit
public
class
FabButton
:
MaterialButton
{
public
class
FabButton
:
MaterialButton
{
/**
/**
:name: prepareView
:name: prepareView
*/
*/
public
override
func
prepareView
()
{
public
override
func
prepareView
()
{
super
.
prepareView
()
super
.
prepareView
()
setTitleColor
(
MaterialTheme
.
fabButton
.
titleLabelColorForNormalState
,
forState
:
.
Normal
)
setTitleColor
(
MaterialTheme
.
fabButton
.
titleLabelColorForNormalState
,
forState
:
.
Normal
)
titleLabel
!
.
font
=
MaterialTheme
.
fabButton
.
titleLabelFont
titleLabel
?
.
font
=
MaterialTheme
.
fabButton
.
titleLabelFont
userInteractionEnabled
=
MaterialTheme
.
fabButton
.
userInteractionEnabled
userInteractionEnabled
=
MaterialTheme
.
fabButton
.
userInteractionEnabled
backgroundColor
=
MaterialTheme
.
fabButton
.
backgroundColor
backgroundColor
=
MaterialTheme
.
fabButton
.
backgroundColor
...
...
Source/FlatButton.swift
View file @
7a5e826d
...
@@ -25,7 +25,7 @@ public class FlatButton : MaterialButton {
...
@@ -25,7 +25,7 @@ public class FlatButton : MaterialButton {
public
override
func
prepareView
()
{
public
override
func
prepareView
()
{
super
.
prepareView
()
super
.
prepareView
()
setTitleColor
(
MaterialTheme
.
flatButton
.
titleLabelColorForNormalState
,
forState
:
.
Normal
)
setTitleColor
(
MaterialTheme
.
flatButton
.
titleLabelColorForNormalState
,
forState
:
.
Normal
)
titleLabel
!
.
font
=
MaterialTheme
.
flatButton
.
titleLabelFont
titleLabel
?
.
font
=
MaterialTheme
.
flatButton
.
titleLabelFont
userInteractionEnabled
=
MaterialTheme
.
flatButton
.
userInteractionEnabled
userInteractionEnabled
=
MaterialTheme
.
flatButton
.
userInteractionEnabled
backgroundColor
=
MaterialTheme
.
flatButton
.
backgroundColor
backgroundColor
=
MaterialTheme
.
flatButton
.
backgroundColor
...
...
Source/MaterialColor.swift
View file @
7a5e826d
...
@@ -155,7 +155,7 @@ public struct MaterialColor {
...
@@ -155,7 +155,7 @@ public struct MaterialColor {
}
}
// cyan
// cyan
public
struct
cya
b
{
public
struct
cya
n
{
public
static
let
lighten5
:
UIColor
=
UIColor
(
red
:
224
/
255
,
green
:
247
/
255
,
blue
:
250
/
255
,
alpha
:
1
)
public
static
let
lighten5
:
UIColor
=
UIColor
(
red
:
224
/
255
,
green
:
247
/
255
,
blue
:
250
/
255
,
alpha
:
1
)
public
static
let
lighten4
:
UIColor
=
UIColor
(
red
:
1178
/
255
,
green
:
235
/
255
,
blue
:
242
/
255
,
alpha
:
1
)
public
static
let
lighten4
:
UIColor
=
UIColor
(
red
:
1178
/
255
,
green
:
235
/
255
,
blue
:
242
/
255
,
alpha
:
1
)
public
static
let
lighten3
:
UIColor
=
UIColor
(
red
:
128
/
255
,
green
:
222
/
255
,
blue
:
2343
/
255
,
alpha
:
1
)
public
static
let
lighten3
:
UIColor
=
UIColor
(
red
:
128
/
255
,
green
:
222
/
255
,
blue
:
2343
/
255
,
alpha
:
1
)
...
...
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