Update theme.php

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

See merge request harukin/hubzillatheme!25

view/theme/plusfuture/css/icons.css

@@ -1,72 +0,0 @@
-/* include icon font */
-@font-face {
-  font-family: 'Material Icons';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Material Icons'),
-    local('MaterialIcons-Regular'),
-    url(fonts/MaterialIcons-Regular.woff2) format('woff2'),
-    url(fonts/MaterialIcons-Regular.woff) format('woff'),
-    url(fonts/MaterialIcons-Regular.ttf) format('truetype');
-}
-
-
-/* define icon font */
-.material-icons {
-    font-family: 'Material Icons';
-    font-weight: normal;
-    font-style: normal;
-    display: inline-block;
-    line-height: 1;
-    text-transform: none;
-    letter-spacing: normal;
-    word-wrap: normal;
-    white-space: nowrap;
-    direction: ltr;
-  
-    /* Support for all WebKit browsers. */
-    -webkit-font-smoothing: antialiased;
-    /* Support for Safari and Chrome. */
-    text-rendering: optimizeLegibility;
-  
-    /* Support for Firefox. */
-    -moz-osx-font-smoothing: grayscale;
-  
-    /* Support for IE. */
-    font-feature-settings: 'liga';
-  }
-
-/* material icon font settings */
-.fa-th,
-.fa-community,
-.fa-group,
-.fa-users,
-.fa-stack-exchange,
-.fa-user-circle,
-.fa-address-book,
-.fa-street-view,
-.fa-bell,
-.fa-cog,
-.fa-gear,
-.fa-search,
-.fa-question-circle,
-.fa-smile-o,
-.fa-thumbs-o-up,
-.fa-thumbs-o-down {
-    font-family: "Material Icons";
-    font-size: 20px;
-}
-
-.fa-th::before { content: "apps" }
-.fa-community::before, .fa-group::before, .fa-users::before { content: "people" }
-.fa-stack-exchange::before { content: "view_headline" }
-.fa-user-circle::before { content: "account_circle" }
-.fa-address-book::before { content: "contacts" }
-.fa-street-view::before { content: "group_work" }
-.fa-bell::before { content: "notifications" }
-.fa-cog::before, .fa-gear::before { content: "settings" }
-.fa-search::before { content: "search" }
-.fa-question-circle::before { content: "help" }
-.fa-smile-o::before { content: "insert_emoticon" }
-.fa-thumbs-o-up::before { content: "thumb_up" }
-.fa-thumbs-o-down::before { content: "thumb_down" }

view/theme/plusfuture/css/style.css

@@ -1113,9 +1113,8 @@ img.mail-conv-sender-photo {
 
 .wall-item-content-wrapper {
   background-color: $item_colour;
-  border-top-right-radius: 2px;
-  border-top-left-radius: 2px;
-  box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.14);
+  border-top-right-radius: $radius;
+  border-top-left-radius: $radius;
 }
 
 .wall-item-content-wrapper.comment {
@@ -1497,8 +1496,7 @@ blockquote {
 
 .navbar {
   z-index: 1030;
-  box-shadow: 0 1px 8px 0 rgba(0, 0, 0, 0.3);
-  height: 58px;
+  filter: drop-shadow(0px 0px 3px rgba(75, 75, 75, 0.678));
 }
 
 .navbar-dark .navbar-nav .nav-link,
@@ -1856,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));
 }
@@ -1913,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 {
@@ -1926,7 +1919,6 @@ dl.bb-dl > dd > li {
 }
 #user_menu > ul > li > a {
   display: flex;
-  margin-left: 40px;
   margin-top: 7px;
   color: #757575;
 }
@@ -1935,11 +1927,14 @@ dl.bb-dl > dd > li {
 }
 #user_menu > ul > li > a > i {
   font-size: 130%;
-  margin: 0 16px 0px -16px;
+  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);
@@ -2214,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;
@@ -2227,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 {
@@ -2286,17 +2286,13 @@ nav .navbar-nav > .text-truncate {
   position: absolute;
   left: -215px;
 }
-
-.p-2 {
-  padding: 12px 16px !important;
+.panel{
+  border-bottom: darkgray solid 1px;
 }
-
-.btn-outline-secondary {
-  border-color: #ffffff00;
+.collapse{
+  background-color: whitesmoke;
 }
-
-#jot-text-wrap {
-  background-color: #ffffff;
-  box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.14);
-  padding: 4px;
+.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/php/theme_init.php

@@ -6,7 +6,6 @@ head_add_css('/library/bootstrap-tagsinput/bootstrap-tagsinput.css');
 head_add_css('/view/css/bootstrap-red.css');
 head_add_css('/library/datetimepicker/jquery.datetimepicker.css');
 head_add_css('/library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
-head_add_css('/view/theme/plusfuture/css/icons.css');
 require_once('view/php/theme_init.php');
 
 head_add_js('/vendor/twbs/bootstrap/dist/js/bootstrap.bundle.min.js');

view/theme/plusfuture/tpl/head.tpl

@@ -1,20 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="{{$baseurl}}/" />
-<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" />
-{{$metas}}
-{{$head_css}}
-{{$js_strings}}
-{{$head_js}}
-{{$linkrel}}
-{{$plugins}}
-<script>
-	var updateInterval = {{$update_interval}};
-	var localUser = {{if $local_channel}}{{$local_channel}}{{else}}false{{/if}};
-	var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}};
-	var justifiedGalleryActive = false;
-	{{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}}
-	{{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}}
-	var preloadImages = {{$preload_images}};
-</script>
-
-

view/theme/plusfuture/tpl/navbar_default.tpl

@@ -1,8 +1,3 @@
-<head>
-	<link href="https://fonts.googleapis.com/icon?family=Material+Icons"
-      rel="stylesheet">
-</head>
-
 <div style="display: flex;">
 	<button id="expand-aside" type="button" class="d-lg-none navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1">
 		<i class="fa fa-bars" id="expand-aside-icon"></i>

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>