diff --git a/view/global.css b/view/global.css index 4dd4cd572..3fb31a30c 100644 --- a/view/global.css +++ b/view/global.css @@ -117,6 +117,10 @@ span.connector { position: relative; } +.embed_video.active { + float: none; +} + .embed_rich { display: block; transition: height .75s; diff --git a/view/templates/oembed_video.tpl b/view/templates/oembed_video.tpl index 8392c469c..8645fea67 100644 --- a/view/templates/oembed_video.tpl +++ b/view/templates/oembed_video.tpl @@ -1,4 +1,4 @@ - +
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 7f74ed55f..df9585d07 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1719,13 +1719,14 @@ img.acpopup-img { } /* Menubar Tabs */ -section > ul.tabbar { +section > .tabbar-wrapper { /* The tabbar shouldn't' be visibile inside the section element. Only after we have moved it to the nav through js */ display: none !important; } #tabmenu, +.tabbar-wrapper, .tabbar, .tabbar > li { height: 100%; diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js index c14927180..b51d6b39d 100644 --- a/view/theme/frio/js/theme.js +++ b/view/theme/frio/js/theme.js @@ -40,7 +40,7 @@ $(document).ready(function(){ $(".field.select > select, .field.custom > select").addClass("form-control"); // move the tabbar to the second nav bar - $("section ul.tabbar").first().appendTo("#topbar-second > .container > #tabmenu"); + $("section .tabbar-wrapper").first().appendTo("#topbar-second > .container > #tabmenu"); // add mask css url to the logo-img container // @@ -256,40 +256,30 @@ $(document).ready(function(){ input.val(val); }); + // Set the padding for input elements with inline buttons + // + // In Frio we use some input elements where the submit button is visually + // inside the the input field (through css). We need to set a padding-right + // to the input element where the padding value would be at least the width + // of the button. Otherwise long user input would be invisible because it is + // behind the button. + $("body").on('click', '.form-group-search > input', function() { + // Get the width of the button (if the button isn't available + // buttonWidth will be null + var buttonWidth = $(this).next('.form-button-search').outerWidth(); + + if (buttonWidth) { + // Take the width of the button and ad 5px + var newWidth = buttonWidth + 5; + // Set the padding of the input element according + // to the width of the button + $(this).css('padding-right', newWidth); + } + + }); + + }); -//function commentOpenUI(obj, id) { -// $(document).unbind( "click.commentOpen", handler ); -// -// var handler = function() { -// if(obj.value == '{{$comment}}') { -// obj.value = ''; -// $("#comment-edit-text-" + id).addClass("comment-edit-text-full").removeClass("comment-edit-text-empty"); -// // Choose an arbitrary tab index that's greater than what we're using in jot (3 of them) -// // The submit button gets tabindex + 1 -// $("#comment-edit-text-" + id).attr('tabindex','9'); -// $("#comment-edit-submit-" + id).attr('tabindex','10'); -// $("#comment-edit-submit-wrapper-" + id).show(); -// } -// }; -// -// $(document).bind( "click.commentOpen", handler ); -//} -// -//function commentCloseUI(obj, id) { -// $(document).unbind( "click.commentClose", handler ); -// -// var handler = function() { -// if(obj.value === '') { -// obj.value = '{{$comment}}'; -// $("#comment-edit-text-" + id).removeClass("comment-edit-text-full").addClass("comment-edit-text-empty"); -// $("#comment-edit-text-" + id).removeAttr('tabindex'); -// $("#comment-edit-submit-" + id).removeAttr('tabindex'); -// $("#comment-edit-submit-wrapper-" + id).hide(); -// } -// }; -// -// $(document).bind( "click.commentClose", handler ); -//} function openClose(theID) { var elem = document.getElementById(theID); diff --git a/view/theme/frio/templates/common_tabs.tpl b/view/theme/frio/templates/common_tabs.tpl index c5d1dac6b..7cfd63528 100644 --- a/view/theme/frio/templates/common_tabs.tpl +++ b/view/theme/frio/templates/common_tabs.tpl @@ -1,58 +1,60 @@ -{{* Tab navigation bar for tablets and computer *}} - - -{{* Tab navigation bar for smartphones *}} - + diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 0e5c39439..4a1f77881 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -463,7 +463,7 @@ a:hover { text-decoration: underline; } blockquote { - background: #ffffff; + background: #FFFFFF; padding: 1em; margin-left: 1em; border-left: 1em solid #e6e6e6; @@ -1210,7 +1210,7 @@ section { .wall-item-container .wall-item-actions-social a { margin-right: 3em; } -.wall-item-container .wall-item-actions-social a.active { +.wall-item-container .wall-item-actions-social a .active { font-weight: bold; } .wall-item-container .wall-item-actions-tools { @@ -1459,7 +1459,6 @@ blockquote.shared_content { } .oembed.video > a.embed_video { display: block; - float: left; position: relative; } .oembed.video > a.embed_video > div { diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index 0532bc1ed..11fff105d 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -463,7 +463,7 @@ a:hover { text-decoration: underline; } blockquote { - background: #ffffff; + background: #FFFFFF; padding: 1em; margin-left: 1em; border-left: 1em solid #e6e6e6; @@ -1210,7 +1210,7 @@ section { .wall-item-container .wall-item-actions-social a { margin-right: 3em; } -.wall-item-container .wall-item-actions-social a.active { +.wall-item-container .wall-item-actions-social a .active { font-weight: bold; } .wall-item-container .wall-item-actions-tools { @@ -1459,7 +1459,6 @@ blockquote.shared_content { } .oembed.video > a.embed_video { display: block; - float: left; position: relative; } .oembed.video > a.embed_video > div { diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index a982c6e59..81564a0d2 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -420,7 +420,7 @@ body { font-family: Liberation Sans, helvetica, arial, clean, sans-serif; font-size: 11px; - background-color: #f6ecf9; + background-color: #F6ECF9; color: #2d2d2d; margin: 50px 0 0 0; display: table; @@ -463,7 +463,7 @@ a:hover { text-decoration: underline; } blockquote { - background: #ffffff; + background: #FFFFFF; padding: 1em; margin-left: 1em; border-left: 1em solid #e6e6e6; @@ -1210,7 +1210,7 @@ section { .wall-item-container .wall-item-actions-social a { margin-right: 3em; } -.wall-item-container .wall-item-actions-social a.active { +.wall-item-container .wall-item-actions-social a .active { font-weight: bold; } .wall-item-container .wall-item-actions-tools { @@ -1459,7 +1459,6 @@ blockquote.shared_content { } .oembed.video > a.embed_video { display: block; - float: left; position: relative; } .oembed.video > a.embed_video > div { @@ -1772,7 +1771,7 @@ span[id^="showmore-wrap"] { height: 20px; width: 500px; font-weight: bold; - border: 1px solid #f6ecf9; + border: 1px solid #F6ECF9; } #jot #jot-title:-webkit-input-placeholder { font-weight: normal; @@ -1799,7 +1798,7 @@ span[id^="showmore-wrap"] { margin: 0; height: 20px; width: 200px; - border: 1px solid #f6ecf9; + border: 1px solid #F6ECF9; } #jot #jot-category:hover { border: 1px solid #999999; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 25a524043..469c075c4 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -788,12 +788,10 @@ blockquote.shared_content { border: none; } - .oembed.video { > a.embed_video { display: block; - float: left; - position: relative; + position: relative; > div { position: absolute; top: 0px; left: 0px; background: @@ -805,7 +803,6 @@ blockquote.shared_content { } } - /* threaded comments */ .children { margin-top: 1em;