X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fquattro%2Fquattro.less;h=f13ae9064768bddb601a1f262ea6737eb5773355;hb=b6cceda131abe24ec1ba56ef8d6cf6a27a8c310d;hp=4c3279943db3c718795240b26e943cf3ca3e51c9;hpb=11ba88b6d21a40c302d21646dfa9366bb393931d;p=friendica.git

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 4c3279943d..cd604b656a 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -12,9 +12,9 @@ body {
 h4 { font-size: 1.1em }
 
 .shadow(@x: 0px, @y: 5px){
-   -webkit-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
-   -moz-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
-   box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
+        -webkit-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
+        -moz-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
+        box-shadow:@x @y 10px rgba(0, 0, 0, 0.7);
 }
 
 .rounded(@tr: 5px, @tl: 5px, @bl: 5px, @br: 5px){
@@ -27,11 +27,15 @@ h4 { font-size: 1.1em }
 
 .opaque(@v: 0.5){
 	opacity: @v;
-	-webkit-transition: all 0.2s ease-in-out;
-	-moz-transition: all 0.2s ease-in-out;
-	-o-transition: all 0.2s ease-in-out;
-	-ms-transition: all 0.2s ease-in-out;
-	transition: all 0.2s ease-in-out;
+	.transition();
+}
+
+.transition(@d: 0.2s){
+	-webkit-transition: all @d ease-in-out;
+	-moz-transition: all @d ease-in-out;
+	-o-transition: all @d ease-in-out;
+	-ms-transition: all @d ease-in-out;
+	transition: all @d ease-in-out;
 }
 
 
@@ -47,6 +51,14 @@ a:hover {color: @LinkHover; text-decoration: underline; }
 .fakelink { color: @Link; text-decoration: none; cursor:pointer; }
 .fakelink:hover { color: @LinkHover; text-decoration: underline; }
 
+blockquote {
+        background:@BlockquoteBackgroundColor;
+        padding: 1em;
+        margin-left: 1em;
+        border-left: 1em solid @BlockquoteBorderColor;
+
+}
+
 code {
 	font-family: Courier, monospace;
 	white-space: pre;
@@ -56,7 +68,7 @@ code {
 	background: #EEE;
 	color: #444;
 	padding: 10px;
-	margin-top: 20px; 
+	margin-top: 20px;
 }
 
 #panel {
@@ -69,8 +81,8 @@ code {
 	list-style: none;
 	border: 3px solid @MenuBorder;
 	z-index: 100000;
-	
-	.shadow();	
+
+	.shadow();
 }
 
 
@@ -81,6 +93,7 @@ code {
 	height: auto; overflow: auto;
 	.label { float: left;}
 	.action { float: right; }
+	> img { float: left; }
 }
 
 
@@ -102,6 +115,13 @@ div.jGrowl div.info {
 	padding-left: 58px;
 }
 
+/* notifications page */
+.notif-item {
+	padding: 0.5em;
+	&:nth-child(even) { background-color: @NotificationsPageListEvenBackground; }
+	&:nth-child(odd) { background-color: @NotificationsPageListOddBackground; }
+	.notif-image { width: 16px; }
+}
 
 
 /* header */
@@ -114,7 +134,7 @@ header {
 	#site-location {
 		display: none;
 	}
-	
+
 	#banner {
 		overflow: hidden;
                 text-align: center;
@@ -125,7 +145,7 @@ header {
 	}
 }
 /* nav */
-nav { 
+nav {
 	width: 100%; height: 32px;
 	position: fixed; left: 0px; top: 0px;
 	padding: 0px;
@@ -139,13 +159,13 @@ nav {
 		ul {
 			margin: 0px;
 			padding: 0px 20px;
-			li { 
-				list-style: none; 
+			li {
+				list-style: none;
 				margin: 0px; padding: 0px;
 				float: left;
 				.menu-popup{ left: 0px; right: auto; }
 			}
-			
+
 		}
 
 		.nav-menu-icon {
@@ -154,11 +174,11 @@ nav {
 			padding: 5px;
 			margin: 0px 10px;
 			.roundtop();
-			
+
 			&.selected {
 				background-color: @NavbarSelectedBg;
 			}
-			
+
 				img { width: 22px; height: 22px; }
 				.nav-notify { top: 3px; }
 		}
@@ -173,7 +193,7 @@ nav {
 			&.selected {
 				border-bottom: 3px solid @NavbarSelectedBorder;
 			}
-			
+
 		}
 
 		.nav-notify {
@@ -187,22 +207,26 @@ nav {
 			right: -10px;
 			min-width: 15px;
 			text-align: right;
-			
+
 				&.show{ display: block; }
 		}
-		
-		
+
+
 		#nav-help-link,
 		#nav-search-link,
 		#nav-directory-link,
 		#nav-apps-link,
-		#nav-site-linkmenu { 
+		#nav-site-linkmenu {
 			float: right;
 			.menu-popup{ right: 0px; left: auto; }
 		}
-	
+
 		#nav-notifications-linkmenu.on .icon.s22.notify,
-		#nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png") }
+		#nav-notifications-linkmenu.selected .icon.s22.notify   { background-image: url("../../../images/icons/22/notify_on.png") }
+                #nav-introductions-link.on .icon.s22.intro,
+		#nav-introductions-link.selected .icon.s22.intro        { background-image: url("icons/contacts_on.png") }
+		#nav-messages-link.on .icon.s22.mail,
+		#nav-messages-link.selected .icon.s22.mail              { background-image: url("icons/messages_on.png") }
 		#nav-apps-link.selected { background-color: @NavbarSelectedBg; }
 }
 
@@ -218,9 +242,9 @@ ul.menu-popup {
 	list-style: none;
 	border: 3px solid @MenuBorder;
 	z-index: 100000;
-	
+
 	.shadow();
-	
+
 		a { display: block; color: @MenuItem; padding: 5px 10px; text-decoration: none;}
 		a:hover { background-color: @MenuItemHoverBg; }
 		.menu-sep  { border-top: 1px solid @MenuItemSeparator; }
@@ -232,30 +256,36 @@ ul.menu-popup {
 			color: @MenuEmpty;
 		}
 		.toolbar {
-			background-color:  @MenuEmpty; 
+			background-color:  @MenuEmpty;
 			height: auto; overflow: auto;
 			a { float: right; }
 			a:hover { background-color: @MenuBg; }
 		}
-		
+
 }
 
 /* autocomplete popup */
+.autocomplete,
 .acpopup {
 	max-height:150px;
 	background-color:@MenuBg;
 	color: @Menu;
-	border:1px solid #MenuBorder;
+	border:1px solid @MenuBorder;
 	overflow:auto;
 	z-index:100000;
 	.shadow();
 }
+.autocomplete > div,
 .acpopupitem {
 	color: @MenuItem; padding: 4px;
 	clear:left;
+	overflow: auto;
+	height: auto;
 	img {
 		float: left;
 		margin-right: 4px;
+		width: 16px !important;
+		height: 16px !important;
 	}
 	&.selected{
 		background-color: @MenuItemHoverBg;
@@ -275,20 +305,22 @@ ul.menu-popup {
 
 
 /* aside 230px*/
-aside { 
+aside {
 	display: table-cell;
 	vertical-align: top;
 	width: 200px;
 	padding:0px 10px 0px 20px;
 	border-right: 1px solid @AsideBorder;
 
+	.profile-edit-side-div { display: none; }
+
 	.vcard {
 		.fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; }
 		.title { margin-bottom: 5px; }
 		dl { height: auto; overflow: auto; }
 		dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; }
 		dd {float: left; margin-left: 4px; width: 60%;}
-	
+
 	}
 
 	#profile-extra-links {
@@ -296,6 +328,18 @@ aside {
 		li { padding: 0px; margin: 0px; list-style: none; }
 	}
 
+	#wallmessage-link {
+		display: block;
+		.rounded();
+		color: @AsideConnect;
+		background: @AsideConnectBg url('../../../images/connect-bg.png') no-repeat left center;
+		font-weight: bold;
+		text-transform:uppercase;
+		padding: 4px 2px 2px 35px;
+                margin-top: 3px;
+
+		&:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
+	}
 	#dfrn-request-link {
 		display: block;
 		.rounded();
@@ -304,13 +348,13 @@ aside {
 		font-weight: bold;
 		text-transform:uppercase;
 		padding: 4px 2px 2px 35px;
-		
+
 		&:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
 	}
 
 	#profiles-menu { width: 20em; }
 
-
+        .posted-date-selector-months { margin-left: 10px; }
 }
 
 #contact-block {
@@ -376,11 +420,11 @@ aside {
 	width: 60px;
 	height: 60px;
 }*/
- 
+
 /* widget */
 .widget {
 	margin-bottom: 2em;
-	
+
 	h3 { padding: 0px; margin: 2px;}
 	.action { .opaque(0.1); }
 	input.action { .opaque(0.5); }
@@ -390,14 +434,14 @@ aside {
 
 	ul { padding: 0px;}
 	ul li {padding-left: 16px; min-height: 16px; list-style: none; }
-	
+
 	.tool.selected {
 		background: url('../../../images/selected.png') no-repeat left center;
 	}
-	
+
 	/*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-	
+
 }
 
 /* widget: search */
@@ -408,15 +452,19 @@ aside {
 
 
 /* section 800px */
-section { 
+section {
 	display: table-cell;
 	vertical-align: top;
 	width: 770px;
 	padding:0px 20px 0px 10px;
 }
 
+.sparkle {
+  cursor: url('icons/lock.cur'), pointer;
+}
+
 /* wall item */
-.tread-wrapper { 
+.tread-wrapper {
 	background-color: @ThreadBackgroundColor;
 	position: relative;
 	padding: 10px;
@@ -430,10 +478,10 @@ section {
 .wall-item-container {
 	display: table;
 	width: 750px;
-	
+
 	.wall-item-item,
 	.wall-item-bottom { display: table-row; }
-	
+
 	.wall-item-bottom { .opaque(0.5); }
 	&:hover .wall-item-bottom { .opaque(1); }
 	.wall-item-info {
@@ -441,8 +489,8 @@ section {
 		vertical-align: top;
 		text-align: left;
 		width: 60px;
-		
-	} 
+
+	}
 	.wall-item-location {
 		word-wrap: break-word;
 		width: 50px;
@@ -453,45 +501,68 @@ section {
 		max-width: 720px;
 		word-wrap: break-word;
 	}
-	.wall-item-content img { max-width: 710px; }
+	.wall-item-content img { max-width: 700px; }
 	.wall-item-links,
-	.wall-item-actions { 
-		display: table-cell; 
-		vertical-align: middle; 
-		
+	.wall-item-actions {
+		display: table-cell;
+		vertical-align: middle;
+
 		.icon {
 			.opaque(0.5);
 		}
 		.icon:hover  {
 			.opaque(1.0);
-		}		
+		}
 	}
-	
+
 	.wall-item-ago { padding-right: 40px; }
 	.wall-item-name { font-weight: bold; }
-	
+
 	.wall-item-actions-author { float: left; width: 20em; margin-top: 0.5em; }
+	.wall-item-actions-events { float: left; margin-top: 0.5em;
+		a { margin-right: 3em; }
+	 }
 	.wall-item-actions-social { float: left; margin-top: 0.5em;
 		a { margin-right: 3em; }
 	 }
-	.wall-item-actions-tools { float: right; width: 15%; 
+	.wall-item-actions-tools { float: right; width: 15%;
 		a { float: right; }
 		input { float: right; }
 	}
-	
+
 }
 
 
 .wall-item-container.comment {
 	.contact-photo-wrapper { margin-left: 16px; }
-	.contact-photo { 
-		width: 32px; height: 32px; 
-	}	
+	.contact-photo {
+		width: 32px; height: 32px;
+	}
+
 	.contact-photo-menu-button {
 		top: 15px !important;
 		left: 0px !important;
 	}
 	.wall-item-links { padding-left: 12px; }
+
+	.commentbox {
+		height: 0px;
+		overflow: hidden;
+		.wall-item-comment-wrapper {
+			border-top: 1px solid @CommentBoxEmptyBorderColor;
+			height: 0px; overflow: hidden;
+		}
+		.transition();
+	}
+
+	&:hover .commentbox {
+		height:auto; overflow: visible;
+		.wall-item-comment-wrapper {
+			border-top: 0px;
+			height:auto;overflow: visible;
+		}
+		.transition();
+	}
 }
 
 /* 'tag' item type */
@@ -500,9 +571,9 @@ section {
 		.opaque(0.5);
 	}
 	.contact-photo-wrapper { margin-left: 32px; }
-	.contact-photo { 
+	.contact-photo {
 		width: 16px; height: 16px;
-	}	
+	}
 	.contact-photo-menu-button {
 		top: 15px !important;
 		left: 15px !important;
@@ -513,36 +584,48 @@ section {
 .wall-item-comment-wrapper {
 	margin: 1em 2em 1em 60px;
 	.comment-edit-photo { display: none; }
-	textarea {	
+
+	textarea {
 		height: 1em; width: 100%; font-size: 10px;
 		color: @CommentBoxEmptyColor;
 		border: 1px solid @CommentBoxEmptyBorderColor;
 		padding:0.3em;
 	}
 	.comment-edit-text-full {
-		font-size: 14px;
 		height: 4em;
 		color: @CommentBoxFullColor;
 		border: 1px solid @CommentBoxFullBorderColor;
 	}
+
+	&.photo {
+		margin: 1em 2em 1em 0px;
+	}
 }
 
+.threaded .wall-item-comment-wrapper { margin-left: 0px; }
+
 .comment-edit-preview {
 	width: 710px;
 	border: 1px solid @Grey5;
 	margin-top: 10px;
-	
+	background-color: @JotPreviewBackgroundColor;
+
 	.contact-photo { width: 32px; height: 32px; margin-left: 16px;
 		/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-	}	
+	}
 	.contact-photo-menu-button {
 		top: 15px !important;
 		left: 15px !important;
 	}
 	.wall-item-links { padding-left: 12px; }
 
-	.wall-item-container { width: 700px; }
-	.tread-wrapper { width: 700px; padding: 0; margin: 10px 0;}
+	.wall-item-container { width: 90%; }
+	.tread-wrapper {
+		width: 90%; padding: 0; margin: 10px 0;
+		background-color: @JotPreviewBackgroundColor;
+		border-bottom: 0px;
+	}
+	.wall-item-conv { display: none; }
 }
 
 .shiny { border-right:10px solid @ShinyBorderColor; }
@@ -552,52 +635,223 @@ section {
 
 .wall-item-tags { padding-top: 5px; }
 .tag {
-	background: url("../../../images/tag_b.png") no-repeat center left;
+	background: url("icons/tag.png") no-repeat center right;
 	color: @TagColor;
+	padding-right: 8px;
 	padding-left: 3px;
-	a {
-		padding-right: 8px;
-		background: url("../../../images/tag.png") no-repeat center right;
-		color: @TagColor;
-	}
+	a { color: @TagColor;	}
+}
+.mention {
+	background: url("icons/men.png") no-repeat 1px center;
+	color: @MentionColor;
+	padding-right: 3px;
+	padding-left: 18px;
+	a { color: @MentionColor;	}
+}
+.folder {
+	background: url("icons/folder.png") no-repeat 1px center;
+	color: @MentionColor;
+	padding-right: 3px;
+	padding-left: 15px;
+	a { color: @MentionColor;	}
 }
-.filesavetags {
+.category {
+	background: url("icons/category.png") no-repeat 1px center;
+	color: @MentionColor;
+	padding-right: 3px;
+	padding-left: 15px;
+	a { color: @MentionColor;	}
+}
+/*.filesavetags {
     padding: 3px 0px 3px 0px;
     opacity: 0.5;
-}
+}*/
 
-.wwto { 
-	position: absolute !important; 
-	width: 25px; height: 25px; 
-    background: #FFFFFF;
-    border: 2px solid @Metalic3;
-    height: 25px;
-    width: 25px;
-    overflow: hidden;
-    padding: 1px;
-    position: absolute !important;
-    top: 40px;
-    left: 30px;
-    
-    .shadow(0px, 0px)
+.wwto {
+        position: absolute !important;
+        background: #FFFFFF;
+        border: 2px solid @Metalic3;
+        height: 25px;
+        width: 25px;
+        overflow: hidden;
+        padding: 1px;
+        top: 40px;
+        left: 30px;
+
+        .shadow(0px, 0px);
 }
 .wwto .contact-photo { width: 25px; height: 25px; }
 
+/* reshare e embed */
+.wall-item-container .wall-item-content .type-link img,
+.type-link img {
+        max-width: 160px;
+        max-height: 160px;
+        float: left;
+        margin-right: 10px;
+
+            &.attachment-image {
+                    max-width: 650px;
+                    max-height: inital;
+                    float: none;
+                    margin-right: 0px;
+            }
+
+}
+.type-link {
+        blockquote {
+            margin: 1em 0px;
+            max-height: 160px;
+            overflow: hidden;
+                    padding-left: 1em;
+        }
+        .oembed {}
+}
+
+.type-video blockquote { padding-left: 1em; }
+
+.shared_header {
+        height: 32px;
+        color: #999;
+        border-top: 1px solid @ThreadBottomBorderColor;
+        padding-top: 5px;
+        margin-top: 5px;
+
+        img {
+            -webkit-border-radius: 4px;
+            -moz-border-radius: 4px;
+            border-radius: 4px;
+            float: left;
+        }
+
+        span { margin-left: 9px; }
+}
+
+
+blockquote.shared_content {
+        margin-left: 32px;
+        color: #000;
+        border: none;
+}
+
+
+.oembed.video {
+	> a.embed_video {
+		display: block;
+		float: none;
+		> div {
+			background:
+				rgba(255, 255, 255, 0.36)
+				url(../../../images/icons/48/play.png)
+				no-repeat center center
+				!important;
+		}
+	}
+}
+
+
+/* threaded comments */
+.children {
+	margin-top: 1em;
+	.hide-comments-outer { margin-left:60px; }
+
+	.wwto { display: none; }
+
+	.comment-edit-preview { width: 660px;
+		.wall-item-container { width: 610px; }
+	 }
+
+	& .children {
+
+		margin-left: 40px;
+		.wall-item-container { width: 710px; }
+		.comment-edit-preview { width: 620px;
+			.wall-item-container { width: 620px; }
+		 }
+
+		& .children {
+			.wall-item-container { width: 670px; }
+			.comment-edit-preview { width: 580px;
+				.wall-item-container { width: 580px; }
+			}
+
+			& .children {
+				.wall-item-container { width: 630px; }
+				.comment-edit-preview { width: 540px;
+					.wall-item-container { width: 540px; }
+				}
+
+				& .children {
+					.wall-item-container { width: 590px; }
+					.comment-edit-preview { width: 500px;
+						.wall-item-container { width: 500px; }
+					}
+
+					.children {
+						margin-left: 0px;
+						.hide-comments-outer { margin-left: 0px; }
+					}
+				}
+			}
+		}
+	}
+}
+/*.threaded .hide-comments-outer { margin-left: 20px; }*/
+
+span[id^="showmore-teaser"]{
+        background: url("showmore-bg.jpg") no-repeat center bottom;
+}
+span[id^="showmore-wrap"] {
+        border-top: 1px solid #999999;
+        color: #999999;
+        display: block;
+        text-align: center;
+        background-color: @ThreadBackgroundColor;
+}
+
 
 #pause {
- position: fixed;
- bottom: 5px;
- right: 5px;
+        position: fixed;
+        bottom: 5px;
+        right: 5px;
 }
 
 
 .contact-photo-wrapper { position: relative; }
-.contact-photo { 
+.contact-select {	position: absolute; top:64px; left:64px; display:none; }
+.contact-select:checked,
+.contact-photo:hover .contact-select {	display:block; }
+#contacts-actions {
+	position: absolute;
+	left: 800px;
+	width: 200px;
+	background-color: @MenuBg;
+	border: 2px solid @MenuBorder;
+	.batch-action {
+		display: block;
+		width: 100%;
+		background-color: @MenuBg;
+		border: 0px;
+		color: @MenuItem;
+		text-align: left;
+		padding: 5px 10px;
+		font-size: 11px;
+	}
+	.batch-action:hover {
+		background-color: @MenuItemHoverBg;
+	}
+	display: none;
+}
+@media (max-width: 1000px) {
+	#contacts-actions { left: 40px; }
+}
+
+.contact-photo {
 	width: 48px; height: 48px;
 	img { width: 48px; height: 48px; }
 	overflow: hidden;
 	display: block;
- }		
+ }
 .contact-photo-menu-button {
 	display: none;
 	position: absolute;
@@ -611,30 +865,51 @@ section {
 	height: 90px;
 	padding-right: 10px;
 	margin: 0 10px 10px 0px;
-	.contact-photo-wrapper { 
-		float: left; 
+	.contact-photo-wrapper {
+		float: left;
 		margin-right: 10px;
 	}
-	.contact-photo { 
+	.contact-photo {
 		width: 80px; height: 80px;
 		img { width: 80px; height: 80px; }
 	}
 	.contact-photo-menu-button {
 		left: 0px;
 		top: 63px;
-	}	
+	}
+	.drop {
+		background-image: url('../../../images/icons/22/delete.png');
+		display: block; width: 22px; height: 22px;
+		position: relative;
+		top: 10px;
+		left: -10px;
+		z-index: 99;
+	}
+	.drophide {
+		background-image: url('../../../images/icons/22/delete.png');
+		display: block; width: 22px; height: 22px;
+		opacity: 0.3;
+		position: relative;
+		top: 10px;
+		left: -10px;
+		z-index: 99;
+	}
+	.contact-entry-connect {
+		padding-top: 5px;
+		font-weight: bold;
+	}
 }
 .directory-item {
 	float: left;
 	width: 200px;
 	height: 200px;
-	.contact-photo { 
+	.contact-photo {
 		width: 175px; height: 175px;
 		img { width: 175px; height: 175px; }
 	}
 }
 .contact-name { font-weight: bold; padding-top: 15px; }
-.contact-details { 
+.contact-details {
 	color: @Grey3; white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -646,8 +921,7 @@ section {
 
 	width: 100%;
 	margin: 0px 2em 20px 0px;
-	
-	
+
 	.profile-jot-text {
 		height: 1em; width: 99%; font-size: 10px;
 		color: @CommentBoxEmptyColor;
@@ -694,7 +968,7 @@ section {
 				border-left: 10px solid @JotPermissionLockBackgroundColor;
 				background-color: @JotPermissionLockBackgroundColor;
 			}
-			
+
 		}
 		li.submit {
 			float: right;
@@ -740,12 +1014,12 @@ section {
 
 		&:-moz-placeholder {
 			font-weight: normal;
-		}		
-	
+		}
+
 		&:hover { border: 1px solid @CommentBoxEmptyBorderColor }
 		&:focus { border: 1px solid @CommentBoxEmptyBorderColor }
 	}
-	
+
 	#character-counter {
 		width: 40px;
 		float: right;
@@ -754,7 +1028,7 @@ section {
 		line-height: 20px;
 		padding-right: 20px;
 	}
-	
+
 	#jot-category {
 		border: 0px;
 		margin: 0px;
@@ -823,7 +1097,7 @@ section {
 	overflow: auto;
 }
 #acl-list-content {
-	
+
 }
 .acl-list-item {
 	display: block;
@@ -840,7 +1114,7 @@ section {
 	margin: 4px;
 }
 .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
-.acl-list-item a { 
+.acl-list-item a {
 	font-size: 8px;
 	display: block;
 	width: 40px;
@@ -885,12 +1159,12 @@ ul.tabs {
     li {
         float: left;
         margin-left: 20px;
-        
+
         .active {
 			border-bottom: 1px solid @LinkVisited;
         }
     }
-    
+
 }
 
 
@@ -899,7 +1173,7 @@ ul.tabs {
 #group-update-wrapper{
 	height: auto; overflow: auto;
 	#group {
-		width:300px; 
+		width:300px;
 		float:left;
 		margin-right:20px;
 	}
@@ -941,13 +1215,12 @@ ul.tabs {
 	input[type="checkbox"], input[type="radio"]{
 		width: auto;
 	}
-	
+
 	textarea { height: 100px; }
 	.field_help {
 		display: block;
 		margin-left: 200px;
 		color: @FieldHelpColor;
-		
 	}
 
 
@@ -1022,7 +1295,7 @@ ul.tabs {
 }
 #profile-edit-profile-name,
 #profile-edit-name,
-#gender-select, 
+#gender-select,
 #profile-edit-pdesc,
 #profile-edit-gender,
 #profile-edit-dob,
@@ -1039,7 +1312,7 @@ ul.tabs {
 #profile-edit-pubkeywords,
 #profile-edit-prvkeywords,
 #profile-edit-homepage {
-    margin-top: 5px;
+        margin-top: 5px;
 }
 
 /* oauth */
@@ -1047,7 +1320,7 @@ ul.tabs {
 	height: auto; overflow: auto;
 	border-bottom: 2px solid #cccccc;
 	padding-bottom: 1em;
-	margin-bottom: 1em;	
+	margin-bottom: 1em;
 }
 .oauthapp img {
 	float: left;
@@ -1068,26 +1341,165 @@ ul.tabs {
 	width: 50px; float: left;
 }
 
-/* photo */
-.lframe {
+/* videos page */
+.videos {
+	.video-top-wrapper {
+		width: 200px; float: left;
+		margin: 0px 10px 10px 0px;
+		position: relative;
+
+		.video-js {
+			width: 200px!important;
+			height: 132px!important;
+		}
+
+		.video-delete {
+			position: absolute;
+			opacity: 0;
+			right: 0px;
+			top: 0px;
+			transition: opacity 0.5s;
+		}
+
+		&:hover .video-delete {
+			opacity: 1;
+		}
+	}
+}
+
+/* photo albums */
+@photosize: 150px;
+
+#photo-edit-link-wrap { margin-bottom: 10px; }
+
+#album-edit-link {
+	border-right: 1px solid @MenuBorder;
+	float: left;
+	padding-right: 5px;
+	margin-right: 5px;
+}
+#photo-edit-link,
+#album-edit-link a {
+	background: url("../../../images/icons/16/edit.png") no-repeat left center;
+	padding-left: 18px;
+}
+#photo-toprofile-link {
+	background: url("../../../images/icons/16/user.png") no-repeat left center;
+	padding-left: 18px;
+}
+
+#photo-top-upload-link,
+.photos-upload-link { margin: 1em 0px; display: block; }
+.photos-upload-link a,
+#photo-top-upload-link {
+	background: url("../../../images/icons/16/add.png") no-repeat left center;
+	padding-left: 18px;
+}
+
+
+.photo-top-image-wrapper,
+.photo-album-image-wrapper {
 	float: left;
 	margin: 0px 10px 10px 0px;
+	width:@photosize; height: @photosize;
+	position: relative;
+	overflow: hidden;
+
+	img { width: @photosize; }
+
+	.photo-top-album-name,
+	.caption{
+		position: absolute;
+		color: @Menu;
+		background-color: @MenuBg;
+
+		width: 100%;
+		.shadow(0px, 5px);
+		.transition(0.5s);
+		bottom: -@photosize;
+	}
+
+	&:hover .photo-top-album-name,
+	&:hover .caption {
+		bottom: 0px;
+		.shadow(0px, 0px);
+		.transition(0.5s);
+	}
+}
+
+#photo-photo {
+	display: block; width: 660px;
+	padding: 50px; margin-bottom: 0px;
+	text-align: center;
+	background-color: @Grey3;
+	img { max-width: 560px; }
+}
+#photo-album-title {
+	background: url("../../../images/icons/22/image.png") no-repeat top left;
+	padding-left: 23px;
+	min-height: 22px;
+	padding-top: 6px;
+	/* a { display: block;}*/
+}
+
+#photo-caption {
+	display: block; width: 660px;
+	min-height: 55px;
+	background-color:  @Grey2;
+	padding:0 50px 0 50px;
+}
+#photo-next-link > a > div {
+	background: url("icons/next.png") no-repeat center center;
+	float: right;
+	width: 50px; height: 50px;
+}
+#photo-prev-link > a > div {
+	background: url("icons/prev.png") no-repeat center center;
+	float: left;
+	width: 50px; height: 50px;
+}
+#photo-like-div {
+	display: block; width: 660px;
+	height: 30px;
+	background-color:  @Grey2;
+	padding:0 50px 0 50px;
+	.icon {float: left;}
+	.like-rotator {float: right;}
+}
+
+#photo_edit_form {
+	padding: 1em;
 }
 
 /* profile match wrapper */
 .profile-match-wrapper {
 	float: left;
-	width: 90px;
-	height: 90px;
+	width: 110px;
+	height: 110px;
         margin-bottom: 20px;
-	.contact-photo { 
+        .drop {
+            background-image: url('../../../images/icons/22/delete.png');
+            display: block; width: 22px; height: 22px;
+            position: relative;
+            top: 10px;
+	    left: -10px;
+        }
+        .drophide {
+            background-image: url('../../../images/icons/22/delete.png');
+            display: block; width: 22px; height: 22px;
+            opacity: 0.3;
+            position: relative;
+            top: 10px;
+	    left: -10px;
+        }
+	.contact-photo {
 		width: 80px; height: 80px;
 		img { width: 80px; height: 80px; }
 	}
 	.contact-photo-menu-button {
 		left: 0px;
 		top: 63px;
-	}	
+	}
 }
 
 /* messages */
@@ -1108,10 +1520,10 @@ ul.tabs {
 	background-color: @MailListBackgroundColor;
 	margin-bottom: 5px;
 	width: 100%; height: auto; overflow: hidden;
-	
+
 	span { display: block; float: left; width: 20%; overflow: hidden;}
-	
-	.mail-subject { 
+
+	.mail-subject {
 		width: 30%;
 		padding:4px 0px 0px 4px;
 		a { display: block; }
@@ -1120,7 +1532,7 @@ ul.tabs {
 	.mail-date { padding: 4px 4px 0px 4px; }
 	.mail-from { padding: 4px 4px 0px 4px; }
 	.mail-count { padding: 4px 4px 0px 4px; text-align: right;}
-	
+
 	.mail-delete { float: right; }
 }
 
@@ -1132,7 +1544,7 @@ ul.tabs {
 	span { float: left; overflow: hidden; padding: 4px 0px 0px 10px;}
 	.mail-delete { float: right;  .opaque(0.5);}
 	&:hover .mail-delete { .opaque(1); }
-	
+
 }
 
 /* theme screenshot */
@@ -1148,7 +1560,197 @@ ul.tabs {
 footer { height: 100px; display: table-row; }
 
 .pager {
-    margin-top: 25px;
-    clear: both;
+        margin-top: 25px;
+        clear: both;
 }
 
+/**
+ * ADMIN
+ */
+#pending-update {
+	float:right;
+	color: #ffffff;
+	font-weight: bold;
+	background-color: #FF0000;
+	padding: 0em 0.3em;
+
+}
+#adminpage {
+    dl {
+	clear: left;
+	margin-bottom: 2px;
+	padding-bottom: 2px;
+	border-bottom: 1px solid black;
+    }
+    dt {
+	width: 200px;
+	float: left;
+	font-weight: bold;
+    }
+    dd {
+	margin-left: 200px;
+    }
+    h3 {
+	border-bottom: 1px solid #cccccc;
+    }
+    .field label {
+	font-weight: bold;
+    }
+    .submit {
+	clear:left;
+	text-align: right;
+    }
+    #pluginslist {
+	margin: 0px; padding: 0px;
+    }
+    .plugin {
+	list-style: none;
+	display: block;
+	border: 1px solid #888888;
+	padding: 1em;
+	margin-bottom: 5px;
+	clear: left;
+        desc {
+            margin-left: 2.5em;
+        }
+    }
+    .toggleplugin {
+	float:left;
+	margin-right: 1em;
+    }
+    table {
+        width:100%;
+        border-bottom: 1px solid #000000;
+        margin: 5px 0px;
+        th {
+            text-align: left;
+        }
+        td .icon {
+            float: left;
+        }
+        tr:hover {
+            background-color: #bbc7d7;
+        }
+    }
+    table#users img {
+            width: 16px; height: 16px;
+    }
+    .selectall { text-align: right; }
+}
+
+/* edit buttons for comments */
+
+.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
+.comment-edit-bb {
+	list-style: none;
+	display: none;
+	margin: 0px;
+	padding: 0px;
+	width: 75%;
+}
+.comment-edit-bb > li {
+	display: inline-block;
+	margin: 10px 10px 0 0;
+	visibility: none;
+}
+
+.editicon {
+        display: inline-block;
+        width: 16px;
+        height: 16px;
+        background-image: url(icons/bbedit.png);
+        text-decoration: none;
+        :hover {background-color: #ccc;}
+}
+.boldbb { background-position: 0px 0px; }
+.boldbb:hover { background-position: 0px -16px; }
+.italicbb { background-position: -16px 0px; }
+.italicbb:hover { background-position: -16px -16px; }
+.underlinebb { background-position: -32px 0px; }
+.underlinebb:hover { background-position: -32px -16px; }
+.quotebb { background-position: -48px 0px; }
+.quotebb:hover { background-position: -48px -16px; }
+.codebb { background-position: -64px 0px; }
+.codebb:hover { background-position: -64px -16px; }
+.imagebb { background-position: -80px 0px; }
+.imagebb:hover { background-position: -80px -16px; }
+.urlbb { background-position: -96px 0px; }
+.urlbb:hover { background-position: -96px -16px; }
+.videobb { background-position: -112px 0px; }
+.videobb:hover { background-position: -112px -16px; }
+
+
+/** range input css **/
+/* slider root element */
+.slider {
+        height:2px;
+        position:relative;
+        cursor:pointer;
+        border:1px solid #333;
+        width:200px;
+        margin:10px 0px 10px 0px;
+            float: left;
+}
+
+/* progress bar (enabled with progress: true) */
+.progress {
+        height:9px;
+        background-color:#C5FF00;
+        display:none;
+        opacity:0.6;
+}
+
+/* drag handle */
+.handle {
+        background-color:#ccc;
+        height:16px;
+        width:8px;
+        top:-8px;
+        position:absolute;
+        display:block;
+        margin-top:1px;
+        border:1px solid #000;
+        cursor:move;
+            .roundbottom();
+            .shadow();
+}
+
+/* the input field */
+.range {
+	width: 20px!important;
+	font-size: 8pt;
+	margin-left: 10px;
+	border: 0px;
+	color: @FieldHelpColor;
+}
+
+/* buttons for the event view */
+.plink-event-link {
+	float: left;
+	margin-left: 2px;
+}
+
+/* upload/select popup */
+.fbrowser {
+	overflow: auto;
+	position: absolute;
+	top: 0px;
+	width: 100%;
+	height: 100%;
+}
+.fbrowser .path {
+	background-color: @NavbarBackground;
+	a {	padding: 5px; margin: 0px 2px; display: inline-block; }
+	a, a:active, a:visited, a:link, a:hover { color: @Banner; text-decoration: none; outline: none;  }
+}
+.fbrowser .folders ul { list-style: url("icons/folder.png"); padding-left: 22px;}
+.fbrowser .list { padding: 10px; }
+.fbrowser.image .photo-album-image-wrapper { width: 48px; height: 48px; }
+.fbrowser.image a img { width: auto; height: 48px; }
+.fbrowser.image a p { display: none;}
+.fbrowser.file .photo-album-image-wrapper { float:none;  white-space: nowrap; width: 100%; height: auto; }
+.fbrowser.file img { display: inline; width: 16px; height: 16px}
+.fbrowser.file p  { display: inline; white-space: nowrap; }
+
+.fbrowser .upload { clear: both; padding-top: 1em;}
+