Skip to content

Commit b94b8f6

Browse files
committed
flat ui
1 parent ba5d456 commit b94b8f6

Some content is hidden

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

62 files changed

+424
-13
lines changed

app/assets/javascripts/application.js

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
//= require angular-route
1818
//= require ui-bootstrap
1919
//= require bootstrap-sprockets
20+
//= require flat-ui
2021
//= require restangular
2122
//= require angapp
2223
//= require controllers
+3-13
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,9 @@
11
/*
2-
* This is a manifest file that'll be compiled into application.css, which will include all the files
3-
* listed below.
4-
*
5-
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
6-
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
7-
*
8-
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
9-
* compiled file so the styles you add here take precedence over styles defined in any styles
10-
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
11-
* file per style scope.
12-
*
132
*= require_tree .
143
*= require_self
15-
*= require bootstrap
164
*/
175

6+
@import 'flat-ui/variables';
187
@import "bootstrap-sprockets";
19-
@import "bootstrap";
8+
@import "bootstrap";
9+
@import 'flat-ui';

config/initializers/assets.rb

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# Version of your assets, change this if you want to expire all your assets.
44
Rails.application.config.assets.version = '1.0'
5+
Rails.application.config.assets.precompile += %w( *.png )
56

67
# Precompile additional assets.
78
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
5.49 KB
Binary file not shown.

public/fonts/flat-ui/flat-ui-icons-regular.svg

+140
Loading
5.31 KB
Binary file not shown.
6.84 KB
Binary file not shown.
3.01 KB
Loading
4.45 KB
Loading
4.16 KB
Loading
3.84 KB
Loading
16.7 KB
Loading
11.5 KB
Loading
Loading
6.86 KB
Loading
8.38 KB
Loading
11.8 KB
Loading
4.1 KB
Loading
10.2 KB
Loading
4.03 KB
Loading
11.3 KB
Loading
+1
Loading
Loading
+1
Loading
Loading
Loading
Loading
Loading
+5
Loading

0 commit comments

Comments
 (0)