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

Fix button maker

Browse Source
This commit is contained in:
perroned 2015-05-12 12:47:58 -07:00
parent 617e34cd62
commit f26fdb8c41
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bigbluebutton-html5/app/client/views/sharedTemplates.html
View File

@ -2,17 +2,10 @@
<button type="submit" id="{{id}}" class="btn {{btn_class}}" {{isDisabled}} rel="{{rel}}" data-placement="{{data_placement}}" title="{{title}}" style="{{style}}">
{{#if text}}
<span>{{text}}</span>
{{/if}}
{{#if i_class}}
<i class="{{i_class}}" style="font-size:30px"></i>
{{else}}
{{#if i_class}}
<i class="{{i_class}}" style="font-size:30px"></i><span>{{label}}</span>
{{/if}}
{{/if}}
</button>
<<<<<<< HEAD
=======
{{else}} -->
<button type="submit" id="{{id}}" class="btn {{btn_class}}" {{isDisabled}} rel="{{rel}}" data-placement="{{data_placement}}" title="{{title}}">
<i class="{{i_class}}" style="font-size:30px"></i><span>{{label}}</span>
</button>
<!-- {{/if}} -->
>>>>>>> maxim/meteor-client-new-ui
</template>