Merge pull request #794 from nidzix/master

Sf internal theme update
superdesk · Jul 11, 2014 · 0861d62 · 0861d62
2 parents 000de65 + 02f77bc
commit 0861d62
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 23 deletions.
diff --git a/plugins/livedesk-embed/gui-themes/themes/sf-internal.js b/plugins/livedesk-embed/gui-themes/themes/sf-internal.js
@@ -1,5 +1,5 @@
 define([
-    'plugins/scroll-pagination',
+    'plugins/button-pagination',
 	'plugins/wrappup-toggle',
 	'plugins/permanent-link',
 	'plugins/twitter-widgets',
@@ -10,7 +10,7 @@ define([
 ], function(){
 	return {
 		plugins: [
-            'scroll-pagination',
+            'button-pagination',
             'wrappup-toggle', 
 			'permanent-link',
 			'twitter-widgets'

diff --git a/plugins/livedesk-embed/gui-themes/themes/sf-internal.min.js b/plugins/livedesk-embed/gui-themes/themes/sf-internal.min.js
@@ -1,5 +1,5 @@
 define([
-    'plugins/scroll-pagination',
+    'plugins/button-pagination',
     'plugins/wrappup-toggle',
     'plugins/permanent-link',
     'plugins/twitter-widgets',
@@ -10,7 +10,7 @@ define([
 ], function(){
     return {
         plugins: [
-            'scroll-pagination',
+            'button-pagination',
             'wrappup-toggle', 
             'permanent-link',
             'twitter-widgets'

diff --git a/plugins/livedesk-embed/gui-themes/themes/sf-internal/base-theme.less b/plugins/livedesk-embed/gui-themes/themes/sf-internal/base-theme.less
@@ -142,12 +142,13 @@ background: #f3f3f3;
 		.streched();
 
 		.liveblog-header {
-			position: absolute;
+			position: fixed;
 			top:0; right: 0; left: 0;
 			height: 50px;
 			background: #263143;
 			padding: 0 20px;
 			line-height: 50px;
+			z-index: 10;
 			.header-wrap {
 				width: 600px;
 				margin: 0 auto;
@@ -227,8 +228,7 @@ background: #f3f3f3;
 
 		.liveblog-content {
 			position: absolute;
-			top:50px; right: 0; left: 0; bottom:0;
-			overflow: auto;
+			top:50px; right: 0; left: 0;
 
 
 			.liveblog-content-middle {
@@ -378,6 +378,7 @@ background: #f3f3f3;
 								display: @display-left-column;
 							}
 							.post-content-main {
+								min-height: 60px;
 								margin-left: @left-column-width;
 								background: #fff;
 								.border-radius(3px);
@@ -546,20 +547,26 @@ background: #f3f3f3;
 							}
 						}
 						&.wrapup {
-							background: #e8e8e8;
+							background: #263143;
 							border: 0;
-							margin: 0;
-							padding:5px 20px;
+							margin: 20px 0;
 							.post-content-side {
 								display: none;
 							}
 							.post-content {
-								min-height: 0;
+								margin: 0;
 								.post-content-main {
 									margin-left: 0;
 									margin-top: 0;
+									background: none;
+									.box-shadow(none);
+									.post-header {
+										display: none;
+									}
+
 									.post-content-full {
 										margin:0;
+
 										.big-toggle {
 											display: block;
 											width: 21px;
@@ -569,10 +576,15 @@ background: #f3f3f3;
 										}
 										.post-text {
 											font-weight: bold;
-											color: #262626;
+											color: #fff;
 											padding-left: 40px;
 										}
 									}
+									&:hover {
+										.actions {
+											display: none !important;
+										}
+									}
 								}
 							}
 							&.wrapup-open {
@@ -595,15 +607,6 @@ background: #f3f3f3;
 								}
 							}
 						}
-						&.usercomments {
-							.post-publisher-avatar {
-								background: url(img/comment-icon.png) no-repeat 0 0;
-								border-color: @lb-background; 
-								.post-publisher-avatar-img {
-									display: none;
-								}
-							}
-						}
 						&.quote {
 							.post-core-content {
 								padding-left: 45px;

diff --git a/plugins/livedesk-embed/gui-themes/themes/sf-internal/container.dust b/plugins/livedesk-embed/gui-themes/themes/sf-internal/container.dust
@@ -18,10 +18,11 @@
 		{/headerContainer}
 
 		{+contentContainer}
+
 		<div class="liveblog-content">
 			{+content}
 				{+contentMiddleContainer}
-				<div class="liveblog-content-middle" id="wrapper"> 
+				<div class="liveblog-content-middle"> 
 					{+contentMiddle}
 						{+postsList}{/postsList}
 					{/contentMiddle}

diff --git a/plugins/livedesk-embed/gui-themes/themes/sf-internal/liveblog.css b/plugins/livedesk-embed/gui-themes/themes/sf-internal/liveblog.css