From fa3d67bdc2cf41ec03dca0a068b4f9a8c6de71eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Wed, 18 Aug 2021 11:50:57 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=82=E3=81=86=E3=82=B3=E3=83=B3=E3=83=91?= =?UTF-8?q?=E3=82=AF=E3=83=88=E3=81=AB=E3=81=97=E3=81=9F=E6=96=B9=E3=81=8C?= =?UTF-8?q?=E3=81=84=E3=81=84=E3=81=8B=E3=82=82=E3=81=97=E3=82=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/conponent/_contents.scss | 2 +- src/conponent/_navbar.scss | 83 +++++++++--------------------------- 2 files changed, 22 insertions(+), 63 deletions(-) diff --git a/src/conponent/_contents.scss b/src/conponent/_contents.scss index 4e531c3..098caa9 100644 --- a/src/conponent/_contents.scss +++ b/src/conponent/_contents.scss @@ -4,7 +4,7 @@ text-align: center; color: $white1; padding: 5px; - font-size: 20px; + font-size: 16px; border-bottom: solid 2px $suwa03; cursor: pointer; transition: background 0.3s, color 0.3s; diff --git a/src/conponent/_navbar.scss b/src/conponent/_navbar.scss index 8d462e3..5b13259 100644 --- a/src/conponent/_navbar.scss +++ b/src/conponent/_navbar.scss @@ -17,30 +17,12 @@ align-items: center; justify-content: space-between; } -.navbar-toggler { - border: 0px solid transparent; - padding: 0.25rem 0.75rem; - font-size: 1.25rem; - line-height: 1; - background-color: transparent; - border-radius: 0.25rem; -} -.navbar-toggler:hover, .navbar-toggler:focus { text-decoration: none; } -.navbar-brand { - display: inline-block; - padding-top: 0.3125rem; - padding-bottom: 0.3125rem; - margin-right: 1rem; - font-size: 1.25rem; - line-height: inherit; - white-space: nowrap; - padding: 5px; -} .navbar-brand, .nav-item { transition: background 0.3s; border-radius: 2px; cursor: pointer; + padding-left: 5px; } .navbar-brand:hover, .nav-item:hover { background-color: $suwa07; @@ -48,7 +30,7 @@ } .sidemenu { border: 2px solid $suwa03; box-shadow: 0 0 7px 3px $suwa04; } -.nav-pills .nav-link { border-radius: 0px; } +.nav-pills .nav-link { border-radius: 0px; font-size: 14px; } .dropdown { position: relative; } .mr-auto { margin-right: auto !important; } @@ -76,6 +58,7 @@ padding-left: 0; margin-bottom: 0; list-style: none; + font-size: 14px; } .navbar-nav .nav-link { @@ -94,48 +77,24 @@ align-items: center; } -.navbar-toggler-icon { - display: inline-block; - width: 1.5em; - height: 1.5em; - vertical-align: middle; - content: ""; - background: no-repeat center center; - background-size: 100% 100%; +.navbar-expand { + flex-flow: row nowrap; + justify-content: flex-start; } - -@media (max-width: 767.98px) { - .navbar-expand > .container, - .navbar-expand > .container-fluid, .navbar-expand > .container-sm, .navbar-expand > .container-md, .navbar-expand > .container-lg, .navbar-expand > .container-xl { - padding-right: 0; - padding-left: 0; - } +.navbar-expand .navbar-nav { + flex-direction: row; } - -@media (min-width: 768px) { - .navbar-expand { - flex-flow: row nowrap; - justify-content: flex-start; - } - .navbar-expand .navbar-nav { - flex-direction: row; - } - .navbar-expand .navbar-nav .dropdown-menu { - position: absolute; - } - .navbar-expand .navbar-nav .nav-link { - padding-right: 0.5rem; - padding-left: 0.5rem; - } - .navbar-expand > .container, - .navbar-expand > .container-fluid, .navbar-expand > .container-sm, .navbar-expand > .container-md, .navbar-expand > .container-lg, .navbar-expand > .container-xl { - flex-wrap: nowrap; - } - .navbar-expand .navbar-collapse { - display: flex !important; - flex-basis: auto; - } - .navbar-expand .navbar-toggler { - display: none; - } +.navbar-expand .navbar-nav .dropdown-menu { + position: absolute; +} +.navbar-expand .navbar-nav .nav-link { + padding-right: 0.5rem; + padding-left: 0.5rem; +} +.navbar-expand > .container, .navbar-expand > .container-fluid { + flex-wrap: nowrap; +} +.navbar-expand .navbar-collapse { + display: flex !important; + flex-basis: auto; } \ No newline at end of file