Merge pull request #7 from friendica/master

Merge from main project

2 files changed, 30 insertions, 37 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 31b769460..ea8aa3365 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -13,7 +13,7 @@ html {
 }
 
 body {
-	font-family: arial,freesans,sans-serif;
+	font-family: sans-serif, arial, freesans;
 	font-size: $body_font_size;
 	background-color: $bgcolour;
 	background-image: url('$background_image');
@@ -37,7 +37,7 @@ h5, .h5, h6, .h6 {
 }
 
 .jslider {
-	font-family: arial,freesans,sans-serif;
+	font-family: sans-serif, arial, freesans;
 }
 
 abbr {
@@ -45,6 +45,10 @@ abbr {
 }
 
 /* icons */
+.tool-icons {
+	color: $toolicon_colour;
+}
+
 .icon {
   background-color: transparent ;
   background-repeat: no-repeat;
@@ -84,17 +88,19 @@ a.btn-success {
 input[type="text"],
 input[type="password"],
 input[type="submit"],
+input[type="file"],
 select,
 textarea {
-	font-family: arial,freesans,sans-serif;
+	font-family: sans-serif, arial, freesans;
 	font-size: $body_font_size;
 }
 
 input {
+	padding: 5px;
+	line-height: 1.5;
 	border: 1px solid $input_border;
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;	
-	padding: 3px;
 }
 
 input[type="submit"] {
@@ -105,10 +111,6 @@ input[type="submit"] {
 	padding: 6px 12px;
 }
 
-input[type="submit"]:hover {
-	text-decoration: underline;
-}
-
 button, input, optgroup, select, textarea {
 	color: #000;
 }
@@ -704,9 +706,7 @@ footer {
 	cursor: pointer;
 }
 
-#photo-album-edit-wrapper,
-#photo-view-wrapper,
-#photo-edit-edit {
+#photo-view-wrapper {
 	background-color: $item_colour;
 }
 
@@ -869,6 +869,7 @@ footer {
 }
 
 #nav-search-text {
+	font-size: 12px;
 	height: 20px;
 	margin: 15px;
 	padding: 0px 5px 0px 5px;
@@ -2018,10 +2019,6 @@ img.mail-list-sender-photo {
 	-moz-border-radius: $radiuspx;
 }
 
-#saved-search-ul {
-	list-style-type: none;
-}
-
 .fileas-ul {
 	list-style-type: none;
 }
@@ -2031,15 +2028,6 @@ img.mail-list-sender-photo {
 	border-radius: $radiuspx;
 	-moz-border-radius: $radiuspx;
 }
-/*
-.categories-ul {
-	list-style-type: none;
-}
-
-#sidebar-group-list ul, #posted-date-selector {
-	list-style-type: none;
-}
-*/
 
 .profile-thing-list img, .thing-show img, .thing-edit-links a {
 	margin-top: 8px;
@@ -2142,6 +2130,10 @@ blockquote {
 	border-radius: $radiuspx;
 }
 
+nav .badge:hover {
+	background-color: #999;
+}
+
 .dropdown-menu {
 	font-size: $body_font_size;
 	border-radius: $radiuspx;
@@ -2164,10 +2156,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 	background-color: $navaside_bghover;
 }
 
-aside .nav-pills > li > a {
-	padding: 6px 10px;
-}
-
 .dropdown-menu img {
 	border-radius: $radiuspx;
 }
@@ -2198,6 +2186,7 @@ aside .nav-pills > li > a {
 
 
 .navbar-inverse .navbar-nav > li > a {
+	font-size: 12px;
 	color: $nav_icon_colour;
 	text-shadow: 0px 0px 0px;
 }
@@ -2333,12 +2322,10 @@ aside .nav-pills > li > a {
 	margin-bottom: 0px;
 }
 
-.section-title-submenu {
-	margin-top: 10px;
-}
-
-.section-title-submenu a {
-	margin-right: 10px;
+.section-content-tools-wrapper {
+	padding: 7px 10px;
+	background-color: $comment_item_colour;
+	margin-bottom: 3px;
 }
 
 .section-content-wrapper {
@@ -2390,6 +2377,13 @@ aside .nav-pills > li > a {
 
 }
 
+/* release the navbar in landscape view on small devices */
+@media screen and (max-height: 320px) {
+	.navbar-fixed-top {
+		position: absolute;
+	}
+}
+
 .shareable_element_text {
 	height: 300px;
 	width: 300px;
diff --git a/view/theme/redbasic/php/theme_init.php b/view/theme/redbasic/php/theme_init.php
index 2fbca2ef0..dd4542e8a 100644
--- a/view/theme/redbasic/php/theme_init.php
+++ b/view/theme/redbasic/php/theme_init.php
@@ -4,15 +4,14 @@ head_add_css('library/font_awesome/css/font-awesome.min.css');
 head_add_css('library/bootstrap/css/bootstrap-theme.min.css');
 head_add_css('library/bootstrap/css/bootstrap.min.css'); 
 head_add_css('view/css/bootstrap-red.css');
-head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css');
+head_add_css('library/datetimepicker/jquery.datetimepicker.css');
 //head_add_css('library/colorpicker/css/colorpicker.css');
 head_add_css('library/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.min.css');
 require_once('view/php/theme_init.php');
 
 head_add_js('library/bootstrap/js/bootstrap.min.js');
 head_add_js('library/bootstrap/js/bootbox.min.js');
-head_add_js('library/bootstrap-datetimepicker/js/moment.min.js');
-head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');
+head_add_js('library/datetimepicker/jquery.datetimepicker.js');
 //head_add_js('library/colorpicker/js/colorpicker.js');
 head_add_js('library/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js');
 //head_add_js('library/bootstrap-colorpicker/src/js/docs.js');