Skip to content

Commit

Permalink
Merge branch 'release/2.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Baza207 committed Apr 2, 2020
2 parents 741610b + 4aceb35 commit b77d732
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 3,311 deletions.
36 changes: 0 additions & 36 deletions FrostKit iOS Tests/Extensions/FontExtensionsTests.swift

This file was deleted.

68 changes: 8 additions & 60 deletions FrostKit.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

15 changes: 0 additions & 15 deletions FrostKit/Fonts/CustomFonts.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,8 @@ import AppKit
import UIKit
#endif

///
/// :FontAwesome Links:
/// - https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/less/variables.less
/// - https://github.com/FortAwesome/Font-Awesome/blob/master/fonts/fontawesome-webfont.ttf
///
/// :IonIcons Links:
/// - https://raw.githubusercontent.com/driftyco/ionicons/master/less/_ionicons-variables.less
/// - https://github.com/driftyco/ionicons/blob/master/fonts/ionicons.ttf
///
public class CustomFonts {

/// Loads custom fonts imbedded in the Framework.
public class func loadCustomFonts() {
loadCustomFont(name: "fontawesome-webfont", withExtension: "ttf", bundle: Bundle(for: CustomFonts.self))
loadCustomFont(name: "ionicons", withExtension: "ttf", bundle: Bundle(for: CustomFonts.self))
}

/**
Load custom fonts with names including the file name and extension.
Expand Down
Loading

0 comments on commit b77d732

Please sign in to comment.