developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove non resolved conflict

This commit is contained in:
chris 2013-06-07 13:02:47 +08:00
parent ddd9a9668e
commit 0904978292
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/stylesheets/questionnaire.css
View File

@ -127,12 +127,9 @@
.o-question-group.view-grid tbody .odd .o-question-title, .o-question-group.view-grid tbody .odd td { .o-question-group.view-grid tbody .odd .o-question-title, .o-question-group.view-grid tbody .odd td {
background-color: #f6f6f6; background-color: #f6f6f6;
} }
<<<<<<< HEAD
=======
.o-question-group.view-grid .o-question-title { .o-question-group.view-grid .o-question-title {
font-size: 1em; font-size: 1em;
} }
>>>>>>> 19effe9... survey module: update css
.o-question-group.view-grid tbody .odd .o-question-title { .o-question-group.view-grid tbody .odd .o-question-title {
background-color: transparent; background-color: transparent;
} }