Merge pull request #1 from friendica/master

Pull from upstream

10 files changed, 80 insertions, 35 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 9f93395c9..12287ba4f 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -1,11 +1,5 @@
 /* override some bootstrap settings */
 
-/* this might be a bug in bootstrap */
-.input-group-addon,
-.input-group-btn {
-	width: unset;
-}
-
 /* nav overrides */
 
 nav .badge {
@@ -32,7 +26,6 @@ nav img {
 }
 
 nav .dropdown-menu {
-	top: 50px;
 	max-height: 450px;
 	max-width: 300px;
 	overflow-y: auto;
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 1e9930443..7a5ffc2f7 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -8,9 +8,7 @@ code {
 
 /* jot */
 
-#jot-title,
-#jot-category,
-#jot-pagetitle {
+.jothidden input {
 	border: 0px;
 	margin: 0px;
 	padding: 8px;
diff --git a/view/css/default.css b/view/css/default.css
index 40d5cfc59..56173f932 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -23,10 +23,6 @@ aside#region_1 {
 	padding: 65px 7px 0px 7px;
 }
 
-aside input[type='text'] {
-	width: 100%;
-}
-
 section {
 	width: 100%;
 	display: table-cell;
diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css
new file mode 100644
index 000000000..76ac82690
--- /dev/null
+++ b/view/css/mod_cloud.css
@@ -0,0 +1,43 @@
+#files-mkdir-tools,
+#files-upload-tools,
+[id^="perms-panel-"] {
+	display: none;
+}
+
+[id^="perms-panel-"] {
+	padding: 3px 10px 0px 10px !important;
+}
+
+#attach-code,
+#link-code {
+	display: none;
+}
+
+#cloud-index {
+	width: 100%;
+}
+
+#cloud-index td:nth-child(1){
+	padding: 7px 3px 7px 10px;
+}
+
+#cloud-index th:nth-child(8),
+#cloud-index td:nth-child(8){
+	padding: 7px 3px;
+	white-space: nowrap;
+}
+
+#cloud-index th:nth-child(9),
+#cloud-index td:nth-child(9){
+	padding: 7px 10px 7px 7px;
+	white-space: nowrap;
+}
+
+.cloud-index-tool {
+	padding: 7px 10px;
+}
+
+#files-upload {
+	padding: 4px;
+	width: 100%;
+}
diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
index 849e8e485..20facbaf8 100644
--- a/view/css/mod_directory.css
+++ b/view/css/mod_directory.css
@@ -12,6 +12,8 @@
 	margin-left: auto;
 	margin-right: auto;
 	display:block;
+	width: 80px;
+	height: 80px;
 }
 .directory-details {
 	text-align: center;
diff --git a/view/css/mod_manage.css b/view/css/mod_manage.css
index 161b46757..bb7ef566d 100644
--- a/view/css/mod_manage.css
+++ b/view/css/mod_manage.css
@@ -1,7 +1,6 @@
 #channels-selected {
 	color: #666666;
 	font-size: 0.8em;
-
 }
 
 #channels-desc {
@@ -14,33 +13,23 @@
 .channels-break {
 	margin-bottom: 15px;
 }
-#selected-channel {
-	float: left;
-	margin-left: 0;
-}
-
-.channels-end.selected {
-	clear: both;
-}
-
-#selected-channel .channel-selection {
-	clear: both;
-	margin: 0 auto 0 auto;
-}
 
 .channel-selection-default {
 	font-size: 0.8em;
 	margin-bottom: 10px;
 }
 
-#all-channels .channel-selection {
+.channel-selection {
 	width: 12em;
 	height: 16em;
 	float: left;
-	margin: 0 15px 15px 0;
+	text-align: center;
 }
-.channels-end {
-	clear: both;
+
+.channel-selection img {
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
 }
 
 .channel-selection-name-link {
@@ -50,7 +39,6 @@
 
 .channel-selection-name-link .channel-name {
 	padding-top: 10px;
-	text-align: left;	
 	word-wrap: break-word;
 	overflow: hidden;
 }
@@ -59,3 +47,7 @@
 	clear: both;
 	padding-top: 10px;
 }
+
+.selected-channel img {
+	border: 2px solid #ff0000;
+}
diff --git a/view/css/mod_new_channel.css b/view/css/mod_new_channel.css
index 068f4f3a5..397601635 100644
--- a/view/css/mod_new_channel.css
+++ b/view/css/mod_new_channel.css
@@ -22,6 +22,10 @@ h2 {
 	width: 275px;
 }
 
+.newchannel-role-morehelp {
+	float: left;
+	width: 32px;
+}
 .newchannel-input {
 	float: left;
 	width: 275px;
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index 34bac51e9..a2b3459cf 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -25,6 +25,6 @@
 }
 
 #photos-upload-choose {
-	border: unset;
-	padding: unset;
+	padding: 4px;
+	width: 100%;
 }
diff --git a/view/css/mod_profile.css b/view/css/mod_profile.css
new file mode 100644
index 000000000..e1ceae7f7
--- /dev/null
+++ b/view/css/mod_profile.css
@@ -0,0 +1,16 @@
+.aprofile dt {
+	font-weight: bold;
+}
+
+.profile-thing-list {
+	list-style-type: none;
+}
+
+.profile-thing-list img {
+	margin-bottom: 5px;
+}
+
+.profile-thing-list > li {
+	margin-bottom: 15px;
+}
+
diff --git a/view/css/widgets.css b/view/css/widgets.css
index a24f5fb29..4db87e633 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -13,6 +13,7 @@
 }
 
 .widget-input {
+	width: 100%;
 	border-top-right-radius: 0px;
 	border-bottom-right-radius: 0px;
 }