Various bootstrap fixes

achan · achan · commit d4b62cf90b84 · 2016-10-03T18:08:40.000-04:00
- Remove markdown-textarea
 - Use new icons
diff --git a/app/templates/components/announcement-editor.hbs b/app/templates/components/announcement-editor.hbs
@@ -11,12 +11,13 @@
     class="description"
     value=announcement.description}}
 
-  <div class="handle">
+  <div>
     <button {{action (action this.attrs.removeannouncement announcement)}}
       class="btn btn-danger remove-announcement"
       data-auto-id="remove">
       Remove
     </button>
+    <i class="icon-menu handle"></i>
   </div>
 </div>
 
diff --git a/app/templates/components/announcements-editor.hbs b/app/templates/components/announcements-editor.hbs
@@ -1,6 +1,6 @@
 <div data-auto-id="announcements-editor">
   <button {{action (action this.attrs.append)}}
-    class="btn btn-default append-announcement"
+    class="btn btn-secondary append-announcement"
     data-auto-id="append-announcement">
     Add Announcement
   </button>
diff --git a/app/templates/components/bulletin-editor.hbs b/app/templates/components/bulletin-editor.hbs
@@ -38,23 +38,23 @@
       <div class="row">
         <div class="form-group col-lg-12" data-test-id="service-order">
           <label for="serviceOrder">Order</label>
-          {{markdown-textarea value=bulletin.serviceOrder
-                              class="form-control service-order"
-                              data-auto-id="bulletin-service-order"
-                              rows="10"}}
+          {{textarea value=bulletin.serviceOrder
+                     class="form-control service-order"
+                     data-auto-id="bulletin-service-order"
+                     rows="10"}}
         </div>
       </div>
-      <div class="panel panel-default">
-        <fieldset>
-          <div class="panel-heading">
-            <h3 class="panel-title">Sermon</h3>
+      <div class="card">
+        <h3 class="card-header">Sermon</h3>
+        <div class="card-block">
+          <div class="card-text">
+            <fieldset>
+                {{sermon-editor sermon=bulletin.sermon
+                    diduploadaudio=(action this.attrs.diduploadaudio)
+                    clearaudio=(action this.attrs.clearaudio)}}
+            </fieldset>
           </div>
