BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix style conflict

Browse Source
This commit is contained in:
KDSBrowne 2018-10-25 18:23:43 +00:00
parent 188118d9ea
commit 2b61b8a2a0
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bigbluebutton-html5/imports/ui/components/poll/styles.scss
View File

@ -9,11 +9,11 @@ $poll-blue: #1A73D4;
margin-left: 9.125rem; margin-left: 9.125rem;
} }
<<<<<<< HEAD
.btn { .btn {
margin-top: var(--sm-padding-y); margin-top: var(--sm-padding-y);
margin-bottom: var(--sm-padding-y); margin-bottom: var(--sm-padding-y);
======= }
.hideBtn { .hideBtn {
position: relative; position: relative;
background-color: white; background-color: white;
@ -34,7 +34,6 @@ $poll-blue: #1A73D4;
.customBtn { .customBtn {
width: 100%; width: 100%;
>>>>>>> test-merge-anton
} }
.customInputWrapper { .customInputWrapper {
@ -42,13 +41,8 @@ $poll-blue: #1A73D4;
> input { > input {
width: 100%; width: 100%;
<<<<<<< HEAD
margin-top: .3rem; margin-top: .3rem;
margin-bottom: .3rem; margin-bottom: .3rem;
=======
margin-top: var(--sm-padding-y);
margin-bottom: var(--sm-padding-y);
>>>>>>> test-merge-anton
} }
> input:first-child { > input:first-child {