haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1143 from BeatC/visual-problems 

Fix some ui bugs
This commit is contained in:
yanas 2016-11-16 11:23:29 -06:00 committed by GitHub
parent a5f243e18d e2ea16ea3f
commit 693ebbea9d
7 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/_inlay.scss
View File

@ -3,7 +3,7 @@
@include border-radius(3px); @include border-radius(3px);
padding: 40px 38px 44px; padding: 40px 38px 44px;
color: #fff; color: #fff;
background: lighten(desaturate($defaultBackground, 70%), 20%); background: $inlayColorBg;
text-align: center; text-align: center;
&__title { &__title {
@ -12,7 +12,7 @@
color: $popoverFontColor; color: $popoverFontColor;
font-size: 21px; font-size: 21px;
letter-spacing: 0.3px; letter-spacing: 0.3px;
border-bottom: 1px solid $auiBorderColor; border-bottom: 1px solid $inlayBorderColor;
} }
&__text { &__text {

4
css/_jitsi_popover.scss
View File

@ -14,13 +14,13 @@
/*-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);*/ /*-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);*/
/*box-shadow: 0 5px 10px rgba(0, 0, 0, 0.4);*/ /*box-shadow: 0 5px 10px rgba(0, 0, 0, 0.4);*/
white-space: normal; white-space: normal;
margin-top: -10px; margin-top: -13px;
&__menu-padding { &__menu-padding {
height: 10px; height: 10px;
width: 100px; width: 100px;
position: absolute; position: absolute;
bottom: -10px; bottom: -13px;
} }
&__showmore { &__showmore {

4
css/_side_toolbar_container.scss
View File

@ -60,6 +60,10 @@
box-sizing: border-box; box-sizing: border-box;
color: #FFF; color: #FFF;
.input-control {
border: 0;
}
/** /**
* Titles and subtitles of inner containers. * Titles and subtitles of inner containers.
*/ */

1
css/_variables.scss
View File

@ -77,7 +77,6 @@ $rateStarLabelColor: #333;
$rateStarDefault: #ccc; $rateStarDefault: #ccc;
$rateStarActivity: #165ecc; $rateStarActivity: #165ecc;
$rateStarSize: 34px; $rateStarSize: 34px;
$feedbackCancelFontColor: #333;
/** /**
* Notifications * Notifications

2
css/modals/_dialog.scss
View File

@ -2,7 +2,7 @@
visibility: visible; visibility: visible;
height: auto; height: auto;
h3 { h1, h2, h3, h4, h5, h6 {
color: $auiDialogColor; color: $auiDialogColor;
} }

24
css/modals/feedback/_feedback.scss
View File

@ -62,20 +62,18 @@
text-align: center; text-align: center;
padding: 10px 40px 20px 40px; padding: 10px 40px 20px 40px;
.form-control{ .input-control {
&__input { background-color: $feedbackInputBg;
background-color: $feedbackInputBg; color: $feedbackInputTextColor;
color: $feedbackInputTextColor;
&::-webkit-input-placeholder { &::-webkit-input-placeholder {
color: $feedbackInputPlaceholderColor; color: $feedbackInputPlaceholderColor;
} }
&::-moz-placeholder { /* Firefox 19+ */ &::-moz-placeholder { /* Firefox 19+ */
color: $feedbackInputPlaceholderColor; color: $feedbackInputPlaceholderColor;
} }
&:-ms-input-placeholder { &:-ms-input-placeholder {
color: $feedbackInputPlaceholderColor; color: $feedbackInputPlaceholderColor;
}
} }
} }

9
css/themes/_light.scss
View File

@ -53,6 +53,12 @@ $auiDialogContentBg: $baseLight;
$auiBorderColor: #ccc; $auiBorderColor: #ccc;
$dialogTitleFontWeight: 400; $dialogTitleFontWeight: 400;
/**
* Inlay colors
**/
$inlayColorBg: lighten($defaultBackground, 20%);
$inlayBorderColor: lighten($auiDialogContentBg, 10%);
// Main controls // Main controls
$inputBackground: $controlBackground; $inputBackground: $controlBackground;
$inputBorderColor: #ccc; $inputBorderColor: #ccc;
@ -68,6 +74,9 @@ $linkHoverFontColor: darken(#3572b0, 10%);
$dropdownColor: #333; $dropdownColor: #333;
$errorColor: #c61600; $errorColor: #c61600;
// Feedback colors
$feedbackCancelFontColor: #333;
// Popover colors // Popover colors
$popoverBg: #000; $popoverBg: #000;
$popoverFontColor: #ffffff; $popoverFontColor: #ffffff;