upgrade bs to latest git and some more progress

2 files changed, 34 insertions, 30 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 0b82202c7..7250ff961 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -54,28 +54,27 @@ main {
 }
 
 h1, .h1 {
-	font-size: 2em;
+	font-size: 1.75em;
 }
 
 h2, .h2 {
-	font-size: 1.667em;
+	font-size: 1.5rem;
 }
 
 h3, .h3 {
-	font-size: 1.334em;
+	font-size: 1.25rem;
 }
 
 h4, .h4 {
-	font-size: 1em;
-	font-weight: bold;
+	font-size: 1rem;
 }
 
 h5, .h5 {
-	font-size: 1em;
+	font-size: 0.75rem;
 }
 
 h6, .h6 {
-	font-size: 0.75em;
+	font-size: 0.5rem;
 }
 
 
@@ -213,7 +212,7 @@ nav #banner #logo-text a:hover { text-decoration: none; }
 
 header #banner {
 	z-index: 1040;
-	margin-top: 14px;
+	margin-top: 10px;
 	text-align: center;
 	text-shadow: 1px 1px 2px rgba(0,0,0,.5);
 	font-size: 14px;
@@ -576,10 +575,19 @@ footer {
 	color: $nav_active_icon_colour;
 }
 
+/*
 #nav-search-text {
-	width: 250px;
+	font-size: 12px;
+	width: 200px;
+	height: 20px;
+	margin-right: 15px;
+	padding: 0px 5px 0px 5px;
+	border-radius: $radiuspx;
+	border-color: $nav_bd;
+	background-color: #eee;
+    	transition: background-color 300ms ease 0s;
 }
-
+*/
 #nav-search-text::-webkit-input-placeholder {
 	font-family: FontAwesome, sans-serif;
 }
@@ -589,7 +597,7 @@ footer {
 }
 
 nav .acpopup {
-	top: 50px !important;
+	top: 46px !important;
 	margin-left: -35px;
 	width: 290px;
 }
@@ -1400,11 +1408,13 @@ img.mail-conv-sender-photo {
 	font-size: 0.833em;
 }
 
+
 .wall-item-content,
 .mail-conv-body,
 .page-body,
 .chat-item-text,
-.chat-item-text-self {
+.chat-item-text-self,
+#doco-content {
 	font-size: $font_size;
 	clear: both;
 }
@@ -1520,6 +1530,7 @@ nav img {
 	border-radius: $radiuspx;
 }
 
+/*
 nav .dropdown-menu {
 	font-size: $body_font_size;
 	border-top-right-radius: 0px;
@@ -1528,12 +1539,14 @@ nav .dropdown-menu {
 	border-bottom-left-radius: $radiuspx;
 }
 
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:focus,
-.dropdown-menu > .active > a:hover {
+
+.dropdown-menu > .show > a,
+.dropdown-menu > .show > a:focus,
+.dropdown-menu > .show > a:hover {
 	color: #333;
 	background-color: #f5f5f5;
 }
+*/
 
 .dropdown-menu-img-sm {
 	float: left;
@@ -1549,8 +1562,8 @@ nav .dropdown-menu {
 }
 
 .usermenu {
-	width: 32px;
-	height: 32px;
+	width: 2rem;
+	height: 2rem;
 }
 
 .usermenu img {
@@ -1732,17 +1745,6 @@ blockquote {
 	margin: 0px;
 }
 
-.badge {
-	border-radius: $radiuspx;
-}
-
-nav .badge.home-update,
-nav .badge.notify-update,
-nav .badge.intro-update,
-nav .badge.mail-update {
-	background-color: #C9302C;
-}
-
 .dropdown-menu {
 	font-size: $body_font_size;
 	border-radius: $radiuspx;
@@ -1752,6 +1754,7 @@ nav .badge.mail-update {
 	border-radius: $radiuspx;
 }
 
+/*
 .navbar-inverse {
 	background-image: -webkit-linear-gradient(top, $nav_gradient_top 0%, $nav_gradient_bottom 100%);
 	background-image:         linear-gradient(to bottom, $nav_gradient_top 0%, $nav_gradient_bottom 100%);
@@ -1760,6 +1763,7 @@ nav .badge.mail-update {
 	border-color: $nav_bd;
 }
 
+
 .navbar-inverse .navbar-collapse {
 	border-color: $nav_bd;
 }
@@ -1804,7 +1808,7 @@ nav .badge.mail-update {
 .navbar-inverse .navbar-toggle .icon-bar {
 	background-color: $nav_active_icon_colour;
 }
-
+*/
 .nav-tabs.nav-justified {
 	background-color: rgba(254,254,254,.5);
 	border-top-left-radius: 4px;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 9b994ebdf..85b495792 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -122,7 +122,7 @@ if (! $toolicon_activecolour)
 if (! $item_opacity)
 	$item_opacity = "1";
 if (! $font_size)
-	$font_size = "0.9rem";
+	$font_size = "1rem";
 if (! $body_font_size)
 	$body_font_size = "0.75rem";
 if (! $font_colour)