-          <div class="panel-body">
-            {{sermon-editor sermon=bulletin.sermon
-                diduploadaudio=(action this.attrs.diduploadaudio)
-                clearaudio=(action this.attrs.clearaudio)}}
-          </div>
-        </fieldset>
+        </div>
       </div>
     </section>
     {{#if this.attrs.appendannouncement}}
diff --git a/app/templates/components/file-preview.hbs b/app/templates/components/file-preview.hbs
@@ -1,5 +1,3 @@
 <a href="{{fileUrl}}" data-auto-id="preview">{{url}}</a>
-<span class="glyphicon glyphicon-remove remove"
-    data-auto-id="remove"
-    {{action (action this.attrs.clearfile)}}></span>
+<i class="icon-cancel" data-auto-id="remove" {{action (action this.attrs.clearfile)}}></i>
 {{yield}}
diff --git a/app/templates/components/image-preview.hbs b/app/templates/components/image-preview.hbs
@@ -2,10 +2,6 @@
   <div class="preview"
       data-auto-id="canvas"
       style="background-image: url('{{url}}')"></div>
-  <div class="remove"
-      data-auto-id="remove"
-      {{action (action this.attrs.clearimage)}}>
-    <span class="glyphicon glyphicon-remove"></span>
-  </div>
+  <i class="icon-cancel" data-auto-id="remove" {{action (action this.attrs.clearimage)}}></i>
 </div>
 {{yield}}
diff --git a/app/templates/components/sermon-editor.hbs b/app/templates/components/sermon-editor.hbs
@@ -30,8 +30,8 @@
   </div>
   <div class="form-group">
     <label for="sermonNotes">Notes</label>
-    {{markdown-textarea value=sermon.notes
-        class="form-conrol sermon-notes"
+    {{textarea value=sermon.notes
+        class="form-control sermon-notes"
         data-auto-id="notes"
         rows="10"}}
   </div>
diff --git a/vendor/fontello/LICENSE.txt b/vendor/fontello/LICENSE.txt
@@ -3,7 +3,7 @@ Font license info
 
 ## Font Awesome
 
-   Copyright (C) 2012 by Dave Gandy
+   Copyright (C) 2016 by Dave Gandy
 
    Author:    Dave Gandy
    License:   SIL ()
diff --git a/vendor/fontello/config.json b/vendor/fontello/config.json
@@ -37,6 +37,18 @@
       "search": [
         "cma"
       ]
+    },
+    {
+      "uid": "5211af474d3a9848f67f945e2ccaf143",
+      "css": "cancel",
+      "code": 59396,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "559647a6f430b3aeadbecd67194451dd",
+      "css": "menu",
+      "code": 61641,
+      "src": "fontawesome"
     }
   ]
 }
diff --git a/vendor/fontello/css/fontello-codes.css b/vendor/fontello/css/fontello-codes.css
@@ -2,4 +2,6 @@
 .icon-cma:before { content: '\e800'; } /* '' */
 .icon-angle-left:before { content: '\e801'; } /* '' */
 .icon-angle-right:before { content: '\e802'; } /* '' */
-.icon-link:before { content: '\e803'; } /* '' */
+.icon-link:before { content: '\e803'; } /* '' */
+.icon-cancel:before { content: '\e804'; } /* '' */
+.icon-menu:before { content: '\f0c9'; } /* '' */
diff --git a/vendor/fontello/css/fontello-embedded.css b/vendor/fontello/css/fontello-embedded.css
diff --git a/vendor/fontello/css/fontello-ie7-codes.css b/vendor/fontello/css/fontello-ie7-codes.css
@@ -2,4 +2,6 @@
 .icon-cma { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe800;&nbsp;'); }
 .icon-angle-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe801;&nbsp;'); }
 .icon-angle-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe802;&nbsp;'); }
-.icon-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe803;&nbsp;'); }
+.icon-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe803;&nbsp;'); }
+.icon-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe804;&nbsp;'); }
+.icon-menu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c9;&nbsp;'); }
diff --git a/vendor/fontello/css/fontello-ie7.css b/vendor/fontello/css/fontello-ie7.css
@@ -13,4 +13,6 @@
 .icon-cma { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe800;&nbsp;'); }
 .icon-angle-left { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe801;&nbsp;'); }
 .icon-angle-right { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe802;&nbsp;'); }
-.icon-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe803;&nbsp;'); }
+.icon-link { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe803;&nbsp;'); }
+.icon-cancel { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xe804;&nbsp;'); }
+.icon-menu { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c9;&nbsp;'); }
diff --git a/vendor/fontello/css/fontello.css b/vendor/fontello/css/fontello.css
@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'fontello';
-  src: url('../font/fontello.eot?937904');
-  src: url('../font/fontello.eot?937904#iefix') format('embedded-opentype'),
-       url('../font/fontello.woff2?937904') format('woff2'),
-       url('../font/fontello.woff?937904') format('woff'),
-       url('../font/fontello.ttf?937904') format('truetype'),
-       url('../font/fontello.svg?937904#fontello') format('svg');
+  src: url('../font/fontello.eot?36431457');
+  src: url('../font/fontello.eot?36431457#iefix') format('embedded-opentype'),
+       url('../font/fontello.woff2?36431457') format('woff2'),
+       url('../font/fontello.woff?36431457') format('woff'),
+       url('../font/fontello.ttf?36431457') format('truetype'),
+       url('../font/fontello.svg?36431457#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -15,7 +15,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('../font/fontello.svg?937904#fontello') format('svg');
+    src: url('../font/fontello.svg?36431457#fontello') format('svg');
   }
 }
 */
@@ -58,4 +58,6 @@
 .icon-cma:before { content: '\e800'; } /* '' */
 .icon-angle-left:before { content: '\e801'; } /* '' */
 .icon-angle-right:before { content: '\e802'; } /* '' */
-.icon-link:before { content: '\e803'; } /* '' */
+.icon-link:before { content: '\e803'; } /* '' */
+.icon-cancel:before { content: '\e804'; } /* '' */
+.icon-menu:before { content: '\f0c9'; } /* '' */
diff --git a/vendor/fontello/demo.html b/vendor/fontello/demo.html
@@ -229,11 +229,11 @@
 }
 @font-face {
       font-family: 'fontello';
-      src: url('./font/fontello.eot?59728867');
-      src: url('./font/fontello.eot?59728867#iefix') format('embedded-opentype'),
-           url('./font/fontello.woff?59728867') format('woff'),
-           url('./font/fontello.ttf?59728867') format('truetype'),
-           url('./font/fontello.svg?59728867#fontello') format('svg');
+      src: url('./font/fontello.eot?23506542');
+      src: url('./font/fontello.eot?23506542#iefix') format('embedded-opentype'),
+           url('./font/fontello.woff?23506542') format('woff'),
+           url('./font/fontello.ttf?23506542') format('truetype'),
+           url('./font/fontello.svg?23506542#fontello') format('svg');
       font-weight: normal;
       font-style: normal;
     }
@@ -306,6 +306,10 @@ <h1>
         <div title="Code: 0xe802" class="the-icons span3"><i class="demo-icon icon-angle-right">&#xe802;</i> <span class="i-name">icon-angle-right</span><span class="i-code">0xe802</span></div>
         <div title="Code: 0xe803" class="the-icons span3"><i class="demo-icon icon-link">&#xe803;</i> <span class="i-name">icon-link</span><span class="i-code">0xe803</span></div>
       </div>
+      <div class="row">
+        <div title="Code: 0xe804" class="the-icons span3"><i class="demo-icon icon-cancel">&#xe804;</i> <span class="i-name">icon-cancel</span><span class="i-code">0xe804</span></div>
+        <div title="Code: 0xf0c9" class="the-icons span3"><i class="demo-icon icon-menu">&#xf0c9;</i> <span class="i-name">icon-menu</span><span class="i-code">0xf0c9</span></div>
+      </div>
     </div>
     <div class="container footer">Generated by <a href="http://fontello.com">fontello.com</a></div>
   </body>
diff --git a/vendor/fontello/font/fontello.eot b/vendor/fontello/font/fontello.eot
diff --git a/vendor/fontello/font/fontello.svg b/vendor/fontello/font/fontello.svg
diff --git a/vendor/fontello/font/fontello.ttf b/vendor/fontello/font/fontello.ttf
diff --git a/vendor/fontello/font/fontello.woff b/vendor/fontello/font/fontello.woff
diff --git a/vendor/fontello/font/fontello.woff2 b/vendor/fontello/font/fontello.woff2

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,18 @@`
`37`	`37`	`"search": [`
`38`	`38`	`"cma"`
`39`	`39`	`]`
	`40`	`+ },`
	`41`	`+ {`
	`42`	`+ "uid": "5211af474d3a9848f67f945e2ccaf143",`
	`43`	`+ "css": "cancel",`
	`44`	`+ "code": 59396,`
	`45`	`+ "src": "fontawesome"`
	`46`	`+ },`
	`47`	`+ {`
	`48`	`+ "uid": "559647a6f430b3aeadbecd67194451dd",`
	`49`	`+ "css": "menu",`
	`50`	`+ "code": 61641,`
	`51`	`+ "src": "fontawesome"`
`40`	`52`	`}`
`41`	`53`	`]`
`42`	`54`	`}`