diff options
| author | Azul <azul@leap.se> | 2013-06-20 12:25:30 +0200 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-06-20 12:25:30 +0200 |
| commit | f1d53b81bfcd9803d73b26ee025160b60f1965c6 (patch) | |
| tree | 6e501d5979965acf31e3411442d4240bf148a362 /app | |
| parent | 15d48c24e529e2f944b026749c5eb35eb4c5cfa7 (diff) | |
| parent | 7b00ff01d24c968485785a71fba1501b16133ca4 (diff) | |
Merge remote-tracking branch 'origin/feature/bootswatch' into master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/application.scss | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index bb3b8bc..3e1b42c 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -3,6 +3,9 @@ // @import "tail"; +// First import journal variables +@import "bootswatch/cerulean/variables"; + // // import bootstrap. // @@ -19,6 +22,9 @@ table.table-hover tr:hover .btn { } @import "bootstrap-editable"; +// And finally bootswatch style itself +@import "bootswatch/cerulean/bootswatch"; + // // import custom scss, content to be set in deployment. // |