既知の問題の修正、アイコンの最適化など

影の変更、トップバーの高さ調整
衝突回避
2019-05-10 19:13:45 +09:00 · 2019-05-05 21:49:19 +09:00 · 2019-05-03 23:10:16 +09:00 · 2019-05-03 23:07:49 +09:00 · 2019-05-03 23:01:36 +09:00 · 2019-05-03 22:55:18 +09:00
65 changed files with 4089 additions and 2085 deletions
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 BOETZILLA
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
@@ -0,0 +1,36 @@
+<?php
+namespace Zotlabs\Module;
+require_once("include/oembed.php");
+
+
+class Oembed extends \Zotlabs\Web\Controller {
+
+	function init(){
+		// logger('mod_oembed ' . \App::$query_string, LOGGER_ALL);
+	
+		if(argc() > 1) {
+			if (argv(1) == 'b2h'){
+				$url = array( "", trim(hex2bin($_REQUEST['url'])));
+				echo oembed_replacecb($url);
+				killme();
+			}
+		
+			elseif (argv(1) == 'h2b'){
+				$text = trim(hex2bin($_REQUEST['text']));
+				echo oembed_html2bbcode($text);
+				killme();
+			}
+		
+			else {
+				echo "<html><head><base target=\"_blank\" rel=\"nofollow noopener\" /><link rel=\"stylesheet\" href=\"/view/theme/redbasic/schema/bluebasic.css\"></head><body>";
+				$src = base64url_decode(argv(1));
+				$j = oembed_fetch_url($src);
+				echo $j['html'];
+	//		    logger('mod-oembed ' . $h, LOGGER_ALL);
+				echo "</body></html>";
+			}
+		}
+		killme();
+	}
+	
+}
@@ -1,129 +0,0 @@
-/**
- * plusfuture theme specific JavaScript
- */
-
-$(document).ready(function() {
-
-	// CSS3 calc() fallback (for unsupported browsers)
-	$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
-	if( $('#css3-calc').width() == 10) {
-		$(window).resize(function() {
-			if($(window).width() < 992) {
-				$('main').css('width', $(window).width() + $('aside').outerWidth() );
-			} else {
-				$('main').css('width', '100%' );
-			}
-		});
-	}
-	$('#css3-calc').remove(); // Remove the test element
-
-	if($(window).width() >= 992) {
-		$('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({
-			offset_top: parseInt($('aside').css('padding-top')),
-			parent: 'main',
-			spacer: '.aside_spacer'
-		});
-	}
-
-	$('#expand-aside').on('click', toggleAside);
-
-	$('section').on('click', function() {
-		if($('main').hasClass('region_1-on')){
-			toggleAside();
-		}
-	});
-
-	var left_aside_height = $('#left_aside_wrapper').height();
-
-	$('#left_aside_wrapper').on('click', function() {
-		if(left_aside_height != $('#left_aside_wrapper').height()) {
-			$(document.body).trigger("sticky_kit:recalc");
-			left_aside_height = $('#left_aside_wrapper').height();
-		}
-	});
-
-
-	var right_aside_height = $('#right_aside_wrapper').height();
-
-	$('#right_aside_wrapper').on('click', function() {
-		if(right_aside_height != $('#right_aside_wrapper').height()) {
-			$(document.body).trigger("sticky_kit:recalc");
-			right_aside_height = $('#right_aside_wrapper').height();
-		}
-	});
-
-	$('.usermenu').click(function() {
-		if($('#navbar-collapse-1, #navbar-collapse-2').hasClass('show')){
-			$('#navbar-collapse-1, #navbar-collapse-2').removeClass('show');
-		}
-	});
-
-	$('#menu-btn').click(function() {
-		if($('#navbar-collapse-1').hasClass('show')){
-			$('#navbar-collapse-1').removeClass('show');
-		}
-	});
-
-	$('.notifications-btn').click(function(e) {
-		e.preventDefault();
-		e.stopPropagation();
-		if($('#navbar-collapse-2').hasClass('show')){
-			$('#navbar-collapse-2').removeClass('show');
-		}
-	});
-
-	$("input[data-role=cat-tagsinput]").tagsinput({
-		tagClass: 'badge badge-pill badge-warning text-dark'
-	});
-
-	$('a.disabled').click(function(e) {
-		e.preventDefault();
-		e.stopPropagation();
-	});
-
-	var doctitle = document.title;
-	function checkNotify() {
-		var notifyUpdateElem = document.getElementById('notify-update');
-		if(notifyUpdateElem !== null) { 
-			if(notifyUpdateElem.innerHTML !== "")
-				document.title = "(" + notifyUpdateElem.innerHTML + ") " + doctitle;
-			else
-				document.title = doctitle;
-		}
-	}
-	setInterval(function () {checkNotify();}, 10 * 1000);
-});
-
-function makeFullScreen(full) {
-	if(typeof full=='undefined' || full == true) {
-		$('main').addClass('fullscreen');
-		$('header, nav, aside, #fullscreen-btn').attr('style','display:none !important');
-		$('#inline-btn').show();
-	}
-	else {
-		$('main').removeClass('fullscreen');
-		$('header, nav, aside, #fullscreen-btn').show();
-		$('#inline-btn').hide();
-		$(document.body).trigger("sticky_kit:recalc");
-	}
-}
-
-function toggleAside() {
-	$('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left');
-	if($('main').hasClass('region_1-on')){
-		$('html, body').css('overflow-x', '');
-		$('main').removeClass('region_1-on')
-		$('#overlay').remove();
-		$('#left_aside_wrapper').trigger("sticky_kit:detach");
-	}
-	else {
-		$('html, body').css('overflow-x', 'hidden');
-		$('main').addClass('region_1-on')
-		$('<div id="overlay"></div>').appendTo('section');
-		$('#left_aside_wrapper').stick_in_parent({
-			offset_top: $('nav').outerHeight(true) + 10,
-			parent: '#region_1',
-			spacer: '#left_aside_spacer'
-		});
-	}
-}
@@ -1,128 +0,0 @@
-<?php
-
-namespace Zotlabs\Theme;
-
-class plusfutureConfig {
-
-	function get_schemas() {
-		$files = glob('view/theme/plusfuture/schema/*.php');
-
-		$scheme_choices = [];
-
-		if($files) {
-
-			if(in_array('view/theme/plusfuture/schema/default.php', $files)) {
-				$scheme_choices['---'] = t('Default');
-				$scheme_choices['focus'] = t('Focus (Hubzilla default)');
-			}
-			else {
-				$scheme_choices['---'] = t('Focus (Hubzilla default)');
-			}
-
-			foreach($files as $file) {
-				$f = basename($file, ".php");
-				if($f != 'default') {
-					$scheme_name = $f;
-					$scheme_choices[$f] = $scheme_name;
-				}
-			}
-		}
-
-		return $scheme_choices;
-	}
-
-	function get() {
-		if(! local_channel()) { 
-			return;
-		}
-
-		$arr = array();
-		$arr['narrow_navbar'] = get_pconfig(local_channel(),'plusfuture', 'narrow_navbar' );
-		$arr['nav_bg'] = get_pconfig(local_channel(),'plusfuture', 'nav_bg' );
-		$arr['nav_icon_colour'] = get_pconfig(local_channel(),'plusfuture', 'nav_icon_colour' );
-		$arr['nav_active_icon_colour'] = get_pconfig(local_channel(),'plusfuture', 'nav_active_icon_colour' );
-		$arr['link_colour'] = get_pconfig(local_channel(),'plusfuture', 'link_colour' );
-		$arr['banner_colour'] = get_pconfig(local_channel(),'plusfuture', 'banner_colour' );
-		$arr['bgcolour'] = get_pconfig(local_channel(),'plusfuture', 'background_colour' );
-		$arr['background_image'] = get_pconfig(local_channel(),'plusfuture', 'background_image' );
-		$arr['item_colour'] = get_pconfig(local_channel(),'plusfuture', 'item_colour' );
-		$arr['comment_item_colour'] = get_pconfig(local_channel(),'plusfuture', 'comment_item_colour' );
-		$arr['font_size'] = get_pconfig(local_channel(),'plusfuture', 'font_size' );
-		$arr['font_colour'] = get_pconfig(local_channel(),'plusfuture', 'font_colour' );
-		$arr['radius'] = get_pconfig(local_channel(),'plusfuture', 'radius' );
-		$arr['shadow'] = get_pconfig(local_channel(),'plusfuture', 'photo_shadow' );
-		$arr['converse_width']=get_pconfig(local_channel(),"plusfuture","converse_width");
-		$arr['top_photo']=get_pconfig(local_channel(),"plusfuture","top_photo");
-		$arr['reply_photo']=get_pconfig(local_channel(),"plusfuture","reply_photo");
-		$arr['advanced_theming'] = get_pconfig(local_channel(), 'plusfuture', 'advanced_theming');
-		return $this->form($arr);
-	}
-
-	function post() {
-		if(!local_channel()) { 
-			return;
-		}
-
-		if (isset($_POST['plusfuture-settings-submit'])) {
-			set_pconfig(local_channel(), 'plusfuture', 'narrow_navbar', $_POST['plusfuture_narrow_navbar']);
-			set_pconfig(local_channel(), 'plusfuture', 'nav_bg', $_POST['plusfuture_nav_bg']);
-			set_pconfig(local_channel(), 'plusfuture', 'nav_icon_colour', $_POST['plusfuture_nav_icon_colour']);
-			set_pconfig(local_channel(), 'plusfuture', 'nav_active_icon_colour', $_POST['plusfuture_nav_active_icon_colour']);
-			set_pconfig(local_channel(), 'plusfuture', 'link_colour', $_POST['plusfuture_link_colour']);
-			set_pconfig(local_channel(), 'plusfuture', 'background_colour', $_POST['plusfuture_background_colour']);
-			set_pconfig(local_channel(), 'plusfuture', 'banner_colour', $_POST['plusfuture_banner_colour']);
-			set_pconfig(local_channel(), 'plusfuture', 'background_image', $_POST['plusfuture_background_image']);
-			set_pconfig(local_channel(), 'plusfuture', 'item_colour', $_POST['plusfuture_item_colour']);
-			set_pconfig(local_channel(), 'plusfuture', 'comment_item_colour', $_POST['plusfuture_comment_item_colour']);
-			set_pconfig(local_channel(), 'plusfuture', 'font_size', $_POST['plusfuture_font_size']);
-			set_pconfig(local_channel(), 'plusfuture', 'font_colour', $_POST['plusfuture_font_colour']);
-			set_pconfig(local_channel(), 'plusfuture', 'radius', $_POST['plusfuture_radius']);
-			set_pconfig(local_channel(), 'plusfuture', 'photo_shadow', $_POST['plusfuture_shadow']);
-			set_pconfig(local_channel(), 'plusfuture', 'converse_width', $_POST['plusfuture_converse_width']);
-			set_pconfig(local_channel(), 'plusfuture', 'top_photo', $_POST['plusfuture_top_photo']);
-			set_pconfig(local_channel(), 'plusfuture', 'reply_photo', $_POST['plusfuture_reply_photo']);
-			set_pconfig(local_channel(), 'plusfuture', 'advanced_theming', $_POST['plusfuture_advanced_theming']);
-		}
-	}
-
-	function form($arr) {
-
-		if(get_pconfig(local_channel(), 'plusfuture', 'advanced_theming'))
-			$expert = 1;
-					
-	  	$o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
-			'$submit' => t('Submit'),
-			'$baseurl' => z_root(),
-			'$theme' => \App::$channel['channel_theme'],
-			'$expert' => $expert,
-			'$title' => t("Theme settings"),
-			'$narrow_navbar' => array('plusfuture_narrow_navbar',t('Narrow navbar'),$arr['narrow_navbar'], '', array(t('No'),t('Yes'))),
-			'$nav_bg' => array('plusfuture_nav_bg', t('Navigation bar background color'), $arr['nav_bg']),
-			'$nav_icon_colour' => array('plusfuture_nav_icon_colour', t('Navigation bar icon color '), $arr['nav_icon_colour']),	
-			'$nav_active_icon_colour' => array('plusfuture_nav_active_icon_colour', t('Navigation bar active icon color '), $arr['nav_active_icon_colour']),
-			'$link_colour' => array('plusfuture_link_colour', t('Link color'), $arr['link_colour'], '', $link_colours),
-			'$banner_colour' => array('plusfuture_banner_colour', t('Set font-color for banner'), $arr['banner_colour']),
-			'$bgcolour' => array('plusfuture_background_colour', t('Set the background color'), $arr['bgcolour']),
-			'$background_image' => array('plusfuture_background_image', t('Set the background image'), $arr['background_image']),	
-			'$item_colour' => array('plusfuture_item_colour', t('Set the background color of items'), $arr['item_colour']),
-			'$comment_item_colour' => array('plusfuture_comment_item_colour', t('Set the background color of comments'), $arr['comment_item_colour']),
-			'$font_size' => array('plusfuture_font_size', t('Set font-size for the entire application'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
-			'$font_colour' => array('plusfuture_font_colour', t('Set font-color for posts and comments'), $arr['font_colour']),
-			'$radius' => array('plusfuture_radius', t('Set radius of corners'), $arr['radius'], t('Example: 4px')),
-			'$shadow' => array('plusfuture_shadow', t('Set shadow depth of photos'), $arr['shadow']),
-			'$converse_width' => array('plusfuture_converse_width',t('Set maximum width of content region in pixel'),$arr['converse_width'], t('Leave empty for default width')),
-			'$top_photo' => array('plusfuture_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
-			'$reply_photo' => array('plusfuture_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
-			'$advanced_theming' => ['plusfuture_advanced_theming', t('Show advanced settings'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]
-			));
-
-		return $o;
-	}
-
-}
-
-
-
-
-
-
@@ -0,0 +1,72 @@
+/* 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" }
@@ -0,0 +1,5 @@
+.toplevel_item{
+	width: 100%;
+	margin-left: unset;
+	margin-right: unset;
+}
@@ -0,0 +1,172 @@
+/**
+ * plusfuture theme specific JavaScript
+ */
+
+$(document).ready(function() {
+  // CSS3 calc() fallback (for unsupported browsers)
+  $("body").append(
+    '<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>'
+  );
+  if ($("#css3-calc").width() == 10) {
+    $(window).resize(function() {
+      if ($(window).width() < 992) {
+        $("main").css("width", $(window).width() + $("aside").outerWidth());
+      } else {
+        $("main").css("width", "100%");
+      }
+    });
+  }
+  $("#css3-calc").remove(); // Remove the test element
+
+  if ($(window).width() >= 992) {
+    $("#left_aside_wrapper, #right_aside_wrapper").stick_in_parent({
+      offset_top: parseInt($("aside").css("padding-top")),
+      parent: "main",
+      spacer: ".aside_spacer"
+    });
+  }
+  $("#expand-aside").on("click", toggleAside);
+
+  $("section").on("click", function() {
+    if ($("main").hasClass("region_1-on")) {
+      toggleAside();
+    }
+  });
+
+  $("section").on("click", function() {
+    if ($("main").hasClass("region_3-on")) {
+      if ($(window).width() < 982) {
+        toggleBside();
+      }
+    }
+  });
+
+  var left_aside_height = $("#left_aside_wrapper").height();
+
+  $("#left_aside_wrapper").on("click", function() {
+    if (left_aside_height != $("#left_aside_wrapper").height()) {
+      $(document.body).trigger("sticky_kit:recalc");
+      left_aside_height = $("#left_aside_wrapper").height();
+    }
+  });
+
+  var right_aside_height = $("#right_aside_wrapper").height();
+
+  $("#right_aside_wrapper").on("click", function() {
+    if (right_aside_height != $("#right_aside_wrapper").height()) {
+      $(document.body).trigger("sticky_kit:recalc");
+      right_aside_height = $("#right_aside_wrapper").height();
+    }
+  });
+
+  $(".usermenu").click(function() {
+    if ($("#navbar-collapse-1, #navbar-collapse-2").hasClass("show")) {
+      $("#navbar-collapse-1, #navbar-collapse-2").removeClass("show");
+    }
+  });
+
+  $("#menu-btn").click(function() {
+    if ($("#navbar-collapse-1").hasClass("show")) {
+      $("#navbar-collapse-1").removeClass("show");
+    }
+  });
+
+  $(".notifications-btn").click(function(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    if ($("#navbar-collapse-2").hasClass("show")) {
+      $("#navbar-collapse-2").removeClass("show");
+    }
+  });
+
+  $("input[data-role=cat-tagsinput]").tagsinput({
+    tagClass: "badge badge-pill badge-warning text-dark"
+  });
+
+  $("a.disabled").click(function(e) {
+    e.preventDefault();
+    e.stopPropagation();
+  });
+
+  var doctitle = document.title;
+  function checkNotify() {
+    var notifyUpdateElem = document.getElementById("notify-update");
+    if (notifyUpdateElem !== null) {
+      if (notifyUpdateElem.innerHTML !== "")
+        document.title = "(" + notifyUpdateElem.innerHTML + ") " + doctitle;
+      else document.title = doctitle;
+    }
+  }
+  setInterval(function() {
+    checkNotify();
+  }, 10 * 1000);
+  //トップに戻る
+  $("nav").click(function(e) {
+    if ($(e.target).is("a")||$(e.target).is("button")||$(e.target).is("img")||$(e.target).is("i")) {
+      return true;
+    }
+    $("body,html").animate(
+      {
+        scrollTop: 0
+      },
+      150
+    );
+  });
+});
+
+function makeFullScreen(full) {
+  if (typeof full == "undefined" || full == true) {
+    $("main").addClass("fullscreen");
+    $("header, nav, aside, #fullscreen-btn").attr(
+      "style",
+      "display:none !important"
+    );
+    $("#inline-btn").show();
+  } else {
+    $("main").removeClass("fullscreen");
+    $("header, nav, aside, #fullscreen-btn").show();
+    $("#inline-btn").hide();
+    $(document.body).trigger("sticky_kit:recalc");
+  }
+}
+
+function toggleAside() {
+  $("#expand-aside-icon")
+    .toggleClass("fa-arrow-circle-right")
+    .toggleClass("fa-arrow-circle-left");
+  if ($("main").hasClass("region_1-on")) {
+    $("html, body").css("overflow-x", "");
+    $("main").removeClass("region_1-on");
+    $("#overlay").remove();
+    $("#left_aside_wrapper").trigger("sticky_kit:detach");
+  } else {
+    $("html, body").css("overflow-x", "hidden");
+    $("main").addClass("region_1-on");
+    $('<div id="overlay"></div>').appendTo("section");
+    $("#left_aside_wrapper").stick_in_parent({
+      offset_top: $("nav").outerHeight(true) + 10,
+      parent: "#region_1",
+      spacer: "#left_aside_spacer"
+    });
+  }
+}
+
+function toggleBside() {
+  if ($("main").hasClass("region_3-on")) {
+    $("html, body").css("overflow-x", "");
+    $("main").removeClass("region_3-on");
+    $("#region_3").addClass("d-none");
+    $("#overlay").remove();
+    $("#right_aside_wrapper").trigger("sticky_kit:detach");
+  } else {
+    $("html, body").css("overflow-x", "hidden");
+    $("main").addClass("region_3-on");
+    $("#region_3").removeClass("d-none");
+    $('<div id="overlay"></div>').appendTo("section");
+    $("#right_aside_wrapper").stick_in_parent({
+      offset_top: $("nav").outerHeight(true) + 10,
+      parent: "#region_3",
+      spacer: "#right_aside_spacer"
+    });
+  }
+}
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=admin][/widget]
+[/region]
@@ -0,0 +1,16 @@
+[region=aside]
+[widget=userlogomenu][/widget]
+[block]wetter[/block]
+[/region]
+
+[region=content]
+[widget=zcard][/widget]
+$content
+[/region]
+
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=shortprofile][/widget]
+[widget=categories][/widget]
+[widget=archive][var=wall]1[/var][/widget]
+[/region]
@@ -0,0 +1,18 @@
+[region=nav]$nav[/region]
+
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+
+[region=content]
+$content
+[/region]
+
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=follow][/widget]
+[widget=collections][var=mode]groups[/var][/widget]
+[widget=findpeople][/widget]
+
+[widget=suggestions][/widget]
+[/region]
@@ -0,0 +1,10 @@
+[region=aside]
+[widget=vcard][/widget]
+[widget=userlogomenu][/widget]
+[/region]
+[region=right_aside]
+[widget=collections][var=mode]abook[/var][/widget]
+[widget=findpeople][/widget]
+[widget=suggestions][/widget]
+[widget=notifications][/widget]
+[/region]
@@ -0,0 +1,18 @@
+[region=nav]$nav[/region]
+
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+
+[region=content]
+$content
+[/region]
+
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=findpeople][/widget]
+[widget=dirsort][/widget]
+[widget=dirsafe][/widget]
+[widget=dirtags][/widget]
+[widget=suggestions][/widget]
+[/region]
@@ -0,0 +1,13 @@
+[region=nav]$nav[/region]
+
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+
+[region=content]
+$content
+[/region]
+
+[region=right_aside]
+[widget=notifications][/widget]
+[/region]
@@ -0,0 +1,8 @@
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=eventstools][/widget]
+[widget=tasklist][/widget]
+[/region]
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=collections][var=mode]groups[/var][/widget]
+[/region]
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=helpindex][/widget]
+[/region]
@@ -0,0 +1,9 @@
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=mailmenu][/widget]
+[widget=conversations][/widget]
+[widget=newmember][/widget]
+[/region]
@@ -0,0 +1,6 @@
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+[region=right_aside]
+[widget=notifications][/widget]
+[/region]
@@ -0,0 +1,16 @@
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+
+[region=content]
+$content
+[/region]
+
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=affinity][/widget]
+[widget=activity_order][/widget]
+[widget=activity_filter][/widget]
+[widget=archive][var=wall]1[/var][/widget]
+[widget=common_friends][/widget]
+[/region]
@@ -0,0 +1,8 @@
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+
+[region=right_aside]
+[widget=common_friends][/widget]
+[widget=suggestions][/widget]
+[/region]
@@ -0,0 +1,9 @@
+[region=aside]
+[widget=vcard][/widget]
+[widget=userlogomenu][/widget]
+[/region]
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=photo_albums][/widget]
+[widget=newmember][/widget]
+[/region]
@@ -0,0 +1,18 @@
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+
+[region=content]
+[widget=zcard][/widget]
+$content
+[/region]
+
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=collections][var=mode]groups[/var][/widget]
+[widget=collections][var=mode]forums[/var][/widget]
+[widget=collections][var=mode]folder[/var][/widget]
+[widget=contact-block][/widget]
+[widget=photo_albums][/widget]
+[menu]roll[/menu]
+[/region]
@@ -0,0 +1,14 @@
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+
+[region=content]
+[widget=affinity][/widget]
+$content
+[/region]
+
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=pubtagcloud][var=trending]8[/var][var=limit]20[/var][/widget]
+[widget=archive][var=wall]1[/var][/widget]
+[/region]
@@ -0,0 +1,13 @@
+[region=aside]
+[widget=userlogomenu][/widget]
+[widget=notifications][/widget]
+[/region]
+
+[region=content]
+[widget=zcard][/widget]
+$content
+[/region]
+
+[region=right_aside]
+[widget=suggestions][/widget]
+[/region]
@@ -0,0 +1,6 @@
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+[region=right_aside]
+[widget=notifications][/widget]
+[/region]
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=settings_menu][/widget]
+[/region]
@@ -0,0 +1,13 @@
+[region=aside]
+[widget=userlogomenu][/widget]
+[/region]
+
+[region=content]
+[widget=zcard][/widget]
+$content
+[/region]
+
+[region=right_aside]
+[widget=notifications][/widget]
+[widget=wiki_pages][/widget]
+[/region]
@@ -0,0 +1,135 @@
+<?php
+
+namespace Zotlabs\Theme;
+
+class plusfutureConfig
+{
+
+	function get_schemas()
+	{
+		$files = glob('view/theme/plusfuture/schema/*.php');
+
+		$scheme_choices = [];
+
+		if ($files) {
+
+			if (in_array('view/theme/plusfuture/schema/default.php', $files)) {
+				$scheme_choices['---'] = t('Default');
+				$scheme_choices['focus'] = t('Focus (Hubzilla default)');
+			} else {
+				$scheme_choices['---'] = t('Focus (Hubzilla default)');
+			}
+
+			foreach ($files as $file) {
+				$f = basename($file, ".php");
+				if ($f != 'default') {
+					$scheme_name = $f;
+					$scheme_choices[$f] = $scheme_name;
+				}
+			}
+		}
+
+		return $scheme_choices;
+	}
+
+	function get()
+	{
+		if (!local_channel()) {
+			return;
+		}
+
+		$arr = array();
+		$arr['narrow_navbar'] = get_pconfig(local_channel(), 'plusfuture', 'narrow_navbar');
+		$arr['singlepost'] = get_pconfig(local_channel(), 'plusfuture', 'singlepost');
+		$arr['nav_bg'] = get_pconfig(local_channel(), 'plusfuture', 'nav_bg');
+		$arr['nav_icon_colour'] = get_pconfig(local_channel(), 'plusfuture', 'nav_icon_colour');
+		$arr['nav_active_icon_colour'] = get_pconfig(local_channel(), 'plusfuture', 'nav_active_icon_colour');
+		$arr['link_colour'] = get_pconfig(local_channel(), 'plusfuture', 'link_colour');
+		$arr['banner_colour'] = get_pconfig(local_channel(), 'plusfuture', 'banner_colour');
+		$arr['bgcolour'] = get_pconfig(local_channel(), 'plusfuture', 'background_colour');
+		$arr['background_image'] = get_pconfig(local_channel(), 'plusfuture', 'background_image');
+		$arr['item_colour'] = get_pconfig(local_channel(), 'plusfuture', 'item_colour');
+		$arr['comment_item_colour'] = get_pconfig(local_channel(), 'plusfuture', 'comment_item_colour');
+		$arr['font_size'] = get_pconfig(local_channel(), 'plusfuture', 'font_size');
+		$arr['font_colour'] = get_pconfig(local_channel(), 'plusfuture', 'font_colour');
+		$arr['radius'] = get_pconfig(local_channel(), 'plusfuture', 'radius');
+		$arr['shadow'] = get_pconfig(local_channel(), 'plusfuture', 'photo_shadow');
+		$arr['converse_width'] = get_pconfig(local_channel(), "plusfuture", "converse_width");
+		$arr['top_photo'] = get_pconfig(local_channel(), "plusfuture", "top_photo");
+		$arr['reply_photo'] = get_pconfig(local_channel(), "plusfuture", "reply_photo");
+		$arr['advanced_theming'] = get_pconfig(local_channel(), 'plusfuture', 'advanced_theming');
+		return $this->form($arr);
+	}
+
+	function post()
+	{
+		if (!local_channel()) {
+			return;
+		}
+
+		if (isset($_POST['plusfuture-settings-submit'])) {
+			set_pconfig(local_channel(), 'plusfuture', 'narrow_navbar', $_POST['plusfuture_narrow_navbar']);
+			set_pconfig(local_channel(), 'plusfuture', 'singlepost', $_POST['plusfuture_singlepost']);
+			set_pconfig(local_channel(), 'plusfuture', 'nav_bg', $_POST['plusfuture_nav_bg']);
+			set_pconfig(local_channel(), 'plusfuture', 'nav_icon_colour', $_POST['plusfuture_nav_icon_colour']);
+			set_pconfig(local_channel(), 'plusfuture', 'nav_active_icon_colour', $_POST['plusfuture_nav_active_icon_colour']);
+			set_pconfig(local_channel(), 'plusfuture', 'link_colour', $_POST['plusfuture_link_colour']);
+			set_pconfig(local_channel(), 'plusfuture', 'background_colour', $_POST['plusfuture_background_colour']);
+			set_pconfig(local_channel(), 'plusfuture', 'banner_colour', $_POST['plusfuture_banner_colour']);
+			set_pconfig(local_channel(), 'plusfuture', 'background_image', $_POST['plusfuture_background_image']);
+			set_pconfig(local_channel(), 'plusfuture', 'item_colour', $_POST['plusfuture_item_colour']);
+			set_pconfig(local_channel(), 'plusfuture', 'comment_item_colour', $_POST['plusfuture_comment_item_colour']);
+			set_pconfig(local_channel(), 'plusfuture', 'font_size', $_POST['plusfuture_font_size']);
+			set_pconfig(local_channel(), 'plusfuture', 'font_colour', $_POST['plusfuture_font_colour']);
+			set_pconfig(local_channel(), 'plusfuture', 'radius', $_POST['plusfuture_radius']);
+			set_pconfig(local_channel(), 'plusfuture', 'photo_shadow', $_POST['plusfuture_shadow']);
+			set_pconfig(local_channel(), 'plusfuture', 'converse_width', $_POST['plusfuture_converse_width']);
+			set_pconfig(local_channel(), 'plusfuture', 'top_photo', $_POST['plusfuture_top_photo']);
+			set_pconfig(local_channel(), 'plusfuture', 'reply_photo', $_POST['plusfuture_reply_photo']);
+			set_pconfig(local_channel(), 'plusfuture', 'advanced_theming', $_POST['plusfuture_advanced_theming']);
+		}
+	}
+
+	function form($arr)
+	{
+
+		if (get_pconfig(local_channel(), 'plusfuture', 'advanced_theming'))
+			$expert = 1;
+
+		$o .= replace_macros(get_markup_template('theme_settings.tpl'), array(
+			'$submit' => t('Submit'),
+			'$baseurl' => z_root(),
+			'$theme' => \App::$channel['channel_theme'],
+			'$expert' => $expert,
+			'$title' => t("Theme settings"),
+			'$narrow_navbar' => array('plusfuture_narrow_navbar', t('細めのナビバー'), $arr['narrow_navbar'], '', array(t('No'), t('Yes'))),
+			'$singlepost' => array('plusfuture_singlepost', t('Singlepost'), $arr['singlepost'], '', array(t('No'), t('Yes'))),
+			'$nav_bg' => array('plusfuture_nav_bg', t('ナビゲーションバーバックグラウンドカラー'), $arr['nav_bg']),
+			'$nav_icon_colour' => array('plusfuture_nav_icon_colour', t('ナビゲーションバーアイコンカラー'), $arr['nav_icon_colour']),
+			'$nav_active_icon_colour' => array('plusfuture_nav_active_icon_colour', t('ナビゲーションバーアクティブアイコンカラー'), $arr['nav_active_icon_colour']),
+			'$link_colour' => array('plusfuture_link_colour', t('リンクカラー'), $arr['link_colour'], '', $link_colours),
+			'$banner_colour' => array('plusfuture_banner_colour', t('バナーのフォントカラー'), $arr['banner_colour']),
+			'$bgcolour' => array('plusfuture_background_colour', t('バックグラウンドカラー'), $arr['bgcolour']),
+			'$background_image' => array('plusfuture_background_image', t('バックグラウンド画像'), $arr['background_image']),
+			'$item_colour' => array('plusfuture_item_colour', t('バックグラウンドの画像や色を指定してください。'), $arr['item_colour']),
+			'$comment_item_colour' => array('plusfuture_comment_item_colour', t('コメント欄のアイテムカラー'), $arr['comment_item_colour']),
+			'$font_size' => array('plusfuture_font_size', t('フォントサイズ'), $arr['font_size'], t('Examples: 1rem, 100%, 16px')),
+			'$font_colour' => array('plusfuture_font_colour', t('投稿とコメントのフォントサイズ'), $arr['font_colour']),
+			'$radius' => array('plusfuture_radius', t('カードの角丸'), $arr['radius'], t('Example: 4px')),
+			'$shadow' => array('plusfuture_shadow', t('影'), $arr['shadow']),
+			'$converse_width' => array('plusfuture_converse_width', t('コンテンツの幅指定'), $arr['converse_width'], t('Leave empty for default width')),
+			'$top_photo' => array('plusfuture_top_photo', t('Set size of conversation author photo'), $arr['top_photo']),
+			'$reply_photo' => array('plusfuture_reply_photo', t('Set size of followup author photos'), $arr['reply_photo']),
+			'$advanced_theming' => ['plusfuture_advanced_theming', t('詳細設定を開く'), $arr['advanced_theming'], '', [t('No'), t('Yes')]]
+		));
+
+		return $o;
+	}
+
+}
+
+
+
+
+
+
@@ -14,6 +14,7 @@ if(! App::$install) {
 	$nav_icon_colour = get_pconfig($uid, 'plusfuture', 'nav_icon_colour');
 	$nav_active_icon_colour = get_pconfig($uid, 'plusfuture', 'nav_active_icon_colour');
 	$banner_colour = get_pconfig($uid,'plusfuture','banner_colour');
+	$singlepost = get_pconfig($uid,'plusfuture','singlepost');
 	$narrow_navbar = get_pconfig($uid,'plusfuture','narrow_navbar');
 	$link_colour = get_pconfig($uid, 'plusfuture', 'link_colour');
 	$schema = get_pconfig($uid,'plusfuture','schema');
@@ -97,11 +98,11 @@ if (! $font_size)
 if (! $font_colour)
 	$font_colour = '#4d4d4d';
 if (! $radius)
-	$radius = '0.25rem';
+	$radius = '1px';
 if (! $shadow)
 	$shadow = '0';
 if (! $converse_width)
-	$converse_width = '790';
+	$converse_width = '';
 if(! $top_photo)
 	$top_photo = '3rem';
 if(! $reply_photo)
@@ -116,6 +117,9 @@ if(file_exists('view/theme/plusfuture/css/style.css')) {
 	if($narrow_navbar && file_exists('view/theme/plusfuture/css/narrow_navbar.css')) {
 		$x .= file_get_contents('view/theme/plusfuture/css/narrow_navbar.css');
 	}
+	if($singlepost && file_exists('view/theme/plusfuture/css/singlepost.css')) {
+		$x .= file_get_contents('view/theme/plusfuture/css/singlepost.css');
+	}

 	if($schemecss) {
 		$x .= $schemecss;
@@ -162,3 +166,10 @@ if(file_exists('view/theme/plusfuture/css/style.css')) {

 if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'plusfuture')
 	set_pconfig(local_channel(), 'plusfuture', 'schema', '---');
+
+echo ("アレ");
+$hoge = intval($converse_width);
+$converse_widtd = ($hoge * 2);
+echo($converse_width);
+echo($converse_widtd);
+echo($converse_widts);
@@ -6,6 +6,7 @@ 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');
@@ -0,0 +1,16 @@
+<?php
+
+function widget_userlogomenu($args) {
+
+    $channel = channelx_by_n(\App::$profile_uid);
+
+    $o = replace_macros(get_markup_template('userlogomenu.tpl'), array(
+      '$sitelocation' => $site['$sitelocation'],
+      '$banner' => $channel['channel_name'],
+      '$channel' => $channel['channel_address'],
+      '$avatar' => $channel['xchan_photo_s'],
+    ));
+
+  return $o;
+
+  }
@@ -3,10 +3,8 @@
 	if (! $nav_bg)
 		$nav_bg = "#f8f9fa";
 	if (! $nav_icon_colour)
-		$nav_icon_colour = "rgba(0, 0, 0, 0.5);";
+		$nav_icon_colour = "rgba(0, 0, 0, 0.5)";
 	if (! $nav_active_icon_colour)
 		$nav_active_icon_colour = "rgba(0, 0, 0, 0.7)";
-	if (! $radius)
-		$radius = "4px";
 	if (! $banner_colour)
 		$banner_colour = "rgba(0, 0, 0, 0.7)";
@@ -0,0 +1,563 @@
+/**
+ * Bluebasic
+ * Scheme for the Redbasic Theme for Hubzilla
+ * Based on the Suckerberg Theme by Sean Tiley
+ * Version 0.1
+ * Maintained by BOET 
+
+
+/* generals */
+
+main {
+    margin-left: auto;
+    margin-right: auto;
+    max-width: 1366px;
+    margin-top: 15px;
+}
+
+      
+a {      
+      color: $nav_bg !important;
+}
+
+a:hover,
+a:focus,
+.fakelink:hover,
+.fakelink:focus {
+  color: $nav_bg !important;
+}
+
+
+.wall-item-conv {
+	background-color: $comment_item_colour;
+}
+
+.wall-item-title.h3 {
+    font-weight: 400;
+    word-wrap: break-word;
+    
+}
+
+.side-link {
+	margin-bottom: 15px;
+}
+
+.shared_header img {
+    border-radius: 0.25rem;
+    margin: 0px 10px 10px 0px !important;
+
+}
+
+.shared_container {
+    border: 1px solid lightblue;
+    margin: 15px 0px;
+    padding: 10px;
+    float: left;
+    width: 100%;
+}
+
+.shared_header {
+    margin-bottom: 20px;
+    border-bottom: 1px solid lightblue;
+    padding-bottom: 20px;
+}
+
+.generic-icons,
+a .generic-icons {
+	font-size: 1rem;
+	margin-right: 0.5rem;
+	color: $font_colour;
+}
+
+.generic-icons:hover,
+a .generic-icons:hover {
+	color: $font_colour;
+}
+
+.generic-icons-right {
+	font-size: 1rem;
+	margin-left: 0.5rem;
+	color: $font_colour;
+}
+
+.drop-icons,
+a .drop-icons {
+	font-size: 1rem;
+	color: $font_colour;
+	text-decoration: none;
+	cursor: pointer;
+}
+
+.drop-icons:hover,
+a .drop-icons:hover {
+	color: #FF0000;
+}
+
+#menulist {
+	list-style-type: none;
+}
+
+/* conversation */
+
+.top-radius {
+	border-top-right-radius: $radius;
+	border-top-left-radius: $radius;
+}
+
+.wall-event-item {
+	padding: 10px;
+	color: #fff;
+	background-color: #3A87AD; /* should reflect calendar color */
+	border-top-left-radius: $radius;
+	border-top-right-radius: $radius;
+}
+
+.wall-photo-item img {
+	max-width: 100% !important;
+	border-top-right-radius: $radius;
+	border-top-left-radius: $radius;
+}
+.wall-item-head-new {
+    border-top: 0.1rem solid #007bff;
+}
+
+.wall-item-footer {
+	font-size: 0.75rem;
+	margin-top: 2em;
+}
+
+.wall-item-content-wrapper {
+	background-color: #fff;
+	border-top-right-radius: $radius;
+	border-top-left-radius: $radius;
+}
+
+.wall-item-content-wrapper.comment {
+	background-color: $comment_item_colour;
+	border-top-right-radius: 0px;
+	border-top-left-radius: 0px;
+}
+
+.p-2  {
+    padding: 0.9rem !important;
+}
+
+.wall-item-comment-wrapper {
+	padding: 7px 10px;
+	background-color: $item_colour;
+	border-radius: 0px;
+	border-bottom-right-radius: $radius;
+	border-bottom-left-radius: $radius;
+	border-top: 0px solid $comment_item_colour;
+}
+
+.wall-item-comment-wrapper-wc {
+	border-top: 0px solid $comment_item_colour;
+}
+
+.wall-item-photo {
+	width: $top_photo;
+	height: $top_photo;
+	border: none;
+	border-radius: $radius;
+	box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
+}
+
+.comment .wall-item-photo {
+	width: $reply_photo;
+	height: $reply_photo;
+}
+
+.wall-item-content img {
+    max-width: 100%;
+    float: left;
+    clear: both;
+    margin: 10px 15px 10px 0px;
+}
+
+.comment .wall-item-body {
+    padding-left: 00px !important;
+}
+
+.wall-item-body a {padding-left: 2px; }
+
+
+.comment-edit-text {
+	border: 1px solid #ccc;
+	border-radius: $radius;
+}
+
+.divgrow-showmore {
+    display: block;
+    border: 1px dashed #ccc;
+    text-align: center;
+    padding: 7px;
+    margin: 13px 13px 0px 13px;
+    background: rgb(238,238,238);
+
+    border-radius: 3px;
+}
+
+.divgrow-showmore:hover {
+	border-top: 1px dashed #adadad;
+}
+
+.directory-item .divgrow-showmore {
+	background-color: $comment_item_colour;
+}
+
+/* widgets */
+
+.widget {
+    background-color: rgba(254,254,254,.5);
+    border: 1px solid rgba(254,254,254,.5);
+    border-radius: 2px;
+    margin-bottom: 1rem;
+    padding: 0 0 0.7rem;
+}
+
+.widget h3 {
+    margin-top: 0px;
+    border-bottom: 1px solid lightblue !important;
+    padding: 15px;
+    background-color: $nav_bg !important;
+    color: #fff;
+    font-size: 1.2rem;
+}
+
+
+
+.menu-img-3 {
+	width: 3.3em;
+	height: 3.3em;
+	margin-right: 5px;
+	border-radius: $radius;
+	float: left;
+}
+
+.menu-img-2 {
+	height: 2.2em;
+	width: 2.2em;
+	margin-right: 5px;
+	border-radius: $radius;
+	float: left;
+}
+
+.menu-img-1 {
+	height: 1.28571429em;
+	width: 1.28571429em;
+	border-radius: $radius;
+}
+
+#usermenu {
+	width: 3.75rem;
+        background-color: rgba(254,254,254,.5);
+}
+
+#avatar {
+	width: 2.35rem;
+	height: 2.35rem;
+	border-radius: $radius;
+}
+
+#nav-app-link {
+	padding: 0 !important;
+	line-height: 1.175;
+	white-space: nowrap;
+}
+
+.page-title {
+	margin: 7px 0px;
+}
+
+.generic-content-wrapper-styled {
+	background-color: #fff;
+	padding: 10px;
+	border-radius: $radius;
+}
+
+.generic-content-wrapper {
+	border: 1px solid rgba(0, 0, 0, .2);
+	border-radius: $radius;
+	margin-bottom: 1.5rem;
+        box-shadow: 0px 0px 0px 0px rgba(0,0,0,0.2);
+}
+
+.reshared-content {
+    margin: 0px;
+}
+
+.section-title-wrapper {
+	padding: 7px 10px;
+	background-color: $item_colour;
+	border-top-left-radius: $radius;
+	border-top-right-radius: $radius;
+	border-bottom: 3px solid $comment_item_colour;
+}
+
+.section-title-wrapper h2,
+.section-subtitle-wrapper h3 {
+	margin-top: 0px;
+	margin-bottom: 0px;
+	white-space: nowrap;
+
+}
+
+.section-title-wrapper img {width: 2.3rem; height; 2.3rem;}
+
+#inline-btn {
+	display: none;
+}
+
+/* bootstrap overrides */
+
+.btn,
+.form-control,
+.nav-pills .nav-link,
+.nav-tabs .nav-link {
+	border-radius: $radius;
+}
+
+.rounded-top {
+	border-top-left-radius: $radius !important;
+	border-top-right-radius: $radius !important;
+}
+
+
+Element {
+}
+blockquote {
+    font-size: 1rem;
+    font-style: italic;
+    border: 1px dotted #ccc;
+    padding: 1em 1.5em;
+    margin: 10px 0px;
+}
+
+.dropdown-menu {
+	color: $font_colour;
+	font-size: 0.9rem;
+	border-radius: $radius;
+}
+
+.dropdown-item {
+	color: $font_colour;
+}
+
+.dropdown-item:active,
+.dropdown-item:focus,
+.dropdown-item:hover,
+.textcomplete-item:focus .dropdown-item,
+.textcomplete-item:hover .dropdown-item,
+.textcomplete-item.active .dropdown-item,
+.textcomplete-item:active .dropdown-item {
+	color: $font_colour;
+	background-color: $item_colour;
+}
+
+.dropdown-item.active {
+	color: #fff;
+	background-color: $nav_bg !important;
+}
+
+.bg-dark, #menu_logo {
+	background-color: $nav_bg !important;
+        z-index: 1;
+}
+
+#menu_logo {
+
+    position: relative;
+    width: 100%;
+    clear: both;
+    float: left;
+    margin-bottom: 0px;
+    color: $banner_colour;
+
+}
+
+#hubzilla {
+    font-size:1.5rem;
+    float:right;
+    margin-top:-45px;
+    margin-right:20px;
+    color:$banner_colour;
+    font-weight:800;
+    border-bottom:1px #4267b2;
+}
+
+#menu_logo .fa.fa-hubzilla  {
+    font-size:5rem; 
+    width:100%;
+    padding-top:10px;
+    padding-left:15px;
+    margin-bottom:10px;
+    float:left;
+    color: $banner_colour;
+}
+
+
+.bg-primary {
+    background-color: $nav_bg !important;
+}
+
+.text-white a {
+    color: #fff !important;
+}
+
+.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
+    color: #000;
+    background-color: #d5e3ff;
+}
+
+.navbar {
+	z-index:1030;
+}
+
+.navbar-dark .navbar-nav .nav-link,
+.usermenu i {
+	color: $nav_icon_colour !important;
+}
+
+.navbar-dark .navbar-nav .nav-link:focus,
+.navbar-dark .navbar-nav .nav-link:hover,
+.usermenu:focus i,
+.usermenu:hover i {
+	color: $nav_active_icon_colour;
+}
+
+@media screen and (max-width: 992px) {
+
+	aside#region_1 {
+		border-right: 1px solid $nav_bd;
+	}
+
+	main {
+		left: -$aside_widthpx;
+		width: calc( 100% + $aside_widthpx );
+	}
+
+	main.region_1-on {
+		left: 0px;
+	}
+
+	#nav-app-link-wrapper {
+		min-width: 0;
+		flex-basis: 25%;
+	}
+
+	#navbar-collapse-2 .navbar-app i {
+		font-size: 1rem;
+		margin-right: 0.5rem;
+	}
+
+}
+
+/* Modified original CSS to match input in Redbasic */
+
+.form-group.checkbox input {
+    display: none;
+}
+
+.form-group.checkbox > div label {
+    display: block; overflow: hidden; cursor: pointer;
+    border: 1px solid #ccc;
+    border-radius: 12px;
+    margin:0px;
+	-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
+	-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+	transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+}
+
+.form-group.checkbox:hover label {
+	color: $link_colour;
+}
+
+.form-group.checkbox:hover > div label {
+	border-color: $link_colour;
+}
+
+img.zrl {
+    width: 100% !important;
+    height: auto;
+    float: initial;
+}
+
+.logo {    font-size: 5rem;
+    width: 105%;
+    color: #fff;
+    background-color: $nav_bg !important;
+    padding-top: 10px;
+    padding-left: 15px;
+    padding-bottom: 15px;
+    margin-bottom: 15px;
+    margin-left: -0.5rem;
+    margin-top: -0.5rem;
+    float: left;
+}
+
+
+.badge-warning {
+    color: #000;
+    background-color: #fff;
+    color: $font_colour !important;
+}
+
+.badge-warning .text-dark {
+    color: $font_colour !important;
+}
+
+.badge {
+    display: inline-block;
+    padding: .25em .4em;
+        padding-right: 0.4em;
+        padding-left: 0.4em;
+    font-weight: 400 !important;
+    line-height: 1 !important;
+    text-align: center !important;
+    white-space: nowrap !important;
+    vertical-align: baseline !important;
+    border-radius: 0 !important;
+    font-size: 0.75rem !important;
+
+}
+
+.contact-photo-wrapper img {width: 80px; height: 80px;}
+
+img[src*="feedburner"] {
+
+    visibility: hidden;
+    display: none;
+}
+
+ 
+.oembed.video {
+    padding-top: 56.25% !important;
+}
+
+iframe {
+    width: 100%;
+    position: relative;
+    height: 100%;
+
+}
+
+
+.oembed.video a {
+    width: 100% !important;
+    margin: 0 !important;
+    height: 500px;
+}
+
+.oembed.video iframe, .oembed.video html, .oembed.video body, .oembed.video img {
+    width: 100% !important;
+    height: 500px;
+    position: relative;
+    margin-top: 10px;
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
+
+audio {
+    width: 100%;
+}
@@ -0,0 +1,3 @@
+<?php
+
+
@@ -0,0 +1,20 @@
+<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>
+
+
@@ -0,0 +1,242 @@
+<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>
+	</button>
+	<div id="banner" class="navbar-text">{{$banner}}</div>
+	{{if $sel.name}}
+	<div id="nav-app-link-wrapper" class="navbar-nav{{if $sitelocation || ! $settings_url}} has_location mr-auto{{/if}}">
+		<a id="nav-app-link" href="{{$url}}" class="nav-link text-truncate" style="margin-top: auto; margin-bottom: auto;">
+			{{$sel.name}}
+			{{if $sitelocation}}
+			<br><small>{{$sitelocation}}</small>
+			{{/if}}
+		</a>
+	</div>
+
+	{{if $settings_url}}
+	<div id="nav-app-settings-link-wrapper" class="navbar-nav mr-auto">
+		<a id="nav-app-settings-link" href="{{$settings_url}}/?f=&rpath={{$url}}" class="nav-link">
+			<i class="fa fa-fw fa-cog"></i>
+		</a>
+	</div>
+	{{/if}}
+	{{/if}}
+</div>
+
+
+<div class="collapse navbar-collapse" id="navbar-collapse-1">
+	<ul id="nav-right" class="navbar-nav ml-auto">
+		<li class="nav-item collapse clearfix" id="nav-search">
+			<form class="form-inline" method="get" action="{{$nav.search.4}}" role="search">
+				<input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="{{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/>
+			</form>
+			<div id="nav-search-spinner" class="spinner-wrapper">
+				<div class="spinner s"></div>
+			</div>
+		</li>
+		<li class="nav-item" id="nav-search-btn">
+			<a class="nav-link" href="#nav-search" title="{{$nav.search.3}}" onclick="openMenu('nav-search'); closeMenu('nav-search-btn'); $('#nav-search-text').focus(); return false;"><i class="fa fa-fw fa-search"></i></a>
+		</li>
+		{{if $nav.help.6}}
+		<li class="nav-item dropdown {{$sel.help}}">
+			<a class="nav-link {{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-question-circle"></i></a>
+		</li>
+		{{/if}}
+		<li class="nav-item dropdown" id="app-menu">
+			<a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-th"></i></a>
+			<div id="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+				{{if $channel_apps.0 && ! $channel_menu}}
+				{{foreach $channel_apps as $channel_app}}
+				{{$channel_app}}
+				{{/foreach}}
+				<div class="dropdown-divider"></div>
+				<div class="dropdown-header text-black-50 sys-apps-toggle" onclick="$('#dropdown-menu').click(function(e) { e.stopPropagation(); }); openClose('sys_apps');">
+					{{$sysapps_toggle}}
+				</div>
+				<div id="sys_apps" style="display:none;">
+				{{/if}}
+				{{foreach $nav_apps as $nav_app}}
+				{{$nav_app}}
+				{{/foreach}}
+				{{if $channel_apps.0 && ! $channel_menu}}
+				</div>
+				{{/if}}
+				{{if $is_owner}}
+				<div class="dropdown-divider"></div>
+				<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+				<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
+				{{/if}}
+			</div>
+		</li>
+		{{if $localuser || $nav.pubs}}
+		<li id="notifications-btn" class="nav-item d-xl-none">
+			<a class="nav-link text-white notifications-btn" href="#"><i id="notifications-btn-icon" class="fa fa-exclamation-circle  notifications-btn-icon"></i></a>
+		</li>
+		{{/if}}
+		{{if $channel_menu && $channel_apps.0}}
+		<li class="nav-item dropdown" id="channel-menu">
+			<a class="nav-link" href="#" data-toggle="dropdown"><img src="{{$channel_thumb}}" style="height:14px; width:14px;position:relative; top:-2px;" /></a>
+			<div id="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+				{{foreach $channel_apps as $channel_app}}
+				{{$channel_app}}
+				{{/foreach}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $navbar_apps}}
+		{{foreach $navbar_apps as $navbar_app}}
+		<li>
+		{{$navbar_app}}
+		</li>
+		{{/foreach}}
+		{{/if}}
+	</ul>
+	<ul class="navbar-nav mr-auto" style="margin-right: unset !important;">
+		{{if $nav.login && !$userinfo}}
+		<li class="nav-item d-lg-flex">
+			{{if $nav.loginmenu.1.4}}
+			<a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">
+			{{$nav.loginmenu.1.1}}
+			</a>
+			{{else}}
+			<a class="nav-link" href="login" title="{{$nav.loginmenu.1.3}}">
+				{{$nav.loginmenu.1.1}}
+			</a>
+			{{/if}}
+		</li>
+		{{/if}}
+		{{if $nav.register}}
+		<li class="nav-item {{$nav.register.2}} d-lg-flex">
+			<a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a>
+		</li>
+		{{/if}}
+		{{if $nav.alogout}}
+		<li class="nav-item {{$nav.alogout.2}} d-lg-flex">
+			<a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a>
+		</li>
+		{{/if}}
+	</ul>
+</div>
+<div style="display: flex;">
+	<div class="navbar-toggler-right" style="margin-top: auto;margin-bottom: auto;">
+		{{if $nav.help.6}}
+		<button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;">
+			<i class="fa fa-question-circle"></i>
+		</button>
+		{{/if}}
+		<button id="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
+			<i class="fa fa-th"></i>
+		</button>
+		{{if $localuser || $nav.pubs}}
+		<button id="notifications-btn-1" type="button" class="navbar-toggler border-0 notifications-btn">
+			<i id="notifications-btn-icon-1" class="fa fa-exclamation-circle notifications-btn-icon"></i>
+		</button>
+		{{/if}}
+	</div>
+	{{if $nav.login && !$userinfo}}
+	<div class="d-lg-none pt-1 pb-1">
+		{{if $nav.loginmenu.1.4}}
+		<a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login">
+			{{$nav.loginmenu.1.1}}
+		</a>
+		{{else}}
+		<a class="btn btn-primary btn-sm text-white" href="login" title="{{$nav.loginmenu.1.3}}">
+			{{$nav.loginmenu.1.1}}
+		</a>
+		{{/if}}
+		{{if $nav.register}}
+		<a class="btn btn-warning btn-sm text-dark" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" >
+			{{$nav.register.1}}
+		</a>
+		{{/if}}
+	</div>
+	{{/if}}
+	{{if $userinfo}}
+	<div class="dropdown">
+		<div class="fakelink usermenu" data-toggle="dropdown">
+			<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
+			<i class="fa fa-caret-down"></i>
+		</div>
+		{{if $is_owner}}
+		<div class="dropdown-menu">
+			{{foreach $nav.usermenu as $usermenu}}
+			<a class="dropdown-item{{if $usermenu.2}} active{{/if}}"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
+			{{/foreach}}
+			{{if $nav.group}}
+			<a class="dropdown-item" href="{{$nav.group.0}}" title="{{$nav.group.3}}" role="menuitem" id="{{$nav.group.4}}">{{$nav.group.1}}</a>
+			{{/if}}
+			{{if $nav.manage}}
+			<a class="dropdown-item{{if $sel.name == Manage}} active{{/if}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a>
+			{{/if}}	
+			{{if $nav.channels}}
+			{{foreach $nav.channels as $chan}}
+			<a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem"><i class="fa fa-circle{{if $localuser == $chan.channel_id}} text-success{{else}} invisible{{/if}}"></i> {{$chan.channel_name}}</a>
+			{{/foreach}}
+			{{/if}}
+			{{if $nav.profiles}}
+			<a class="dropdown-item" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a>
+			{{/if}}
+			{{if $nav.settings}}
+			<div class="dropdown-divider"></div>
+			<a class="dropdown-item{{if $sel.name == Settings}} active{{/if}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
+			{{/if}}
+			{{if $nav.admin}}
+			<div class="dropdown-divider"></div>
+			<a class="dropdown-item{{if $sel.name == Admin}} active{{/if}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a>
+			{{/if}}
+			{{if $nav.logout}}
+			<div class="dropdown-divider"></div>
+			<a class="dropdown-item" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a>
+			{{/if}}
+		</div>
+		{{/if}}
+		{{if ! $is_owner}}
+		<div class="dropdown-menu" role="menu" aria-labelledby="avatar">
+			<a class="dropdown-item" href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a>
+			<a class="dropdown-item" href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a>
+		</div>
+		{{/if}}
+	</div>
+	{{/if}}
+</div>
+<div class="collapse d-lg-none" id="navbar-collapse-2">
+	<div class="navbar-nav mr-auto">
+		{{if $channel_apps.0}}
+		{{foreach $channel_apps as $channel_app}}
+		{{$channel_app|replace:'dropdown-item':'nav-link'}}
+		{{/foreach}}
+		<div class="dropdown-header text-white-50 sys-apps-toggle" onclick="openClose('sys-apps-collapsed');">
+			{{$sysapps_toggle}}
+		</div>
+		<div id="sys-apps-collapsed" style="display:none;">
+		{{/if}}
+		{{foreach $navbar_apps as $navbar_app}}
+		{{$navbar_app}}
+		{{/foreach}}
+		{{foreach $nav_apps as $nav_app}}
+		{{$nav_app|replace:'dropdown-item':'nav-link'}}
+		{{/foreach}}
+		{{if $channel_apps.0}}
+		</div>
+		{{/if}}
+		{{if $is_owner}}
+		<div class="dropdown-divider"></div>
+		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+		<a class="nav-link" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
+		{{/if}}
+	</div>
+</div>
+{{if $nav.help.6}}
+<div id="contextual-help-content" class="contextual-help-content">
+	{{$nav.help.5}}
+	<div class="float-right">
+		<a class="btn btn-primary btn-sm" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="fa fa-question"></i>&nbsp;{{$fulldocs}}</a>
+		<a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="fa fa-times"></i></a>
+	</div>
+</div>
+{{/if}}
@@ -0,0 +1,177 @@
+{{if $notifications}}
+<script>
+	var notifications_parent;
+
+	$(document).ready(function() {
+		notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
+		$('.notifications-btn').click(function() {
+			toggleBside();
+		});
+
+		window.onpopstate = function(e) {
+			if(e.state !== null)
+				getData(e.state.b64mid, '');
+		};
+	});
+
+	{{if $module == 'display' || $module == 'hq' || $startpage == 'hq'}}
+	$(document).on('click', '.notification', function(e) {
+		var b64mid = $(this).data('b64mid');
+		var notify_id = $(this).data('notify_id');
+		var path = $(this)[0].pathname.substr(1,7);
+		var stateObj = { b64mid: b64mid };
+
+		if(b64mid === 'undefined' && notify_id === 'undefined')
+			return;
+
+		{{if $module != 'hq' && $startpage == 'hq'}}
+			e.preventDefault();
+			if(typeof notify_id !== 'undefined' && notify_id !== 'undefined') {
+				$.post(
+					"hq",
+					{
+						"notify_id" : notify_id
+					}
+				);
+			}
+			window.location.href = 'hq/' + b64mid;
+			return;
+		{{else}}
+			{{if $module == 'display'}}
+			history.pushState(stateObj, '', 'display/' + b64mid);
+			{{/if}}
+
+			{{if $module == 'hq'}}
+			history.pushState(stateObj, '', 'hq/' + b64mid);
+			{{/if}}
+
+			{{if $module == 'hq'}}
+			if(b64mid !== 'undefined') {
+			{{else}}
+			if(path === 'display' && b64mid) {
+			{{/if}}
+				e.preventDefault();
+
+				if(! page_load) {
+					getData(b64mid, notify_id);
+				}
+
+				if($('#notifications_wrapper').hasClass('fs'))
+					$('#notifications_wrapper').prependTo('#' + notifications_parent).removeClass('fs');
+			}
+		{{/if}}
+	});
+	{{/if}}
+
+	{{foreach $notifications as $notification}}
+	{{if $notification.filter}}
+	$(document).on('click', '#tt-{{$notification.type}}-only', function(e) {
+		e.preventDefault();
+		$('#nav-{{$notification.type}}-menu [data-thread_top=false]').toggle();
+		$(this).toggleClass('active sticky-top');
+	});
+	$(document).on('click ', '#cn-{{$notification.type}}-input-clear', function(e) {
+		$('#cn-{{$notification.type}}-input').val('');
+		$('#cn-{{$notification.type}}-only').removeClass('active sticky-top');
+		$("#nav-{{$notification.type}}-menu .notification").removeClass('d-none');
+		$('#cn-{{$notification.type}}-input-clear').addClass('d-none');
+	});
+	$(document).on('input', '#cn-{{$notification.type}}-input', function(e) {
+		var val = $('#cn-{{$notification.type}}-input').val().toString().toLowerCase();
+
+		if(val) {
+			$('#cn-{{$notification.type}}-only').addClass('active sticky-top');
+			$('#cn-{{$notification.type}}-input-clear').removeClass('d-none');
+		}
+		else {
+			$('#cn-{{$notification.type}}-only').removeClass('active sticky-top');
+			$('#cn-{{$notification.type}}-input-clear').addClass('d-none');
+		}
+
+		$("#nav-{{$notification.type}}-menu .notification").each(function(i, el){
+			var cn = $(el).data('contact_name').toString().toLowerCase();
+			var ca = $(el).data('contact_addr').toString().toLowerCase();
+
+			if(cn.indexOf(val) === -1 && ca.indexOf(val) === -1)
+				$(this).addClass('d-none');
+			else
+				$(this).removeClass('d-none');
+		});
+	});
+	{{/if}}
+	{{/foreach}}
+
+	function getData(b64mid, notify_id) {
+		$('.thread-wrapper').remove();
+		bParam_mid = b64mid;
+		mode = 'replace';
+		page_load = true;
+		{{if $module == 'hq'}}
+		liveUpdate(notify_id);
+		{{/if}}
+		{{if $module == 'display'}}
+		liveUpdate();
+		{{/if}}
+	}
+</script>
+
+<div id="notifications_wrapper">
+	<div id="no_notifications" class="d-xl-none">
+		{{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
+	</div>
+	<div id="nav-notifications-template" rel="template">
+		<a class="list-group-item clearfix notification {6}" href="{0}" title="{3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}">
+			<img class="menu-img-3" data-src="{1}">
+			<span class="contactname">{2}</span>
+			<span class="dropdown-sub-text">{4}<br>{5}</span>
+		</a>
+	</div>
+	<div id="nav-notifications-forums-template" rel="template">
+		<a class="list-group-item clearfix notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}">
+			<span class="float-right badge badge-{{$notification.severity}}">{10}</span>
+			<img class="menu-img-1" data-src="{1}">
+			<span class="">{2}</span>
+			<i class="fa fa-{11} text-muted"></i> 
+		</a>
+	</div>
+	<div id="notifications" class="navbar-nav">
+		{{foreach $notifications as $notification}}
+		<div class="collapse {{$notification.type}}-button">
+			<a class="list-group-item notification-link" href="#" title="{{$notification.title}}" data-target="#nav-{{$notification.type}}-sub" data-toggle="collapse" data-type="{{$notification.type}}">
+				<i class="fa fa-fw fa-{{$notification.icon}}"></i> {{$notification.label}}
+				<span class="float-right badge badge-{{$notification.severity}} {{$notification.type}}-update"></span>
+			</a>
+			<div id="nav-{{$notification.type}}-sub" class="collapse notification-content" data-parent="#notifications" data-type="{{$notification.type}}">
+				{{if $notification.viewall}}
+				<a class="list-group-item text-dark" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}">
+					<i class="fa fa-fw fa-external-link"></i> {{$notification.viewall.label}}
+				</a>
+				{{/if}}
+				{{if $notification.markall}}
+				<div class="list-group-item cursor-pointer" id="nav-{{$notification.type}}-mark-all" onclick="markRead('{{$notification.type}}'); return false;">
+					<i class="fa fa-fw fa-check"></i> {{$notification.markall.label}}
+				</div>
+				{{/if}}
+				{{if $notification.filter}}
+				{{if $notification.filter.posts_label}}
+				<div class="list-group-item cursor-pointer" id="tt-{{$notification.type}}-only">
+					<i class="fa fa-fw fa-filter"></i> {{$notification.filter.posts_label}}
+				</div>
+				{{/if}}
+				{{if $notification.filter.name_label}}
+				<div class="list-group-item clearfix notifications-textinput" id="cn-{{$notification.type}}-only">
+					<div class="text-muted notifications-textinput-filter"><i class="fa fa-fw fa-filter"></i></div>
+					<input id="cn-{{$notification.type}}-input" type="text" class="form-control form-control-sm" placeholder="{{$notification.filter.name_label}}">
+					<div id="cn-{{$notification.type}}-input-clear" class="text-muted notifications-textinput-clear d-none"><i class="fa fa-times"></i></div>
+				</div>
+				{{/if}}
+				{{/if}}
+				<div id="nav-{{$notification.type}}-menu" class="">
+					{{$loading}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
+				</div>
+			</div>
+		</div>
+		{{/foreach}}
+	</div>
+</div>
+{{/if}}
@@ -0,0 +1,4 @@
+<a href="{{$embedurl}}" onclick="this.innerHTML=Base64.decode('{{$escapedhtml}}'); return false;" style="float:left; margin: 1em; position: relative;">
+	<img width="{{$tw}}" height="{{$th}}" src="{{$turl}}" />
+	<div style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; background: url('{{$baseurl}}/view/theme/redbasic/img/bluebasic_play.png') no-repeat center center;"></div>
+</a>
@@ -1,4 +1,5 @@
 {{include file="field_checkbox.tpl" field=$narrow_navbar}}
+{{include file="field_checkbox.tpl" field=$singlepost}}
 {{include file="field_input.tpl" field=$converse_width}}
 {{include file="field_input.tpl" field=$font_size}}
 {{include file="field_checkbox.tpl" field=$advanced_theming}}
@@ -0,0 +1,82 @@
+<div class="widget" id="user_menu" style="clear:left;padding-top:10px;">
+
+<ul class="nav nav-pills flex-column">
+
+      <li class="nav-item">
+        <a class="nav-link" href="network">
+          <i class="fa fa-fw fa-th"></i>
+          <p>ストリーム</p>
+        </a>
+      </li>
+      <li class="nav-item user_details">
+        <a class="nav-link" href="directory?f=&pubforums=0">
+          <i class="fa fa-fw fa-users"></i>
+          <p>ユーザー</p>
+        </a>
+      </li>
+
+      <li class="nav-item user_details">
+        <a class="nav-link" href="directory?f=&pubforums=1">
+          <i class="fa fa-fw fa-stack-exchange"></i>
+          <p>コミュニティ</p>
+        </a>
+      </li>
+    
+      <li class="nav-item user_details">
+        <a class="nav-link" href="channel/{{$channel}}">
+          <i class="fa fa-fw fa-user-circle"></i>
+          <p>プロフィール</p>
+        </a>
+      </li>
+
+      <li class="nav-item user_details">
+        <a class="nav-link" href="connections">
+          <i class="fa fa-fw fa-address-book"></i>
+          <p>フォロー</p>
+        </a>
+      </li>
+
+      <li class="nav-item user_details">
+        <a class="nav-link" href="group">
+          <i class="fa fa-fw fa-street-view"></i>
+          <p>サークル</p>
+        </a>
+      </li>
+
+      <li class="nav-item user_details">
+        <a class="nav-link" href="notifications">
+          <i class="fa fa-fw fa-bell"></i>
+          <p>お知らせ</p>
+        </a>
+      </li>
+
+      <li class="nav-item user_details">
+        <a class="nav-link" href="settings">
+          <p>設定</p>
+        </a>
+      </li>
+
+      <li class="nav-item user_details">
+        <a class="nav-link" href="help">
+          <p>ヘルプ</p>
+        </a>
+      </li>
+
+      <li class="nav-item user_details">
+        <a class="nav-link" href="help/TermsOfService">
+          <p>利用規約</p>
+        </a>
+      </li>
+      <iframe id="frame" src="./page/harukin/noti"  frameborder="0"></iframe>
+      <script>
+      $(function(){
+        $('#frame').on('load', function(){
+          $('#frame').contents().find('#bottombar').css('display','none');
+          $('#frame').contents().find('#button').css('display','none');
+        });
+      });
+</script>
+  </ul>
+
+  </div>
+
Author	SHA1	Message	Date
Rintan	3e510158c1	既知の問題の修正、アイコンの最適化など	2019-05-10 19:13:45 +09:00
Rintan	aed49e7e30	影の変更、トップバーの高さ調整	2019-05-05 21:49:19 +09:00
Rintan	b0ae0e8cfc	衝突回避	2019-05-03 23:10:16 +09:00
Rintan	d4b1e369dd	今度こそ修正	2019-05-03 23:07:49 +09:00
harukin	23bede9197	残ってそうなgoogleを抹消	2019-05-03 23:01:36 +09:00
Rintan	6f5ee22e3a	self hostingを模索	2019-05-03 22:55:18 +09:00
harukin	3d3eb47e9f	headのcsp消してみる	2019-05-03 21:39:28 +09:00
Rintan	b96c6e323d	CSPの修正を試行	2019-05-03 20:31:22 +09:00
Rintan	24e05240cc	ここに追記しても反映されますかね？よろしくお願いします。	2019-05-02 20:57:53 +09:00
Rintan Broadleaf	7fcc3b7d8a	スマホから簡単に修正してみました。まだ読み込めませんので、夕方にまた別の修正出します。	2019-05-02 08:30:07 +09:00
harukin	fe81c32ab1	headファイル追加したはず。これに追記することでmetaとかcspとかできそう。	2019-05-02 00:33:13 +09:00
harukin	b9c6ed1a08	アイコン、headに復活？	2019-05-02 00:17:00 +09:00
harukin	f8663454b0	パス修正	2019-05-02 00:03:17 +09:00
harukin	60e3bf779c	icons.cssもヘッダーに追加！	2019-05-01 23:54:30 +09:00
harukin	28a251e809	css実装位置変更(多分これでいいはず)	2019-05-01 23:49:56 +09:00
Rintan	b73c4f8f74	マテリアルアイコンの導入実験 Hubzillaで現在のテーマをすぐに置き換えず、テスト用のテーマを別に作成して適用してください。	2019-05-01 16:11:32 +09:00
harukin	c4acf18a46	Merge branch 'develop' into 'master' ナビバー微調整 See merge request harukin/hubzillatheme!24	2019-04-29 22:11:09 +09:00
harukin	9ce6ab23b0	一部の端末向け試作	2019-04-19 10:10:59 +09:00
harukin	fc0c2892e0	更に低解像度への対応	2019-02-27 14:13:14 +09:00
harukin	812622f173	ヘルプボタンの低幅での一時的な抹消	2019-02-27 14:03:12 +09:00
harukin	33c86f2737	Merge branch 'develop' into 'master' css fix See merge request harukin/hubzillatheme!23	2019-02-26 16:30:41 +09:00
harukin	afcf196506	remove shader	2019-02-26 16:22:47 +09:00
harukin	acd5e4e5e2	再共有アイコン微調整	2019-02-26 12:17:19 +09:00
harukin	f85ec0e580	fix typo	2019-02-24 08:49:57 +09:00
harukin	214de15554	edit reshare shader and something	2019-02-24 08:47:42 +09:00
harukin	f7094f5208	影の濃さ微調整	2019-02-10 22:57:52 +09:00
harukin	3185c47d2d	fix again	2019-02-10 20:57:12 +09:00
harukin	8fec17e621	fix some css	2019-02-10 20:55:40 +09:00
harukin	3c399fd333	bottom notification test	2019-02-10 20:38:21 +09:00
harukin	a5499127dd	fix valiable typo	2019-02-10 19:06:20 +09:00
harukin	234d7be1ab	fix sidemenu color	2019-02-10 19:03:59 +09:00
harukin	0785ea33be	fix もっとみるshadow	2019-02-06 14:21:52 +00:00
harukin	10c25d24ae	fix:: profile photo shader removed	2019-02-06 07:45:35 +00:00
harukin	fd3bf94e5c	Merge branch 'develop' into 'master' navbar-move See merge request harukin/hubzillatheme!22	2019-01-31 17:03:06 +09:00
harukin	9caeecef2f	Merge branch 'navbar-move' into 'develop' Navbar move See merge request harukin/hubzillatheme!21	2019-01-31 17:01:35 +09:00
harukin	94395560a7	edit fin congraturation!!	2019-01-22 18:06:17 +09:00
harukin	6f6106fd2f	edit add more if	2019-01-22 18:04:06 +09:00
harukin	3e51b31f9d	test	2019-01-22 17:42:57 +09:00
harukin	de8640fde4	edit aの時だけスクロールを強制終了	2019-01-22 17:38:57 +09:00
harukin	5789dd67f3	edit え、return: falseが原因なだけ？？？？？？w	2019-01-22 17:25:50 +09:00
harukin	52042e51aa	test: the way to the css	2019-01-22 17:18:24 +09:00
harukin	a8e6470f84	test again	2019-01-22 17:13:16 +09:00
harukin	a2342170e0	test: again	2019-01-22 17:10:54 +09:00
harukin	2fec6a18e4	test: same	2019-01-22 17:07:24 +09:00
harukin	649834c64f	edit: except link button	2019-01-22 16:59:45 +09:00
harukin	f0600d49a6	fix js position	2019-01-22 16:51:22 +09:00
harukin	332b7409ba	fix scroll event	2019-01-22 16:41:27 +09:00
harukin	a9db93138c	test:: new function: click navbar scroll to top	2019-01-22 16:33:28 +09:00
harukin	983712bf9b	fix userlink and something	2019-01-15 17:37:17 +09:00
harukin	b9c1b39d5d	fix login/register button position	2019-01-13 10:38:43 +09:00
harukin	2f10cac9a9	fix pagename position (flex-basis)	2019-01-08 12:52:02 +09:00
harukin	62bfd9abd4	fix apptext padding	2019-01-07 16:50:34 +09:00
harukin	c9a50b8164	fowardtest:: cssfix	2019-01-06 16:08:40 +09:00
harukin	1209496a29	test:: navbar-margin fix	2019-01-06 16:03:05 +09:00
harukin	7b58a14ed7	Merge branch 'develop' into 'master' oembed fix See merge request harukin/hubzillatheme!20	2019-01-05 20:25:43 +09:00
harukin	c5ed715880	Merge branch 'oembed_video-fixer' into 'develop' oenbed_video fix See merge request harukin/hubzillatheme!19	2019-01-05 20:20:13 +09:00
harukin	d858751e52	test:: oenbed_video testfix	2019-01-05 19:21:56 +09:00
harukin	30d4b3eff4	edit leftmenu icon renew.	2019-01-04 17:41:13 +09:00
harukin	99438632a3	test:: notification and apps button position edit & apps icon renew	2019-01-04 17:33:59 +09:00
harukin	b31a6a4d34	fix same issue	2019-01-03 10:37:29 +09:00
harukin	c7806fb0c2	fix selecter miss(setting icon missed)	2019-01-03 10:35:59 +09:00
harukin	4c6e7b80f7	fix title margin	2019-01-03 10:30:53 +09:00
harukin	08a80f4bd4	fix text-width issue	2019-01-03 10:22:48 +09:00
harukin	301b1a74fd	fix responsive balance	2019-01-03 10:18:30 +09:00
harukin	8ef319ace9	edit page-title hide	2019-01-03 08:27:36 +09:00
harukin	8f8f82f6ad	fix text-hide css	2019-01-03 08:17:48 +09:00
harukin	1188b9d443	fix text-hide css	2019-01-03 08:14:35 +09:00
harukin	59bbdf41a3	edit pagename position and text hide	2019-01-03 08:11:39 +09:00
harukin	1855c879cb	edit title position	2019-01-02 21:58:46 +09:00
harukin	01f49d72c4	fix typo	2019-01-02 21:13:17 +09:00
harukin	c6072728df	fix user-icon move bug	2019-01-02 21:11:44 +09:00
harukin	d99d880755	edit move noti/expand button	2019-01-02 21:02:42 +09:00
harukin	2a525e2f53	fix dropdown position & edit name and setting icon position	2019-01-02 20:48:16 +09:00
harukin	49f06fb227	make user-icon moved for right	2019-01-02 20:33:14 +09:00
harukin	1c160cbf05	Merge branch 'develop' into 'master' fix some favicon view See merge request harukin/hubzillatheme!17	2019-01-01 19:15:52 +09:00
harukin	1fb86ff27b	fix favicon css miss	2019-01-01 19:09:12 +09:00
harukin	8824b0ecc1	fix viewconnection's favicon bug	2019-01-01 18:52:26 +09:00
harukin	758c7104b0	fix again	2019-01-01 18:45:03 +09:00
harukin	8b35c1d78e	fix homeactivity notification userfavicon	2019-01-01 15:20:32 +09:00
harukin	cc694b172d	Merge branch 'develop' into 'master' fix notification's time issue and some pdl See merge request harukin/hubzillatheme!16	2018-12-31 12:08:00 +09:00
harukin	8753c0a347	fix notificetions_widget.tpl	2018-12-31 11:51:28 +09:00
harukin	755bc08066	remove notifications_widget.pdl's html	2018-12-31 11:41:28 +09:00
harukin	21eb1af074	reverse	2018-12-31 11:36:25 +09:00
harukin	3ac5ba6b34	rm notificatons_widget.tpl	2018-12-31 11:24:20 +09:00
harukin	0d6471a3d0	fix iframe-url	2018-12-14 19:21:28 +09:00
harukin	4d30ed3ff7	fix Silver ozero	2018-11-29 23:26:29 +09:00
harukin	4aabcaae5e	add Silver-icon ozero	2018-11-29 23:22:23 +09:00
harukin	9282a5a8b9	edit /wiki pdl	2018-11-27 14:05:33 +09:00
harukin	18a888e1f0	edit translation	2018-11-26 10:44:28 +09:00
harukin	ff57e9c528	Merge branch 'develop' into 'master' まぁまぁ巨大なテーマ更新 See merge request harukin/hubzillatheme!15	2018-11-24 21:51:04 +09:00
harukin	55c2646ba5		2018-11-24 00:35:32 +09:00
harukin	d41a516af3		2018-11-24 00:34:08 +09:00
harukin	4b048a2593		2018-11-24 00:24:22 +09:00
harukin	473157f854		2018-11-23 21:48:18 +09:00
harukin	b50c314fad		2018-11-23 21:41:16 +09:00
harukin	22cb320c5b		2018-11-23 21:36:51 +09:00
harukin	25f52875a7		2018-11-23 19:58:21 +09:00
harukin	104543df54		2018-11-23 18:22:56 +09:00
harukin	f5408cfbfb		2018-11-23 18:16:11 +09:00
harukin	c70c296d0a		2018-11-23 18:12:47 +09:00
harukin	fc140c58e4		2018-11-23 18:08:45 +09:00
harukin	a5bdba9822		2018-11-23 18:05:05 +09:00
harukin	eadc3de21e		2018-11-23 18:01:25 +09:00
harukin	c02e867520		2018-11-23 17:57:38 +09:00
harukin	1be5fe4087		2018-11-23 17:54:41 +09:00
harukin	07d53778b7		2018-11-23 17:50:29 +09:00
harukin	1e92b97cc2		2018-11-23 17:41:49 +09:00
harukin	3410f0327a		2018-11-23 17:37:14 +09:00
harukin	19e81935b0		2018-11-23 17:35:24 +09:00
harukin	8012dd3914		2018-11-23 17:23:19 +09:00
harukin	d67455d303		2018-11-23 15:04:43 +09:00
harukin	a04ec6f847		2018-11-23 14:53:46 +09:00
harukin	d1c82e203b		2018-11-23 14:40:07 +09:00
harukin	9f25ec7461		2018-11-23 14:28:55 +09:00
harukin	817fb5bf9a		2018-11-23 14:21:56 +09:00
harukin	f1834d8a38		2018-11-23 14:21:32 +09:00
harukin	fb23eb858c	横の指定開始	2018-11-23 13:23:35 +09:00
harukin	338c65b223		2018-11-22 16:36:26 +09:00
harukin	af8be0c246	トグル化に伴う廃止	2018-11-22 13:10:28 +09:00
harukin	626bec851f		2018-11-22 13:07:16 +09:00
harukin	6d4a75615b		2018-11-22 13:05:40 +09:00
harukin	e30a08fae6		2018-11-22 12:12:23 +09:00
harukin	70c12e8630	Singleline追加	2018-11-22 12:11:18 +09:00
harukin	76021b313d		2018-11-22 12:09:26 +09:00
harukin	8beb3965b4		2018-11-22 11:42:11 +09:00
harukin	e999e414fa		2018-11-22 11:37:19 +09:00
harukin	c5ad8f80d7	アイテムの二列配置テスト	2018-11-22 11:27:32 +09:00
harukin	f72db3957c		2018-11-22 00:44:14 +09:00
harukin	f9e0b0998d		2018-11-22 00:41:56 +09:00
harukin	ba9e34d4cd		2018-11-22 00:40:49 +09:00
harukin	0af2fb3a3e		2018-11-22 00:26:01 +09:00
harukin	43f3a92901		2018-11-22 00:21:38 +09:00
harukin	dee60d79d3		2018-11-22 00:19:56 +09:00
harukin	e69074d18f		2018-11-22 00:08:57 +09:00
harukin	55f0b3a641		2018-11-22 00:08:00 +09:00
harukin	effe05450f		2018-11-21 23:30:21 +09:00
harukin	5467b15197	インラインテスト	2018-11-21 23:28:46 +09:00
harukin	92bd63c833		2018-11-21 22:41:02 +09:00
harukin	a4c45323e1		2018-11-20 23:31:55 +09:00
harukin	cae03de425		2018-11-20 23:29:30 +09:00
harukin	7f1dc768e2		2018-11-20 23:26:41 +09:00
harukin	518c30604e		2018-11-20 23:21:58 +09:00
harukin	342ed91768		2018-11-20 22:33:30 +09:00
harukin	2731678878		2018-11-20 22:30:31 +09:00
harukin	935215136d		2018-11-20 22:00:48 +09:00
harukin	00eb9d2fd7		2018-11-20 21:57:03 +09:00
harukin	079b7af949		2018-11-20 18:49:52 +09:00
harukin	e1fec86f35		2018-11-20 18:47:03 +09:00
harukin	9ca60a7192		2018-11-20 18:44:24 +09:00
harukin	7acdf426f5		2018-11-20 18:19:51 +09:00
harukin	a95d2151d8		2018-11-20 17:40:24 +09:00
harukin	84e5ca5990		2018-11-19 22:49:10 +09:00
harukin	ac30c06d73		2018-11-19 22:37:59 +09:00
harukin	c8477e976c		2018-11-19 22:17:30 +09:00
harukin	0c8a9b2f22		2018-11-19 20:37:11 +09:00
harukin	1137f5461f		2018-11-19 19:14:57 +09:00
harukin	2197bed433		2018-11-19 18:53:28 +09:00
harukin	f2d805135b		2018-11-19 11:24:50 +09:00
harukin	2fd2b61dcc		2018-11-19 11:23:07 +09:00
harukin	b540658a64		2018-11-19 11:20:54 +09:00
harukin	8df6b2e05a		2018-11-19 11:17:54 +09:00
harukin	8a09ae90b3		2018-11-19 10:57:09 +09:00
harukin	01df08a132		2018-11-19 10:51:02 +09:00
harukin	3346619934		2018-11-18 23:09:01 +09:00
harukin	4c7609802b		2018-11-18 22:47:00 +09:00
harukin	04bb726142		2018-11-18 21:36:04 +09:00
harukin	8b6577deea		2018-11-18 21:34:26 +09:00
harukin	6564e78ed9		2018-11-18 21:25:28 +09:00
harukin	8a86c13273		2018-11-18 21:18:43 +09:00
harukin	f0d479e0ab		2018-11-18 17:38:08 +09:00
harukin	1c8e82e9d9		2018-11-18 17:28:25 +09:00
harukin	8d3d7f9cc9		2018-11-18 17:26:02 +09:00
harukin	f57826ec91		2018-11-16 22:10:33 +09:00
harukin	06a382af59		2018-11-16 22:07:17 +09:00
harukin	b9cf2f3433		2018-11-16 20:59:16 +09:00
harukin	ac46fefaa3	通知ボタンの動作改造	2018-11-16 20:43:55 +09:00
harukin	53f3586643	通知の低解像度表示の修正	2018-11-16 20:07:05 +09:00
harukin	1471866d7c		2018-11-16 19:04:06 +09:00
harukin	46cc844883		2018-11-16 18:59:20 +09:00
harukin	2728ce9b00		2018-11-16 18:49:39 +09:00
harukin	b5ce40b7b4		2018-11-16 18:37:34 +09:00
harukin	bdcf81264d		2018-11-16 18:34:43 +09:00
harukin	6706c8d9a9	再帰	2018-11-16 18:05:53 +09:00
harukin	9d1616f45c		2018-11-16 18:03:49 +09:00
harukin	bee29c373f		2018-11-16 18:03:19 +09:00
harukin	2be10182b9		2018-11-16 17:59:43 +09:00
harukin	382d324735		2018-11-16 17:59:15 +09:00
harukin	1230d19fc3		2018-11-16 17:58:21 +09:00
harukin	b341732f3a		2018-11-16 17:57:20 +09:00
harukin	3bc07f8039		2018-11-16 17:44:57 +09:00
harukin	ab5fa08138		2018-11-16 17:43:15 +09:00
harukin	54846d59ee		2018-11-16 17:40:25 +09:00
harukin	639694e2e9	やっぱもどす	2018-11-16 17:36:57 +09:00
harukin	af48f00ab2	Activityfilterのテスト	2018-11-16 17:35:30 +09:00
harukin	bb1ed4ba24		2018-11-15 23:07:14 +09:00
harukin	da6dbce4ec		2018-11-15 22:08:48 +09:00
harukin	6595fcb030	配置変更開始	2018-11-15 21:41:44 +09:00
harukin	0770f9b2ea		2018-11-15 21:37:42 +09:00
harukin	14c06f93d9		2018-11-15 21:16:26 +09:00
harukin	2510de5ab8	中身の改造	2018-11-15 18:10:08 +09:00
harukin	fa09caaee4		2018-11-15 17:05:15 +09:00
harukin	59a03a96e8		2018-11-15 16:53:11 +09:00
harukin	c5b9a6a215		2018-11-15 16:40:09 +09:00
harukin	1223708d33	左メニューのバック消去	2018-11-15 14:50:20 +09:00
harukin	8cfa343088	ファイルの再配置	2018-11-15 13:21:14 +09:00
harukin	ea33ff77a0	一端階層維持で削除	2018-11-15 13:12:16 +09:00
harukin	7141b320df	add from https://github.com/BOETZILLA/BLUEBASIC_Scheme	2018-11-15 12:43:56 +09:00
harukin	cd598a15f2	Merge branch 'develop' into 'master' 左上アバターの丸化、再共有の特殊化 See merge request harukin/hubzillatheme!14	2018-11-15 01:37:21 +09:00
harukin	cf87635e5c	再共有情報の特殊化	2018-11-15 01:33:22 +09:00
harukin	90fff738c5		2018-11-14 20:33:31 +09:00
harukin	18bd130a71	アバターの加工	2018-11-14 20:30:46 +09:00
harukin	b3141ab86d	Merge branch 'develop' into 'master' ベルの第二修正 See merge request harukin/hubzillatheme!13	2018-11-12 13:37:24 +09:00
harukin	6e8a671a84		2018-11-12 13:35:02 +09:00
harukin	20676bba0d	Merge branch 'develop' into 'master' 通知マークの修正 See merge request harukin/hubzillatheme!12	2018-11-12 13:29:23 +09:00
harukin	536dc120a0		2018-11-12 13:14:15 +09:00
harukin	3afb468b88		2018-11-12 13:13:05 +09:00
harukin	5c69b44218		2018-11-12 13:10:43 +09:00
harukin	8e83e7c36c		2018-11-12 12:15:52 +09:00
harukin	4e4f06b8c6	通知アイコンのバグ修正	2018-11-12 11:55:15 +09:00
harukin	7a329341b9	ベル修正	2018-11-11 22:54:43 +09:00
harukin	431c530275	Merge branch 'develop' into 'master' Submitのサイズ回帰 See merge request harukin/hubzillatheme!11	2018-11-10 22:21:27 +09:00
harukin	c925a85266		2018-11-10 22:20:12 +09:00
harukin	ea978bb36c	コメントのSubmitの例外追加	2018-11-10 22:12:07 +09:00
harukin	21456f5af3	Merge branch 'develop' into 'master' 投稿画面のUI改造と影関連微修正、オンオフボタンのマテリアル化 See merge request harukin/hubzillatheme!9	2018-11-10 21:29:13 +09:00
harukin	d74162339d	地味な影修正	2018-11-10 21:25:12 +09:00
harukin	4d792f1632		2018-11-10 21:02:59 +09:00
harukin	c79a3b4f2b		2018-11-10 20:58:31 +09:00
harukin	9d7f31a6ff		2018-11-10 20:56:12 +09:00
harukin	fc48d2c7fc		2018-11-10 20:45:13 +09:00
harukin	109e986228		2018-11-10 20:41:29 +09:00
harukin	e0aef681d4		2018-11-10 20:06:42 +09:00
harukin	d8bd7230a7		2018-11-10 19:34:22 +09:00
harukin	9fe0b15220	ボタンデザイン大変更テスト	2018-11-10 19:27:04 +09:00
harukin	dce2471ecd		2018-11-10 18:45:14 +09:00
harukin	1d038a5e74		2018-11-10 18:37:18 +09:00
harukin	a12634ea43	モーダルwindow操作不可バグ修復	2018-11-10 18:27:01 +09:00
harukin	4eee35f96b		2018-11-08 23:56:11 +09:00
harukin	50dc4178a2		2018-11-08 23:50:18 +09:00
harukin	00a3dc0031	オンオフボタンのマテリアル化	2018-11-08 23:45:54 +09:00
harukin	3d9d2fa992	コメント欄の若干改造	2018-11-08 22:37:49 +09:00
harukin	921c66e14a		2018-11-08 21:35:56 +09:00
harukin	d56a0396a6		2018-11-08 21:33:37 +09:00
harukin	f581ccb251	名前部分微調整	2018-11-05 23:52:30 +09:00
harukin	a73fef57fb	Merge branch 'develop' into 'master' ドメイン色追加第1弾 See merge request harukin/hubzillatheme!8	2018-11-04 20:49:13 +09:00
harukin	b5c8572bd4	色修正	2018-11-04 20:14:13 +09:00
harukin	5d7fa41c18	ドメイン追加	2018-11-04 20:12:00 +09:00
harukin	7885185009		2018-11-04 19:58:41 +09:00
harukin	df5bbfbd66	ドメイン認証実装	2018-11-04 19:53:51 +09:00
harukin	c1ef559afd	ドメインの色追加テスト	2018-11-04 18:11:06 +09:00
harukin	d68960586b	Merge branch 'develop' into 'master' 微修正 See merge request harukin/hubzillatheme!7	2018-11-04 14:31:10 +09:00
harukin	5ba76875cc	helpデータの表示バグを修正	2018-11-04 14:23:05 +09:00
Your Name	cccbcbf707	引き続き	2018-10-28 23:08:35 +09:00
Your Name	0c144bbac0	genericのborderを消してみるテスト	2018-10-28 23:03:07 +09:00
harukin	40da74d918	Merge branch 'develop' into 'master' 修正よ〜〜ん See merge request harukin/hubzillatheme!6	2018-10-28 22:12:39 +09:00
Your Name	42a4d2578d	通知影実装と小規模バグ修正	2018-10-28 21:38:33 +09:00
Your Name	5640960b59	修正	2018-10-28 21:04:59 +09:00
Your Name	7313a64709	テキスト入力欄の改造	2018-10-28 20:54:42 +09:00
harukin	8e91222848	Merge branch 'develop' into 'master' 影エリア強化とバグ修正 See merge request harukin/hubzillatheme!5	2018-10-28 19:18:45 +09:00
Your Name	a819191234	通知欄影付け	2018-10-28 19:15:24 +09:00
Your Name	bd3bfef413	text入力欄影付け	2018-10-28 19:12:10 +09:00
Your Name	866154f8ca	撤退	2018-10-28 19:10:13 +09:00
harukin	7a9606497a	Merge branch 'revert-c67870a4' into 'develop' Revert "テキストエリア苦悩" See merge request harukin/hubzillatheme!4	2018-10-28 19:08:16 +09:00
harukin	bac7f8b0ca	Merge branch 'develop' into 'master' 文字サイズ撤回 See merge request harukin/hubzillatheme!3	2018-10-28 17:28:10 +09:00
harukin	b6176b1a51	Merge branch 'develop' into 'master' 色関連の修正第1段 See merge request harukin/hubzillatheme!2	2018-10-27 17:07:46 +09:00
harukin	adf35ddcdd	Merge branch 'develop' into 'master' Develop See merge request harukin/hubzillatheme!1	2018-10-27 12:23:28 +09:00