Merge branch 'dev-master' of git.076.ne.jp:TechnicalSuwako/076server

4ヶ月前 · 4ee385c943
--- a/public/css/techsuwa/lolita.min.css
+++ b/public/css/techsuwa/lolita.min.css
--- a/public/css/techsuwa/lolita.min.css.map
+++ b/public/css/techsuwa/lolita.min.css.map
--- a/public/css/techsuwa/lolita_f.min.css
+++ b/public/css/techsuwa/lolita_f.min.css
--- a/public/css/techsuwa/lolita_f.min.css.map
+++ b/public/css/techsuwa/lolita_f.min.css.map
--- a/public/css/techsuwa/lolita_m.min.css
+++ b/public/css/techsuwa/lolita_m.min.css
--- a/public/css/techsuwa/lolita_m.min.css.map
+++ b/public/css/techsuwa/lolita_m.min.css.map
--- a/resources/views/pages/site/commentlist.blade.php
+++ b/resources/views/pages/site/commentlist.blade.php
@ -1,10 +1,6 @@
@extends('theme.'.env('THEME').'.site')

@section('content')
-<div class="within" style="background-color: rgb(49, 54, 59); margin: 32px auto 0px">
-  {{ $res->links() }}
-</div>
-
 <div class="within">
  <div class="bar">コメント一覧</div>
  <div class="back">
--- a/resources/views/pages/site/memberlist.blade.php
+++ b/resources/views/pages/site/memberlist.blade.php
@ -1,10 +1,6 @@
@extends('theme.'.env('THEME').'.site')

@section('content')
-<div class="within" style="background-color: rgb(49, 54, 59); margin: 32px auto 0px">
-  {{ $res->links() }}
-</div>
-
 <div class="within">
  <div class="bar">ユーザー一覧</div>
  <div class="back" style="white-space: pre-wrap;">
--- a/resources/views/theme/techsuwa/component/favicon.blade.php
+++ b/resources/views/theme/techsuwa/component/favicon.blade.php
@ -1 +1 @@
-<link rel="shortcut icon" href="/img/favicon.jpeg">
+<link rel="shortcut icon" href="/img/favicon.jpeg" />
--- a/resources/views/theme/techsuwa/component/navbar.blade.php
+++ b/resources/views/theme/techsuwa/component/navbar.blade.php
@ -6,18 +6,20 @@
      <li class="nav-item"><a class="nav-link" href="http://{{ env('ONION_HOST') }}">Tor</a></li>
      <li class="nav-item"><a class="nav-link" href="/feed">RSS</a></li>
    </ul>
-    <ul class="navbar-nav ml-auto">
-      @if ($user)
-        <li class="nav-item dropdown">
-          <a class="nav-link" href="/profile/{{ $user->id }}" id="user" role="button">
-            <img src="{{ $user->profile->avatar }}" width="25px" height="25px" alt="{{ $user->profile->showname }}のアイコン" />
-            <span style="{{ $user->profile->name_style }}">{{ $user->profile->showname }}</span>
-          </a>
-        </li>
-      @else
-        <li class="nav-item dropdown"><a class="nav-link" href="/login" id="login" role="button">{{ __('site.signin') }}</a></li>
-        <li class="nav-item dropdown"><a class="nav-link" href="/register" id="register" role="button">{{ __('site.sinkitoroku') }}</a></li>
-      @endif
-    </ul>
+    <noscript>
+      <ul class="navbar-nav ml-auto">
+        @if ($user)
+          <li class="nav-item dropdown">
+            <a class="nav-link" href="/profile/{{ $user->id }}" id="user" role="button">
+              <img src="{{ $user->profile->avatar }}" width="25px" height="25px" alt="{{ $user->profile->showname }}のアイコン" />
+              <span style="{{ $user->profile->name_style }}">{{ $user->profile->showname }}</span>
+            </a>
+          </li>
+        @else
+          <li class="nav-item dropdown"><a class="nav-link" href="/login" id="login" role="button">{{ __('site.signin') }}</a></li>
+          <li class="nav-item dropdown"><a class="nav-link" href="/register" id="register" role="button">{{ __('site.sinkitoroku') }}</a></li>
+        @endif
+      </ul>
+    </noscript>
  </div>
 </nav>
--- a/resources/views/theme/techsuwa/site.blade.php
+++ b/resources/views/theme/techsuwa/site.blade.php
@ -2,20 +2,22 @@
  $user = getUser();
 ?>
 <!DOCTYPE html>
-<html lang="{{ app()->getLocale() }}">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{ app()->getLocale() }}" lang="{{ app()->getLocale() }}">
 <head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta charset="utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />

  <!-- CSRF Token -->
-  <meta name="csrf-token" content="{{ csrf_token() }}">
+  <meta name="csrf-token" content="{{ csrf_token() }}" />
  <title>テクニカル諏訪子</title>
  <!-- Styles -->
  @include('theme.'.env('THEME').'.component.favicon')
  @include('theme.'.env('THEME').'.component.colors')
 </head>
 <body>
+  <div class="fixed-top navbar-expand" style="background-color: #aaaa00; color: #fcfcfc; display: none; padding: 20px; z-index: 5000;" id="jswarning">注意：JavsScriptはONです。安全・安心の為、JavaScriptをOFFにしてお願い致します。</div>
+  <script type="text/javascript">document.getElementById('jswarning').style.display = 'block';</script>
  @include('theme.'.env('THEME').'.component.navbar')
  <main id="app">
    <section>