Update theme.php

Revert "ナビバーのカラー要素修正"

See merge request harukin/hubzillatheme!25

view/theme/plusfuture/css/style.css

@@ -1854,15 +1854,11 @@ dl.bb-dl > dd > li {
 }
 .toplevel_item,
 #notifications,
-#profile-jot-wrapper {
-  box-shadow: 0px 0px 1px 1px rgba(75, 75, 75, 0.1);
-  transition: all 300ms 0s;
-}
-.toplevel_item:hover,
-#notifications:hover,
-#profile-jot-wrapper:hover {
-  box-shadow: 0px 0px 5px 2px rgba(75, 75, 75, 0.5);
+#profile-jot-wrapper
+.toplevel_item, #notifications, #profile-jot-wrapper, .toplevel_item:hover, #notifications:hover, #profile-jot-wrapper:hover, .panel {
+  box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.12);
 }
+
 .dropdown-menu {
   filter: drop-shadow(0px 0px 5px rgba(75, 75, 75, 0.48));
 }
@@ -1911,7 +1907,6 @@ dl.bb-dl > dd > li {
 #user_menu > ul > li {
   font-size: 1.2em;
   position: relative;
-  left: -40px;
   transition: all 300ms 0s;
 }
 .region_1-on #user_menu > ul > iframe {
@@ -1924,7 +1919,6 @@ dl.bb-dl > dd > li {
 }
 #user_menu > ul > li > a {
   display: flex;
-  margin-left: 40px;
   margin-top: 7px;
   color: #757575;
 }
@@ -1933,11 +1927,14 @@ dl.bb-dl > dd > li {
 }
 #user_menu > ul > li > a > i {
   font-size: 130%;
-  margin: 0 20px 0px -20px;
+  margin-right: 20px;
 }
 #user_menu > ul > li > a > p {
   margin-bottom: 0.5rem;
 }
+.sub p{
+  font-size: 1rem;
+}
 
 a[title*="harukin@plus.haruk.in"] {
   color: rgb(170, 2, 2);
@@ -2212,7 +2209,9 @@ nav .navbar-nav > .text-truncate {
     display: none;
   }
 }
-
+#profile-jot-submit-left > div:first-of-type{
+  width: 130px;
+}
 @media screen and (min-width: 450px) {
   nav .navbar-nav > .text-truncate {
     font-size: unset;
@@ -2225,6 +2224,9 @@ nav .navbar-nav > .text-truncate {
     /*カスタマイズ*/
     min-width: 0;
   }
+  #profile-jot-submit-left > div:first-of-type{
+    width: unset;
+  }
 }
 @media screen and (min-width: 993px) {
   .region_3-on {
@@ -2284,3 +2286,13 @@ nav .navbar-nav > .text-truncate {
   position: absolute;
   left: -215px;
 }
+.panel{
+  border-bottom: darkgray solid 1px;
+}
+.collapse{
+  background-color: whitesmoke;
+}
+.panel > div > h3 > a{
+  padding-right: 100vw;
+  text-decoration: none;
+}

view/theme/plusfuture/php/theme.php

@@ -5,7 +5,7 @@
  *   * Description: Hubzilla to Google+ theme
  *   * Version: 1.0
  *   * MinVersion: 2.3.1
- *   * MaxVersion: 6.0
+ *   * MaxVersion: 9.0
  *   * Author: harukin
  *   * Maintainer: harukin
  */

view/theme/plusfuture/tpl/userlogomenu.tpl

@@ -50,19 +50,19 @@
         </a>
       </li>
 
-      <li class="nav-item user_details">
+      <li class="nav-item user_details sub" style="border-top: solid 1px darkgray;">
         <a class="nav-link" href="settings">
           <p>設定</p>
         </a>
       </li>
 
-      <li class="nav-item user_details">
+      <li class="nav-item user_details sub">
         <a class="nav-link" href="help">
           <p>ヘルプ</p>
         </a>
       </li>
 
-      <li class="nav-item user_details">
+      <li class="nav-item user_details sub" >
         <a class="nav-link" href="help/TermsOfService">
           <p>利用規約</p>
         </a>