Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/webapp/php/modules/tviplayer/views/channel/sociallinks.spv b/webapp/php/modules/tviplayer/views/channel/sociallinks.spv
- index 42d9e5c..95cd673 100644
- --- a/webapp/php/modules/tviplayer/views/channel/sociallinks.spv
- +++ b/webapp/php/modules/tviplayer/views/channel/sociallinks.spv
- @@ -1,6 +1,7 @@
- <~inherit none>
- <~defaultMinify xml>
- <div id="sociallinks">
- + <div class="divrule"></div>
- <ul>
- <?php foreach ($this->socialLinks as $link): ?>
- <li class="<?=$link->name;?>">
- diff --git a/webapp/php/modules/tviplayer/views/channel/supportlinks.spv b/webapp/php/modules/tviplayer/views/channel/supportlinks.spv
- index 71c172d..98da3bf 100644
- --- a/webapp/php/modules/tviplayer/views/channel/supportlinks.spv
- +++ b/webapp/php/modules/tviplayer/views/channel/supportlinks.spv
- @@ -1,6 +1,7 @@
- <~inherit none>
- <~defaultMinify xml>
- <div id="supportlinks" class="blq-clearfix">
- + <div class="divrule"></div>
- <ul>
- <? $first = true;
- foreach ($this->supportLinks as $link): ?>
- diff --git a/webapp/static-versioned/style/channels/sociallinks/desktop.css b/webapp/static-versioned/style/channels/sociallinks/desktop.css
- index 0a3feb1..dafc921 100644
- --- a/webapp/static-versioned/style/channels/sociallinks/desktop.css
- +++ b/webapp/static-versioned/style/channels/sociallinks/desktop.css
- @@ -7,6 +7,16 @@
- * @author Stephen Bardwell <stephen.bardwell@bbc.co.uk>
- */
- +.bbcthree #sociallinks .divrule {
- + border-top: 0;
- +}
- +.bbcthree #sociallinks ul {
- + margin: 6px 0;
- +}
- +.bbcthree #sociallinks .youtube a {
- + margin-right: 0;
- +}
- +
- #sociallinks {
- max-width: 976px;
- margin: 0 auto;
- @@ -16,10 +26,7 @@
- }
- #sociallinks ul {
- - margin: 24px -8px 0 0;
- -}
- -.ie7 #sociallinks ul {
- - margin: 24px -8px 0 0;
- + margin: 6px -8px 0 0;
- }
- #sociallinks li {
- diff --git a/webapp/static-versioned/style/channels/sociallinks/large_tablet_portrait.css b/webapp/static-versioned/style/channels/sociallinks/large_tablet_portrait.css
- index abccc68..9ba6fb4 100644
- --- a/webapp/static-versioned/style/channels/sociallinks/large_tablet_portrait.css
- +++ b/webapp/static-versioned/style/channels/sociallinks/large_tablet_portrait.css
- @@ -7,6 +7,15 @@
- * @author Stephen Bardwell <stephen.bardwell@bbc.co.uk>
- */
- +.bbcthree #sociallinks .divrule {
- + border-top: 1px solid rgba(255, 255, 255, 0.2);
- + margin-left: 24px;
- + margin-right: 24px;
- +}
- +.bbcthree #sociallinks ul {
- + margin: 16px 0 8px 24px;
- +}
- +
- #sociallinks ul {
- margin: 16px 8px 0 24px;
- }
- @@ -19,3 +28,6 @@
- #sociallinks a {
- margin-right: 16px;
- }
- \ No newline at end of file
- +#sociallinks .youtube a {
- + margin-right: 24px;
- +}
- \ No newline at end of file
- diff --git a/webapp/static-versioned/style/channels/sociallinks/mobile_landscape.css b/webapp/static-versioned/style/channels/sociallinks/mobile_landscape.css
- index 270400d..be988be 100644
- --- a/webapp/static-versioned/style/channels/sociallinks/mobile_landscape.css
- +++ b/webapp/static-versioned/style/channels/sociallinks/mobile_landscape.css
- @@ -7,6 +7,10 @@
- * @author Stephen Bardwell <stephen.bardwell@bbc.co.uk>
- */
- +.bbcthree #sociallinks ul {
- + margin: 8px 0 0 8px;
- +}
- +
- #sociallinks a {
- height: 84px;
- }
- \ No newline at end of file
- diff --git a/webapp/static-versioned/style/channels/sociallinks/mobile_portrait.css b/webapp/static-versioned/style/channels/sociallinks/mobile_portrait.css
- index 1ff32ec..5a80c4a 100644
- --- a/webapp/static-versioned/style/channels/sociallinks/mobile_portrait.css
- +++ b/webapp/static-versioned/style/channels/sociallinks/mobile_portrait.css
- @@ -8,6 +8,16 @@
- */
- /* @group Branding */
- +.bbcthree #sociallinks .divrule {
- + border-top: 1px solid rgba(255, 255, 255, 0.2);
- + margin-left: 8px;
- + margin-right: 8px;
- +}
- +
- +.bbcthree #sociallinks ul {
- + margin: 16px 0 8px 8px;
- +}
- +
- .bbcone #sociallinks a {
- background-color: $bbcOneColour2;
- color: $bbcOneColour4;
- diff --git a/webapp/static-versioned/style/channels/sociallinks/small_tablet_landscape.css b/webapp/static-versioned/style/channels/sociallinks/small_tablet_landscape.css
- index 11e37a6..d818b41 100644
- --- a/webapp/static-versioned/style/channels/sociallinks/small_tablet_landscape.css
- +++ b/webapp/static-versioned/style/channels/sociallinks/small_tablet_landscape.css
- @@ -7,6 +7,13 @@
- * @author Stephen Bardwell <stephen.bardwell@bbc.co.uk>
- */
- +.bbcthree #sociallinks .divrule {
- + border-top-width: 0;
- +}
- +
- +.bbcthree #sociallinks ul {
- + margin: 2px 16px 0 24px;
- +}
- #sociallinks ul {
- margin: 24px 16px 0 24px;
- }
- diff --git a/webapp/static-versioned/style/channels/sociallinks/small_tablet_portrait.css b/webapp/static-versioned/style/channels/sociallinks/small_tablet_portrait.css
- index 05bca16..2cfbe1a 100644
- --- a/webapp/static-versioned/style/channels/sociallinks/small_tablet_portrait.css
- +++ b/webapp/static-versioned/style/channels/sociallinks/small_tablet_portrait.css
- @@ -7,6 +7,15 @@
- * @author Stephen Bardwell <stephen.bardwell@bbc.co.uk>
- */
- +.bbcthree #sociallinks .divrule {
- + border-top: 1px solid rgba(255, 255, 255, 0.2);
- + margin-left: 24px;
- + margin-right: 24px;
- +}
- +.bbcthree #sociallinks ul {
- + margin: 12px 0 2px 24px;
- +}
- +
- #sociallinks ul {
- margin: 12px 0 0 24px;
- }
- diff --git a/webapp/static-versioned/style/channels/supportlinks/desktop.css b/webapp/static-versioned/style/channels/supportlinks/desktop.css
- index 6430b62..156502b 100644
- --- a/webapp/static-versioned/style/channels/supportlinks/desktop.css
- +++ b/webapp/static-versioned/style/channels/supportlinks/desktop.css
- @@ -7,8 +7,24 @@
- * @author Stephen Bardwell <stephen.bardwell@bbc.co.uk>
- */
- +.bbcone #supportlinks {
- + border-top: 0;
- +}
- +.bbctwo #supportlinks {
- + border-top: 0;
- +}
- +.bbcthree #supportlinks .divrule {
- + border-top: 0;
- + margin-bottom: 0;
- +}
- +.bbcfour #supportlinks {
- + border-top: 0;
- +}
- +
- #supportlinks {
- position: relative;
- + margin-left: 0;
- + margin-right: 0;
- padding-bottom: 0;
- }
- .ie7 #supportlinks {
- @@ -22,9 +38,12 @@
- margin-right: 0;
- }
- +.bbcthree #supportlinks li {
- + margin-top: 37px;
- +}
- #supportlinks li {
- - display:block;
- - margin-top: 44px;
- + margin-top: 48px;
- + /*display:block;*/
- width: auto;
- vertical-align: top;
- background-image:url(../img/icons/supportlinks/support_icons_13.png);
- diff --git a/webapp/static-versioned/style/channels/supportlinks/large_tablet_portrait.css b/webapp/static-versioned/style/channels/supportlinks/large_tablet_portrait.css
- index 27ce8e5..ce3ccc1 100644
- --- a/webapp/static-versioned/style/channels/supportlinks/large_tablet_portrait.css
- +++ b/webapp/static-versioned/style/channels/supportlinks/large_tablet_portrait.css
- @@ -7,8 +7,31 @@
- * @author Stephen Bardwell <stephen.bardwell@bbc.co.uk>
- */
- +.bbcone #supportlinks {
- + border-top: 0;
- +}
- +.bbctwo #supportlinks {
- + border-top: 0;
- +}
- +.bbcthree #supportlinks {
- + padding-top: 22px;
- +}
- +.bbcthree #supportlinks .divrule {
- + border-top: 0;
- + margin-bottom: 0;
- +}
- +.bbcthree #supportlinks ul {
- + padding-top: 0;
- +}
- +.bbcfour #supportlinks {
- + border-top: 0;
- +}
- +
- #supportlinks {
- position: relative;
- + margin-left: 0;
- + margin-right: 0;
- + padding-top: 0;
- padding-bottom: 0;
- }
- .ie7 #supportlinks {
- @@ -18,19 +41,23 @@
- #supportlinks ul {
- float: right;
- + padding-top: 22px;
- margin-left: 24px;
- margin-right: 24px;
- }
- +.bbcthree #supportlinks li {
- + margin-top: 24px;
- + }
- +
- #supportlinks li {
- - display:block;
- - margin-top: 56px;
- + margin-top: 20px;
- width: auto;
- background-image:url(../img/icons/supportlinks/support_icons_13.png);
- background-repeat: no-repeat;
- }
- .ie7 #supportlinks li {
- - margin-top: 48px;
- + margin-top: 24px;
- }
- #supportlinks li.first {
- diff --git a/webapp/static-versioned/style/channels/supportlinks/mobile_landscape.css b/webapp/static-versioned/style/channels/supportlinks/mobile_landscape.css
- index 49e4ed5..07ec20b 100644
- --- a/webapp/static-versioned/style/channels/supportlinks/mobile_landscape.css
- +++ b/webapp/static-versioned/style/channels/supportlinks/mobile_landscape.css
- @@ -6,3 +6,26 @@
- * @project TV & iPlayer (Channels)
- * @author Luke Sands <luke.sands@bbc.co.uk>
- */
- +
- +.bbcfour #supportlinks li {
- + width: 50%;
- +}
- +#supportlinks li {
- + width: 33.3%;
- +}
- +
- +#supportlinks li.programmesaz a {
- + padding-right: 8px;
- +}
- +
- +#supportlinks li.showsandtours a, #supportlinks li.helpandcontact a {
- + padding-left: 8px;
- + padding-right: 8px;
- +}
- +.bbcfour #supportlinks li.showsandtours a {
- + padding-left: 0;
- +}
- +.bbcfour #supportlinks li.helpandcontact a {
- + padding-left: 0;
- + padding-right: 0;
- +}
- \ No newline at end of file
- diff --git a/webapp/static-versioned/style/channels/supportlinks/mobile_portrait.css b/webapp/static-versioned/style/channels/supportlinks/mobile_portrait.css
- index dc99176..84de992 100644
- --- a/webapp/static-versioned/style/channels/supportlinks/mobile_portrait.css
- +++ b/webapp/static-versioned/style/channels/supportlinks/mobile_portrait.css
- @@ -7,11 +7,30 @@
- * @author Stephen Bardwell <stephen.bardwell@bbc.co.uk>
- */
- -#supportlinks {
- +.bbcone #supportlinks {
- + border-top: 1px solid rgba(255, 255, 255, 0.2);
- +}
- +.bbctwo #supportlinks {
- + border-top: 1px solid #0C6764;
- +}
- +.bbcthree #supportlinks {
- padding-top: 0;
- - padding-bottom: 6px;
- +}
- +.bbcthree #supportlinks .divrule {
- + border-top: 1px solid rgba(255, 255, 255, 0.2);
- + margin-bottom: 6px;
- +}
- +.bbcfour #supportlinks {
- + border-top: 1px solid #666;
- +}
- +
- +#supportlinks {
- + padding-top: 6px;
- + padding-bottom: 4px;
- font-size: 1em;
- line-height: 1em;
- + margin-left: 8px;
- + margin-right: 8px;
- }
- .ie7 #supportlinks {
- padding-top: 8px;
- @@ -20,8 +39,6 @@
- #supportlinks ul {
- display: block;
- - margin-left: 8px;
- - margin-right: 8px;
- }
- #supportlinks li {
- @@ -30,21 +47,18 @@
- width: 50%;
- margin-top: 14px;
- margin-bottom: 16px;
- - padding-left: 20px;
- - margin-right:8px;
- background-repeat:no-repeat;
- background-color:transparent;
- }
- -
- -#supportlinks li.newsletter {
- - padding-left:13px;
- -}
- -
- .ie7 #supportlinks li {
- padding-bottom: 16px;
- margin-bottom: 2px;
- }
- +/*#supportlinks li.newsletter {
- + padding-left:13px;
- +}*/
- +
- #supportlinks li a {
- color: #fff;
- }
- diff --git a/webapp/static-versioned/style/channels/supportlinks/small_tablet_landscape.css b/webapp/static-versioned/style/channels/supportlinks/small_tablet_landscape.css
- index 076df10..add23fd 100644
- --- a/webapp/static-versioned/style/channels/supportlinks/small_tablet_landscape.css
- +++ b/webapp/static-versioned/style/channels/supportlinks/small_tablet_landscape.css
- @@ -7,6 +7,23 @@
- * @author Stephen Bardwell <stephen.bardwell@bbc.co.uk>
- */
- +.bbcone #supportlinks {
- + border-top: 0;
- +}
- +.bbctwo #supportlinks {
- + border-top: 0;
- +}
- +.bbcthree #supportlinks {
- + padding-top: 34px;
- +}
- +.bbcthree #supportlinks .divrule {
- + border-top: 0;
- + margin-bottom: 0;
- +}
- +.bbcfour #supportlinks {
- + border-top: 0;
- +}
- +
- #supportlinks {
- position: relative;
- padding-bottom: 0;
- @@ -23,8 +40,12 @@
- margin-right: 24px;
- }
- +.bbcthree #supportlinks li {
- + margin-top: 8px;
- +}
- +
- #supportlinks li {
- - margin-top: 56px;
- + margin-top: 44px;
- width: auto;
- display:block;
- background-image:url(../img/icons/supportlinks/support_icons_13.png);
- diff --git a/webapp/static-versioned/style/channels/supportlinks/small_tablet_portrait.css b/webapp/static-versioned/style/channels/supportlinks/small_tablet_portrait.css
- index 7c3371a..1d900c2 100644
- --- a/webapp/static-versioned/style/channels/supportlinks/small_tablet_portrait.css
- +++ b/webapp/static-versioned/style/channels/supportlinks/small_tablet_portrait.css
- @@ -7,8 +7,29 @@
- * @author Stephen Bardwell <stephen.bardwell@bbc.co.uk>
- */
- +.bbcone #supportlinks {
- + border-top: 0;
- +}
- +.bbctwo #supportlinks {
- + border-top: 0;
- +}
- +.bbcthree #supportlinks .divrule {
- + border-top: 0;
- + margin-bottom: 0;
- +}
- +.bbcthree #supportlinks li {
- + margin-top: 8px;
- + padding-top: 0;
- +}
- +.bbcfour #supportlinks {
- + border-top: 0;
- +}
- +
- #supportlinks {
- position: relative;
- + padding-top: 14px;
- + margin-left: 24px;
- + margin-right: 24px;
- }
- .ie7 #supportlinks {
- padding-bottom: 0;
- @@ -18,12 +39,12 @@
- #supportlinks ul {
- float: right;
- - margin-left: 24px;
- - margin-right: 24px;
- + margin-left: 0;
- + margin-right: 0;
- }
- #supportlinks li {
- - margin-top: 10px;
- + margin-top: 12px;
- width: auto;
- display:block;
- background-image:url(../img/icons/supportlinks/support_icons_13.png);
- @@ -32,7 +53,7 @@
- #supportlinks li.first {
- position: absolute;
- - left: 24px;
- + left: 0;
- }
- #supportlinks li.programmesaz {
- diff --git a/webapp/static-versioned/style/channels/upcoming/desktop.css b/webapp/static-versioned/style/channels/upcoming/desktop.css
- index 4bc673a..db0a122 100644
- --- a/webapp/static-versioned/style/channels/upcoming/desktop.css
- +++ b/webapp/static-versioned/style/channels/upcoming/desktop.css
- @@ -9,7 +9,7 @@
- #upcoming {
- border-bottom: none;
- - padding: 32px 0 12px;
- + padding: 32px 0 4px;
- }
- #upcoming .component-heading {
- @@ -102,5 +102,5 @@
- #upcoming li .info strong {
- font-size: 1em;
- - margin-top: 4px;
- + margin-top: 2px;
- }
- diff --git a/webapp/static-versioned/style/channels/upcoming/large_tablet_portrait.css b/webapp/static-versioned/style/channels/upcoming/large_tablet_portrait.css
- index 7b6e22d..cf4b90d 100644
- --- a/webapp/static-versioned/style/channels/upcoming/large_tablet_portrait.css
- +++ b/webapp/static-versioned/style/channels/upcoming/large_tablet_portrait.css
- @@ -9,7 +9,7 @@
- #upcoming {
- border-bottom: none;
- - padding: 30px 0 8px;
- + padding: 30px 0 10px;
- height: 100%;
- }
- @@ -53,7 +53,7 @@
- }
- #upcoming ul {
- - margin: 0 22px;
- + margin: 8px 22px 0;
- }
- #upcoming li {
- diff --git a/webapp/static-versioned/style/channels/upcoming/mobile_portrait.css b/webapp/static-versioned/style/channels/upcoming/mobile_portrait.css
- index 8666bed..12da4e6 100644
- --- a/webapp/static-versioned/style/channels/upcoming/mobile_portrait.css
- +++ b/webapp/static-versioned/style/channels/upcoming/mobile_portrait.css
- @@ -9,8 +9,7 @@
- #upcoming {
- clear: both;
- - padding: 16px 0 0;
- - border-bottom: 1px solid #fff;
- + padding: 16px 0 8px;
- height: 100%;
- }
- diff --git a/webapp/static-versioned/style/channels/upcoming/small_tablet_portrait.css b/webapp/static-versioned/style/channels/upcoming/small_tablet_portrait.css
- index 93e1dcb..f4af148 100644
- --- a/webapp/static-versioned/style/channels/upcoming/small_tablet_portrait.css
- +++ b/webapp/static-versioned/style/channels/upcoming/small_tablet_portrait.css
- @@ -9,7 +9,7 @@
- #upcoming {
- border-bottom: none;
- - padding-bottom: 24px;
- + padding-bottom: 26px;
- }
- #upcoming .component-heading{
- @@ -52,7 +52,7 @@
- }
- #upcoming ul {
- - margin: 0 18px;
- + margin: 8px 18px 0;
- }
- #upcoming li {
Add Comment
Please, Sign In to add comment