diff options
| author | Matt Stratton <matt.stratton@gmail.com> | 2017-04-24 05:15:25 +0300 |
|---|---|---|
| committer | Matt Stratton <matt.stratton@gmail.com> | 2017-04-24 05:15:25 +0300 |
| commit | e8d1cb37eb6cb11a2d006bc3e9f13e654fa8eabf (patch) | |
| tree | 9ad0d5199e9bf6892ddcc754a01d5b8dcaab3d75 /layouts/partials | |
| parent | a6bc4dda2d48bc7637140179bfa39a9a29c9027b (diff) | |
More basic Bootstrap 4 support
Diffstat (limited to 'layouts/partials')
| -rw-r--r-- | layouts/partials/footer_scripts.html | 6 | ||||
| -rw-r--r-- | layouts/partials/head_includes.html | 5 | ||||
| -rw-r--r-- | layouts/partials/header.html | 70 |
3 files changed, 31 insertions, 50 deletions
diff --git a/layouts/partials/footer_scripts.html b/layouts/partials/footer_scripts.html index 2fe214e..07bbf5e 100644 --- a/layouts/partials/footer_scripts.html +++ b/layouts/partials/footer_scripts.html @@ -1,9 +1,5 @@ -<!-- jQuery (necessary for Bootstrap's JavaScript plugins) --> -<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> -<!-- Include all compiled plugins (below), or include individual files as needed --> -<script src="{{ .Site.BaseURL }}js/bootstrap.min.js"></script> +<script src="{{ .Site.BaseURL }}js/castanet-min.js"></script> <script src="{{ .Site.BaseURL }}js/bootstrap3_player.js"></script> -<script src="{{ .Site.BaseURL }}js/jssocials.min.js"></script> <script> $("#share").jsSocials({ shares: ["facebook", "linkedin", "pinterest", diff --git a/layouts/partials/head_includes.html b/layouts/partials/head_includes.html index 5c3c329..64e61ce 100644 --- a/layouts/partials/head_includes.html +++ b/layouts/partials/head_includes.html @@ -1,15 +1,10 @@ -<!-- Bootstrap --> -<link href="{{ .Site.BaseURL }}css/bootstrap.css" rel="stylesheet"> {{ if isset $.Site.Params "site_theme"}} <link href="{{ .Site.BaseURL }}css/{{ $.Site.Params.site_theme}}.css" rel="stylesheet"> {{ else }} <link href="{{ .Site.BaseURL }}css/orange.css" rel="stylesheet"> {{ end }} -<link href="{{ .Site.BaseURL }}font-awesome/css/font-awesome.min.css" rel="stylesheet"> <link href="{{ .Site.BaseURL }}css/bootstrap3_player.css" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Lato|Raleway" rel="stylesheet"> -<link href="{{ .Site.BaseURL }}css/jssocials.css" rel="stylesheet" type="text/css" /> -<link href="{{ .Site.BaseURL }}css/jssocials-theme-plain.css" rel="stylesheet" type="text/css" /> <!-- Custom CSS --> {{ range .Site.Params.custom_css }} <link rel="stylesheet" href="{{ $.Site.BaseURL }}{{ . }}"> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index d4fb963..7ee927a 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -4,49 +4,40 @@ <body lang="{{ .Site.Params.Lang }}"> - <nav class="navbar navbar-fixed-top navbar-default" role="navigation"> - <div class="container"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> - <span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span> - </button> <a class="navbar-brand" href="/">{{ .Site.Title }}</a> - </div> - <div class="collapse navbar-collapse" id="navbar"> - <ul class="nav navbar-nav"> - {{ $currentNode := . }} - {{ range .Site.Menus.main }} - {{ if .HasChildren }} - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ .Name }}<span class="caret"></span></a> - <ul class="dropdown-menu"> - {{ range .Children }} - <li {{ if $currentNode.IsMenuCurrent "Main" . }} class="active" {{ end }}> - <a href="{{ .URL }}">{{ .Name }}</a> - </li> - {{ end }} - </ul> - </li> - {{ else }} - <li {{ if or ($currentNode.IsMenuCurrent "Main" .) ($currentNode.HasMenuCurrent "Main" .) }}class="active"{{ end }}> - <a href="{{ .URL }}"> - {{ .Pre }} - <span>{{ .Name }}</span> - </a> - </li> - {{ end }} +<nav class="navbar fixed-top navbar-toggleable-md navbar-light bg-faded"> + <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> + <span class="navbar-toggler-icon"></span> + </button> + <a class="navbar-brand" href="/">{{ .Site.Title }}</a> + + <div class="collapse navbar-collapse" id="navbarSupportedContent"> + <ul class="navbar-nav mr-auto"> + {{ $currentNode := . }} + {{ range .Site.Menus.main }} + {{ if .HasChildren }} + <li class="nav-item dropdown"> + <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">{{ .Name }}</a> + <div class="dropdown-menu"> + {{ range .Children }} + <a class="dropdown-item{{ if $currentNode.IsMenuCurrent "Main" . }} active {{ end }}" href="{{ .URL }}">{{ .Name }}</a> {{ end }} - </ul> - <!-- <form class="navbar-form navbar-left" role="search"> - <div class="form-group"> - <input type="text" class="form-control" /> </div> - <button type="submit" class="btn btn-default"> - Submit - </button> - </form> --> - <ul class="nav navbar-nav navbar-right"> + </li> + {{ else }} + <li class= "nav-item {{ if or ($currentNode.IsMenuCurrent "Main" .) ($currentNode.HasMenuCurrent "Main" .) }} active {{ end }}"> + <a href="{{ .URL }}" class="nav-link"> + {{ .Pre }} + <span>{{ .Name }}</span> + </a> + </li> + {{ end }} + {{ end }} + </ul> + + + <ul class="navbar-nav ml-auto"> {{ if (isset .Site.Params.social "facebook" ) }} <li> <a class = "social-links" href="https://facebook.com/{{ .Site.Params.social.facebook }}"><i class="fa fa-facebook-square fa-2x"></i></a> @@ -88,6 +79,5 @@ </li> {{ end }} </ul> - </div> </div> </nav> |