From b7fccf50409693d98e71d46ccaaf1244f12e99b4 Mon Sep 17 00:00:00 2001 From: Ilya Daynatovich Date: Thu, 13 Oct 2016 16:15:20 +0300 Subject: [PATCH] Update styles for popover --- css/_base.scss | 1 + css/_variables.scss | 7 ++++++- css/_videolayout_default.scss | 9 +++++++-- css/themes/_light.scss | 8 +++++++- lang/main.json | 1 + modules/UI/UI.js | 1 + 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/css/_base.scss b/css/_base.scss index 5799760db0..11c097596b 100644 --- a/css/_base.scss +++ b/css/_base.scss @@ -184,6 +184,7 @@ form { } .link { + cursor: pointer; color: $linkFontColor; @include transition(color .1s ease-out); diff --git a/css/_variables.scss b/css/_variables.scss index f3b6a37513..a25b797742 100644 --- a/css/_variables.scss +++ b/css/_variables.scss @@ -1,3 +1,8 @@ +/** +* Theme +*/ +@import 'themes/main'; + /** * Style variables */ @@ -28,10 +33,10 @@ $tooltipBg: rgba(0,0,0, 0.7); // Toolbar $toolbarSelectBackground: rgba(0, 0, 0, .6); + $toolbarBadgeBackground: #165ECC; $toolbarBadgeColor: #FFFFFF; $toolbarToggleBackground: #12499C; -$splitterToolbarButtonLeftMargin: 0px; // Main controls $inputSemiBackground: rgba(132, 132, 132, .8); diff --git a/css/_videolayout_default.scss b/css/_videolayout_default.scss index 9d599df6c3..cb6f6c69c0 100644 --- a/css/_videolayout_default.scss +++ b/css/_videolayout_default.scss @@ -275,8 +275,13 @@ .connection_info, .connection_info > table { text-align: left; - font-size: 11px; - color: #ffffff; + font-size: 12px; + font-weight: 400; + color: $auiDialogColor; + + td { + padding: 5px 0; + } } #localVideoContainer>span.status:hover, diff --git a/css/themes/_light.scss b/css/themes/_light.scss index 672018acaf..698fa738d1 100644 --- a/css/themes/_light.scss +++ b/css/themes/_light.scss @@ -43,4 +43,10 @@ $labelFontWeight: 400; $hintFontSize: em(13, 14); $linkFontColor: #3572b0; $linkHoverFontColor: darken(#3572b0, 10%); -$dropdownColor: #333; \ No newline at end of file +$dropdownColor: #333; + +// Popover colors +$popoverArrowBorderColor: rgba(0, 0, 0, 0.25); +$popoverArrowBorderColorFallback: #999999; +$popoverBorderColor: rgba(0, 0, 0, 0.2); +$popoverBorderColorFallback: #cccccc; \ No newline at end of file diff --git a/lang/main.json b/lang/main.json index ec374f8e8d..c3c67a07a6 100644 --- a/lang/main.json +++ b/lang/main.json @@ -151,6 +151,7 @@ }, "connectionindicator": { + "header": "Connection data", "bitrate": "Bitrate:", "packetloss": "Packet loss:", "resolution": "Resolution:", diff --git a/modules/UI/UI.js b/modules/UI/UI.js index 6a62d5042b..e9ef917ab1 100644 --- a/modules/UI/UI.js +++ b/modules/UI/UI.js @@ -758,6 +758,7 @@ UI.getRemoteVideoType = function (jid) { UI.connectionIndicatorShowMore = function(id) { VideoLayout.showMore(id); + return false; }; // FIXME check if someone user this