Skip to content

Commit 804a252

Browse files
committed
Update bootstrap4
1 parent 692093c commit 804a252

File tree

5 files changed

+9
-60
lines changed

5 files changed

+9
-60
lines changed

bower.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
],
1111
"dependencies": {
1212
"highlightjs": "~9.0.0",
13-
"bootstrap": "~3.3.6",
14-
"marked": "~0.3.5"
13+
"marked": "~0.3.5",
14+
"font-awesome": "Font-Awesome#~4.5.0",
15+
"bootstrap": "v4.0.0-alpha.2"
1516
}
1617
}

brunch-config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ exports.config = {
6060
},
6161
afterBrunch: [
6262
'mkdir -p priv/static/fonts',
63-
'cp -f bower_components/bootstrap/dist/fonts/* priv/static/fonts/'
63+
'cp -f bower_components/font-awesome/fonts/* priv/static/fonts/'
6464
]
6565
},
6666

package.json

-5
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@
66
"brunch": "^2.0.0",
77
"clean-css-brunch": ">= 1.0 < 1.8",
88
"css-brunch": ">= 1.0 < 1.8",
9-
"jade": "^1.11.0",
10-
"jade-brunch": "^1.8.2",
119
"javascript-brunch": ">= 1.0 < 1.8",
12-
"less-brunch": "^1.8.1",
13-
"riot": "^2.3.12",
14-
"riot-brunch": "0.0.2",
1510
"sass-brunch": "^1.9.2",
1611
"uglify-js-brunch": ">= 1.0 < 1.8"
1712
}

web/templates/layout/app.html.eex

-48
This file was deleted.

web/templates/layout/app.html.slime

+5-4
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ html lang="en"
77
meta name="description" content=""
88
meta name="author" content=""
99
title Cazoc
10-
link rel="stylesheet" href="#{static_path(@conn, '/css/app.css')}"
10+
link rel="stylesheet" href=static_path(@conn,"/css/app.css")
1111

1212
body
1313
.container
1414
.header
1515
ul.nav.nav-pills.pull-right
1616
li.dropdown role="presentation"
17-
a.dropdown-toggle data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false" Menu
18-
span.caret
17+
a.dropdown-toggle data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false"
18+
i.fa.fa-bars
1919
ul.dropdown-menu
2020
= if logged_in?(@conn) do
2121
li = current_author(@conn).name
@@ -32,4 +32,5 @@ html lang="en"
3232
main role="main"
3333
= render @view_module, @view_template, assigns
3434

35-
script src="#{static_path(@conn, '/js/app.js')}"
35+
script src="https://www.atlasestateagents.co.uk/javascript/tether.min.js"
36+
script src=static_path(@conn,"/js/app.js")

0 commit comments

Comments
 (0)