htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use webpack to deliver font-awesome (and use newest version)

Browse Source
This commit is contained in:
Sebastian Serth
2018-10-09 07:55:31 +02:00
parent 9e4f9263e6
commit 3ecb5bd778
12 changed files with 14 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/application.css
View File

@ -16,7 +16,6 @@
*= require flash
*
* vendor/assets
*= require font-awesome.min
*= require google_opensans
*= require_tree .
*/

6
app/assets/stylesheets/request-for-comments.css.scss
View File

@ -68,8 +68,10 @@
.result {
margin-right: 10px;
margin-top: 20px;
width: 10px;
height: 10px;
min-width: 10px;
max-width: 10px;
min-height: 10px;
max-height: 10px;
}
.passed {

2
app/javascript/packs/stylesheets.scss
View File

@ -10,3 +10,5 @@
@import '~bootswatch/dist/yeti/variables';
@import '~bootstrap/scss/bootstrap';
@import '~bootswatch/dist/yeti/bootswatch';
$fa-font-path: '~font-awesome/fonts';
@import '~font-awesome/scss/font-awesome';

4
app/views/layouts/application.html.slim
View File

@ -15,11 +15,11 @@ html lang='en'
body
nav.navbar.navbar-dark.bg-dark.navbar-expand-md.mb-4 role='navigation'
.container
button.navbar-toggler data-target='#navbar-collapse' data-toggle='collapse' type='button' aria-expanded='false' aria-label='Toggle navigation'
span.navbar-toggler-icon.sr-only
.navbar-brand
i.fa.fa-code
= application_name
button.navbar-toggler data-target='#navbar-collapse' data-toggle='collapse' type='button' aria-expanded='false' aria-label='Toggle navigation'
span.navbar-toggler-icon
#navbar-collapse.collapse.navbar-collapse
= render('navigation', cached: true)
ul.nav.navbar-nav.ml-auto