Merge branch '1.14RC'

2 files changed, 126 insertions, 9 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 5af0c55e7..7ecd41627 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -1,6 +1,6 @@
 /* jot */
 
-.jothidden input {
+.jothidden input[type="text"] {
 	border: 0px;
 	margin: 0px;
 	height: 39px;
@@ -46,6 +46,13 @@
 	box-shadow: inset 0 0px 7px #5cb85c;
 }
 
+.comment-edit-text-empty.hover, .comment-edit-text-full.hover  {
+	background-color: aliceblue;
+	opacity: 0.5;
+	box-shadow: inset 0 0px 7px #5cb85c;
+}
+
+
 .jot-attachment {
 	border: 0px;
 	padding: 10px;
@@ -70,6 +77,10 @@
 	margin-bottom: 30px;
 }
 
+#profile-jot-plugin-wrapper {
+	margin-top: 10px;
+}
+
 #profile-rotator-wrapper {
 	float: left;
 }
@@ -78,14 +89,6 @@
 	padding: 15px 0px 0px 15px;
 }
 
-.profile-jot-net {
-	float: left;
-	margin-right: 10px;
-	margin-top: 5px;
-	margin-bottom: 5px;
-	padding: 5px;
-}
-
 /* conversation */
 
 .thread-wrapper.toplevel_item {
@@ -94,6 +97,18 @@
 
 /* conv_item */
 
+.wall-item-head {
+	padding: 10px 10px 0.5em 10px;
+}
+
+.wall-item-content {
+	padding: 0.5em 10px;
+}
+
+.wall-item-tools {
+	padding: 0.5em 10px 10px 10px;
+}
+
 .wall-item-info {
 	display: block;
 	float: left;
@@ -192,6 +207,20 @@ a.wall-item-name-link {
 	margin-bottom: 20px;
 }
 
+.ivoted {
+	color: #337AB7;
+}
+
+.item-highlight {
+	border-left: 3px solid #337AB7;
+}
+
+.item-highlight .wall-item-head,
+.item-highlight .wall-item-content,
+.item-highlight .wall-item-tools {
+	padding-left: 7px;
+}
+
 /* comment_item */
 
 .comment-edit-text-empty,
@@ -323,3 +352,17 @@ img.smiley.emoji:hover {
 	width: 32px;
 	height: 32px;
 }
+
+
+.checklist input {
+	margin: 0px;
+	vertical-align: middle;
+}
+
+.combobox {
+	padding: 15px;
+}
+
+#filer_save {
+	margin-left: 15px;
+}
diff --git a/view/css/mod_webpages.css b/view/css/mod_webpages.css
index f72f632dd..805d95dc2 100644
--- a/view/css/mod_webpages.css
+++ b/view/css/mod_webpages.css
@@ -119,3 +119,77 @@
 	opacity: 1;
 }
 
+
+/* SQUARED THREE */
+.squaredThree {
+	width: 14px;
+	height: 14px;
+	background: #fcfff4;
+
+	background: -webkit-linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
+	background: -moz-linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
+	background: -o-linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
+	background: -ms-linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
+	background: linear-gradient(top, #fcfff4 0%, #dfe5d7 40%, #b3bead 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcfff4', endColorstr='#b3bead',GradientType=0 );
+	margin: 5px auto;
+
+	-webkit-box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5);
+	-moz-box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5);
+	box-shadow: inset 0px 1px 1px white, 0px 1px 3px rgba(0,0,0,0.5);
+	position: relative;
+}
+
+.squaredThree label {
+	cursor: pointer;
+	position: absolute;
+	width: 10px;
+	height: 10px;
+	left: 2px;
+	top: 2px;
+
+	-webkit-box-shadow: inset 0px 1px 1px rgba(0,0,0,0.5), 0px 1px 0px rgba(255,255,255,1);
+	-moz-box-shadow: inset 0px 1px 1px rgba(0,0,0,0.5), 0px 1px 0px rgba(255,255,255,1);
+	box-shadow: inset 0px 1px 1px rgba(0,0,0,0.5), 0px 1px 0px rgba(255,255,255,1);
+
+	background: -webkit-linear-gradient(top, #222 0%, #45484d 100%);
+	background: -moz-linear-gradient(top, #222 0%, #45484d 100%);
+	background: -o-linear-gradient(top, #222 0%, #45484d 100%);
+	background: -ms-linear-gradient(top, #222 0%, #45484d 100%);
+	background: linear-gradient(top, #222 0%, #45484d 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#222', endColorstr='#45484d',GradientType=0 );
+}
+
+.squaredThree label:after {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+	filter: alpha(opacity=0);
+	opacity: 0;
+	content: '';
+	position: absolute;
+	width: 9px;
+	height: 5px;
+	background: transparent;
+	top: 2px;
+	left: 2px;
+	border: 3px solid #fcfff4;
+	border-top: none;
+	border-right: none;
+
+	-webkit-transform: rotate(-45deg);
+	-moz-transform: rotate(-45deg);
+	-o-transform: rotate(-45deg);
+	-ms-transform: rotate(-45deg);
+	transform: rotate(-45deg);
+}
+
+.squaredThree label:hover::after {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+	filter: alpha(opacity=30);
+	opacity: 0.3;
+}
+
+.squaredThree input[type=checkbox]:checked + label:after {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+	filter: alpha(opacity=100);
+	opacity: 1;
+}
\ No newline at end of file