メニューバーを移動した
このコミットが含まれているのは:
コミット
ec65048d16
|
@ -13,7 +13,7 @@ $line-height-base: 1.6;
|
||||||
-webkit-font-smoothing: antialiased;
|
-webkit-font-smoothing: antialiased;
|
||||||
-moz-osx-font-smoothing: grayscale;
|
-moz-osx-font-smoothing: grayscale;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
margin-top: 20px;
|
margin-top: 48px;
|
||||||
margin-left: 0px;
|
margin-left: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -116,6 +116,12 @@
|
||||||
border: 2px solid #3daee9;
|
border: 2px solid #3daee9;
|
||||||
box-shadow: 0 0 7px 3px #1d99f3;
|
box-shadow: 0 0 7px 3px #1d99f3;
|
||||||
}
|
}
|
||||||
|
.navbar {
|
||||||
|
padding: 0px;
|
||||||
|
}
|
||||||
|
.navbar-toggler {
|
||||||
|
border: 0px solid transparent;
|
||||||
|
}
|
||||||
.navbar-nav .dropdown-menu {
|
.navbar-nav .dropdown-menu {
|
||||||
background-color: #31363b;
|
background-color: #31363b;
|
||||||
color: #fcfcfc;
|
color: #fcfcfc;
|
||||||
|
|
|
@ -39,9 +39,45 @@
|
||||||
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
|
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
<nav class="navbar fixed-top navbar-dark bg-dark navbar-expand-md">
|
||||||
|
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#hide-smaho" aria-controls="hide-smaho" aria-expanded="false" aria-label="hide-smaho">
|
||||||
|
<span class="navbar-toggler-icon"></span>
|
||||||
|
</button>
|
||||||
|
<div class="collapse navbar-collapse" id="hide-smaho">
|
||||||
|
<a href="#" class="navbar-brand"><img src="/assets/img/favicon.jpeg" style="border-radius: 4px;" width="30" height="30" alt=""></a>
|
||||||
|
<ul class="navbar-nav mr-auto">
|
||||||
|
<li class="nav-item"><a class="nav-link{{ (strpos($_SERVER['REQUEST_URI'], '/blog') !== false || $_SERVER['REQUEST_URI'] == '/' ? ' active' : '') }}" href="/">トップ</a></li>
|
||||||
|
<li class="nav-item"><a class="nav-link{{ ($_SERVER['REQUEST_URI'] == '/passman' ? ' active' : '') }}" href="#">パスマン</a></li>
|
||||||
|
</ul>
|
||||||
|
<ul class="navbar-nav ml-auto">
|
||||||
|
@if ($user)
|
||||||
|
<li class="nav-item dropdown">
|
||||||
|
<a href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle" id="userdown">
|
||||||
|
<img src="/{{ $user->profile->avatar }}" height="25px">
|
||||||
|
<span style="{{ $user->profile->name_style }}">{{ $user->profile->showname }}</span>
|
||||||
|
</a>
|
||||||
|
<ul tabindex="-1" class="dropdown-menu dropdown-menu-right" aria-labelledby="userdown">
|
||||||
|
<li><a role="menuitem" target="_self" href="/profile/{{ $user->id }}" class="dropdown-item">プロファイルの表示</a></li>
|
||||||
|
<li><a role="menuitem" target="_self" href="/profile/{{ $user->id }}" class="dropdown-item">プロファイルの編集</a></li>
|
||||||
|
<li><div class="dropdown-divider"></div></li>
|
||||||
|
<li><a role="menuitem" target="_self" href="/logout" class="dropdown-item">サインアウト</a></li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
@else
|
||||||
|
<li class="nav-item dropdown">
|
||||||
|
<a href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle" id="userdown">未入会者</a>
|
||||||
|
<ul tabindex="-1" class="dropdown-menu dropdown-menu-right" aria-labelledby="userdown">
|
||||||
|
<li class="nav-item"><a target="_self" href="/login" class="nav-link">サインイン</a></li>
|
||||||
|
<li class="nav-item"><a target="_self" href="/register" class="nav-link">新規登録</a></li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
@endif
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
<div id="app">
|
<div id="app">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row" style="padding: 32px 0;">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<img class="img-fluid logo-img" src="/assets/img/header.png" />
|
<img class="img-fluid logo-img" src="/assets/img/header.png" />
|
||||||
<div class="logo-c">テクニカル諏訪子</div>
|
<div class="logo-c">テクニカル諏訪子</div>
|
||||||
|
@ -52,34 +88,8 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row" style="padding: 16px 0;">
|
|
||||||
<div class="col">
|
|
||||||
<nav class="navbar sticky-top navbar-dark bg-dark navbar-expand-md">
|
|
||||||
<a href="/" class="navbar-brand">トップ</a>
|
|
||||||
<ul class="navbar-nav ml-auto">
|
|
||||||
@if ($user)
|
|
||||||
<li class="nav-item dropdown">
|
|
||||||
<a href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle" id="userdown">
|
|
||||||
<img src="/{{ $user->profile->avatar }}" height="25px">
|
|
||||||
<span style="{{ $user->profile->name_style }}">{{ $user->profile->showname }}</span>
|
|
||||||
</a>
|
|
||||||
<ul tabindex="-1" class="dropdown-menu dropdown-menu-right" aria-labelledby="userdown">
|
|
||||||
<li><a role="menuitem" target="_self" href="/profile/{{ $user->id }}" class="dropdown-item">プロファイル</a></li>
|
|
||||||
<li><div class="dropdown-divider"></div></li>
|
|
||||||
<li><a role="menuitem" target="_self" href="/logout" class="dropdown-item">サインアウト</a></li>
|
|
||||||
</ul>
|
|
||||||
</li>
|
|
||||||
<tsuchi />
|
|
||||||
@else
|
|
||||||
<li class="nav-item"><a target="_self" href="/login" class="nav-link">サインイン</a></li>
|
|
||||||
<li class="nav-item"><a target="_self" href="/register" class="nav-link">新規登録</a></li>
|
|
||||||
@endif
|
|
||||||
</ul>
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-3">
|
<div class="col-md-3" style="padding-bottom: 32px;">
|
||||||
<div class="nav flex-column nav-pills sidemenu">
|
<div class="nav flex-column nav-pills sidemenu">
|
||||||
<a href="/" class="nav-link {{ ($_SERVER['REQUEST_URI'] == '/' ? 'bara' : 'bar') }}">トップ</a>
|
<a href="/" class="nav-link {{ ($_SERVER['REQUEST_URI'] == '/' ? 'bara' : 'bar') }}">トップ</a>
|
||||||
@foreach ($menu as $m)
|
@foreach ($menu as $m)
|
||||||
|
@ -87,7 +97,7 @@
|
||||||
@endforeach
|
@endforeach
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm">
|
<div class="col-md">
|
||||||
@yield('content')
|
@yield('content')
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
新しいイシューから参照