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

Updates to master

This commit is contained in:
yanas 2016-10-28 13:20:38 -05:00
parent 28f719b58a
commit 50494eb745
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
css/_variables.scss
View File

@ -38,6 +38,7 @@ $splitterToolbarButtonLeftMargin: 0px;
/* /*
* Main controls * Main controls
* TODO: looks like we don't use it
*/ */
$inputSemiBackground: rgba(132, 132, 132, .8); $inputSemiBackground: rgba(132, 132, 132, .8);
$inputLightBackground: #EBEBEB; $inputLightBackground: #EBEBEB;
@ -112,11 +113,6 @@ $defaultDarkFontColor: #000;
/** /**
* Forms * Forms
*/ */
<<<<<<< 1291023cbed3044a9f3acc2b8c7d47ff05e5aee4
$inputBg: $inputSemiBackground;
$inputBgHover: $inputSemiBackground;
$inputFontColor: $defaultDarkFontColor;
=======
//dropdown //dropdown
$selectFontColor: $defaultLightFontColor; $selectFontColor: $defaultLightFontColor;
$selectBg: $defaultBackground; $selectBg: $defaultBackground;
@ -127,8 +123,3 @@ $inputControlEmColor: #f29424;
//buttons //buttons
$linkFontColor: #489afe; $linkFontColor: #489afe;
$linkHoverFontColor: #287ade; $linkHoverFontColor: #287ade;
// Main controls TODO: looks like we don't use it
$inputSemiBackground: rgba(132, 132, 132, .8);
$inputLightBackground: #EBEBEB;
>>>>>>> dropdown styles fixes