couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [49/51] [abbrv] Fix Fonts
Date Tue, 22 Jul 2014 07:32:48 GMT
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c713f633/assets/fonts/fontcustom.yml
----------------------------------------------------------------------
diff --cc assets/fonts/fontcustom.yml
index b92677b,41bc4e4..98da58e
--- a/assets/fonts/fontcustom.yml
+++ b/assets/fonts/fontcustom.yml
@@@ -19,8 -19,8 +19,13 @@@ quiet: fals
  # --------------------------------------------------------------------------- #
  
  input:
++<<<<<<< HEAD
 +  vectors: PUT_YOUR_PATH_HERE/fauxton/assets/icons         # required
 +  templates: PUT_YOUR_PATH_HERE/fauxton/assets/fonts/templates
++=======
+   vectors: PUT_YOUR_PATH_HERE/couchdb-fauxton/assets/icons         # required
+   templates: PUT_YOUR_PATH_HERE/couchdb-fauxton/assets/fonts/templates
++>>>>>>> pr/11
  
  
  # --------------------------------------------------------------------------- #
@@@ -28,10 -28,10 +33,17 @@@
  # --------------------------------------------------------------------------- #
  
  output:
++<<<<<<< HEAD
 +  fonts: PUT_YOUR_PATH_HERE/fauxton/assets/fonts                              # required
 +  # css: PUT_YOUR_PATH_HERE/fauxton/assets/less
 +  preview: PUT_YOUR_PATH_HERE/fauxton/assets/fonts/styleguide
 +  icons.less: PUT_YOUR_PATH_HERE/fauxton/assets/less 
++=======
+   fonts: PUT_YOUR_PATH_HERE/couchdb-fauxton/assets/fonts                              # required
+   # css: PUT_YOUR_PATH_HERE/couchdb-fauxton/assets/less
+   preview: PUT_YOUR_PATH_HERE/couchdb-fauxton/assets/fonts/styleguide
+   icons.less: PUT_YOUR_PATH_HERE/couchdb-fauxton/assets/less 
++>>>>>>> pr/11
    #my-custom-template.yml: path/to/template/output
  
  

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c713f633/assets/fonts/styleguide/fauxtonicon-preview.html
----------------------------------------------------------------------
diff --cc assets/fonts/styleguide/fauxtonicon-preview.html
index ec2ec84,2081221..0134d22
--- a/assets/fonts/styleguide/fauxtonicon-preview.html
+++ b/assets/fonts/styleguide/fauxtonicon-preview.html
@@@ -184,6 -184,7 +184,10 @@@
  .fonticon-cw:before,
  .fonticon-dashboard:before,
  .fonticon-database:before,
++<<<<<<< HEAD
++=======
+ .fonticon-deselect-all:before,
++>>>>>>> pr/11
  .fonticon-document:before,
  .fonticon-documents:before,
  .fonticon-dot-circled:before,
@@@ -248,6 -249,7 +252,10 @@@
  .fonticon-right-open:before,
  .fonticon-save:before,
  .fonticon-search:before,
++<<<<<<< HEAD
++=======
+ .fonticon-select-all:before,
++>>>>>>> pr/11
  .fonticon-sidenav-filter-function:before,
  .fonticon-sidenav-info:before,
  .fonticon-sidenav-list-function:before,
@@@ -283,7 -285,7 +291,11 @@@
    font-smoothing: antialiased;
        }
  
++<<<<<<< HEAD
 +      .fonticon-activetasks:before { content: "\f173"; }
++=======
+       .fonticon-activetasks:before { content: "\f100"; }
++>>>>>>> pr/11
  .fonticon-arrow-box-down:before { content: "\f101"; }
  .fonticon-arrow-box-up:before { content: "\f102"; }
  .fonticon-arrow_left:before { content: "\f103"; }
@@@ -299,99 -301,101 +311,197 @@@
  .fonticon-cancel:before { content: "\f10d"; }
  .fonticon-cancel-circled:before { content: "\f10e"; }
  .fonticon-cancel-circled2:before { content: "\f10f"; }
++<<<<<<< HEAD
 +.fonticon-circle-empty:before { content: "\f174"; }
 +.fonticon-clipboard:before { content: "\f117"; }
 +.fonticon-clock:before { content: "\f118"; }
 +.fonticon-cog:before { content: "\f119"; }
 +.fonticon-collapse:before { content: "\f11a"; }
 +.fonticon-cw:before { content: "\f11b"; }
 +.fonticon-dashboard:before { content: "\f11c"; }
 +.fonticon-database:before { content: "\f11d"; }
 +.fonticon-document:before { content: "\f11e"; }
 +.fonticon-documents:before { content: "\f11f"; }
 +.fonticon-dot-circled:before { content: "\f120"; }
 +.fonticon-down:before { content: "\f121"; }
 +.fonticon-down-1:before { content: "\f122"; }
 +.fonticon-down-circled:before { content: "\f123"; }
 +.fonticon-down-dir:before { content: "\f124"; }
 +.fonticon-down-open:before { content: "\f125"; }
 +.fonticon-drop-down-dots:before { content: "\f126"; }
 +.fonticon-exchange:before { content: "\f127"; }
 +.fonticon-expand:before { content: "\f128"; }
 +.fonticon-eye:before { content: "\f129"; }
 +.fonticon-help:before { content: "\f12a"; }
 +.fonticon-help-circled:before { content: "\f12b"; }
 +.fonticon-info-circled:before { content: "\f12c"; }
 +.fonticon-json:before { content: "\f12d"; }
 +.fonticon-key:before { content: "\f12e"; }
 +.fonticon-left:before { content: "\f12f"; }
 +.fonticon-left-1:before { content: "\f130"; }
 +.fonticon-left-circled:before { content: "\f131"; }
 +.fonticon-left-dir:before { content: "\f132"; }
 +.fonticon-left-open:before { content: "\f133"; }
 +.fonticon-link:before { content: "\f134"; }
 +.fonticon-list-alt:before { content: "\f135"; }
 +.fonticon-lock:before { content: "\f136"; }
 +.fonticon-mail:before { content: "\f138"; }
 +.fonticon-mail-alt:before { content: "\f139"; }
 +.fonticon-megaphone:before { content: "\f13a"; }
 +.fonticon-minus:before { content: "\f13b"; }
 +.fonticon-minus-circled:before { content: "\f13c"; }
 +.fonticon-minus-circled2:before { content: "\f175"; }
 +.fonticon-minus-squared:before { content: "\f13d"; }
 +.fonticon-minus-squared-alt:before { content: "\f13e"; }
 +.fonticon-mixer:before { content: "\f13f"; }
 +.fonticon-new-database:before { content: "\f140"; }
 +.fonticon-ok:before { content: "\f141"; }
 +.fonticon-ok-circled:before { content: "\f142"; }
 +.fonticon-ok-circled-2:before { content: "\f143"; }
 +.fonticon-paperclip:before { content: "\f144"; }
 +.fonticon-pencil:before { content: "\f145"; }
 +.fonticon-picture:before { content: "\f146"; }
 +.fonticon-play:before { content: "\f147"; }
 +.fonticon-plus:before { content: "\f148"; }
 +.fonticon-plus-circled:before { content: "\f149"; }
 +.fonticon-plus-circled2:before { content: "\f176"; }
 +.fonticon-plus-squared:before { content: "\f14a"; }
 +.fonticon-plus-squared-alt:before { content: "\f14b"; }
 +.fonticon-popin:before { content: "\f14c"; }
 +.fonticon-popout:before { content: "\f14d"; }
 +.fonticon-profile:before { content: "\f14e"; }
 +.fonticon-replicate:before { content: "\f14f"; }
 +.fonticon-reply:before { content: "\f150"; }
 +.fonticon-reply-all:before { content: "\f151"; }
 +.fonticon-resize-full:before { content: "\f152"; }
 +.fonticon-resize-full-reverse:before { content: "\f153"; }
 +.fonticon-resize-small:before { content: "\f154"; }
 +.fonticon-resize-small-reverse:before { content: "\f155"; }
 +.fonticon-right:before { content: "\f156"; }
 +.fonticon-right-1:before { content: "\f157"; }
 +.fonticon-right-circled:before { content: "\f158"; }
 +.fonticon-right-dir:before { content: "\f159"; }
 +.fonticon-right-open:before { content: "\f15a"; }
 +.fonticon-save:before { content: "\f15b"; }
 +.fonticon-search:before { content: "\f15c"; }
 +.fonticon-sidenav-filter-function:before { content: "\f15d"; }
 +.fonticon-sidenav-info:before { content: "\f15e"; }
 +.fonticon-sidenav-list-function:before { content: "\f15f"; }
 +.fonticon-sidenav-map-reduce:before { content: "\f160"; }
 +.fonticon-sidenav-search:before { content: "\f161"; }
 +.fonticon-sidenav-show-function:before { content: "\f162"; }
 +.fonticon-sidenav-update-function:before { content: "\f163"; }
 +.fonticon-sitemap:before { content: "\f164"; }
 +.fonticon-stats:before { content: "\f165"; }
 +.fonticon-support:before { content: "\f166"; }
 +.fonticon-swap-arrows:before { content: "\f167"; }
 +.fonticon-table:before { content: "\f168"; }
 +.fonticon-trash:before { content: "\f169"; }
 +.fonticon-up:before { content: "\f16a"; }
 +.fonticon-up-1:before { content: "\f16b"; }
 +.fonticon-up-circled:before { content: "\f16c"; }
 +.fonticon-up-dir:before { content: "\f16d"; }
 +.fonticon-up-open:before { content: "\f16e"; }
 +.fonticon-user:before { content: "\f16f"; }
 +.fonticon-users:before { content: "\f170"; }
 +.fonticon-wrench:before { content: "\f171"; }
++=======
+ .fonticon-circle-empty:before { content: "\f110"; }
+ .fonticon-clipboard:before { content: "\f111"; }
+ .fonticon-clock:before { content: "\f112"; }
+ .fonticon-cog:before { content: "\f113"; }
+ .fonticon-collapse:before { content: "\f114"; }
+ .fonticon-cw:before { content: "\f115"; }
+ .fonticon-dashboard:before { content: "\f116"; }
+ .fonticon-database:before { content: "\f117"; }
+ .fonticon-deselect-all:before { content: "\f118"; }
+ .fonticon-document:before { content: "\f119"; }
+ .fonticon-documents:before { content: "\f11a"; }
+ .fonticon-dot-circled:before { content: "\f11b"; }
+ .fonticon-down:before { content: "\f11c"; }
+ .fonticon-down-1:before { content: "\f11d"; }
+ .fonticon-down-circled:before { content: "\f11e"; }
+ .fonticon-down-dir:before { content: "\f11f"; }
+ .fonticon-down-open:before { content: "\f120"; }
+ .fonticon-drop-down-dots:before { content: "\f121"; }
+ .fonticon-exchange:before { content: "\f122"; }
+ .fonticon-expand:before { content: "\f123"; }
+ .fonticon-eye:before { content: "\f124"; }
+ .fonticon-help:before { content: "\f125"; }
+ .fonticon-help-circled:before { content: "\f126"; }
+ .fonticon-info-circled:before { content: "\f127"; }
+ .fonticon-json:before { content: "\f128"; }
+ .fonticon-key:before { content: "\f129"; }
+ .fonticon-left:before { content: "\f12a"; }
+ .fonticon-left-1:before { content: "\f12b"; }
+ .fonticon-left-circled:before { content: "\f12c"; }
+ .fonticon-left-dir:before { content: "\f12d"; }
+ .fonticon-left-open:before { content: "\f12e"; }
+ .fonticon-link:before { content: "\f12f"; }
+ .fonticon-list-alt:before { content: "\f130"; }
+ .fonticon-lock:before { content: "\f131"; }
+ .fonticon-mail:before { content: "\f132"; }
+ .fonticon-mail-alt:before { content: "\f133"; }
+ .fonticon-megaphone:before { content: "\f134"; }
+ .fonticon-minus:before { content: "\f135"; }
+ .fonticon-minus-circled:before { content: "\f136"; }
+ .fonticon-minus-circled2:before { content: "\f137"; }
+ .fonticon-minus-squared:before { content: "\f138"; }
+ .fonticon-minus-squared-alt:before { content: "\f139"; }
+ .fonticon-mixer:before { content: "\f13a"; }
+ .fonticon-new-database:before { content: "\f13b"; }
+ .fonticon-ok:before { content: "\f13c"; }
+ .fonticon-ok-circled:before { content: "\f13d"; }
+ .fonticon-ok-circled-2:before { content: "\f13e"; }
+ .fonticon-paperclip:before { content: "\f13f"; }
+ .fonticon-pencil:before { content: "\f140"; }
+ .fonticon-picture:before { content: "\f141"; }
+ .fonticon-play:before { content: "\f142"; }
+ .fonticon-plus:before { content: "\f143"; }
+ .fonticon-plus-circled:before { content: "\f144"; }
+ .fonticon-plus-circled2:before { content: "\f145"; }
+ .fonticon-plus-squared:before { content: "\f146"; }
+ .fonticon-plus-squared-alt:before { content: "\f147"; }
+ .fonticon-popin:before { content: "\f148"; }
+ .fonticon-popout:before { content: "\f149"; }
+ .fonticon-profile:before { content: "\f14a"; }
+ .fonticon-replicate:before { content: "\f14b"; }
+ .fonticon-reply:before { content: "\f14c"; }
+ .fonticon-reply-all:before { content: "\f14d"; }
+ .fonticon-resize-full:before { content: "\f14e"; }
+ .fonticon-resize-full-reverse:before { content: "\f14f"; }
+ .fonticon-resize-small:before { content: "\f150"; }
+ .fonticon-resize-small-reverse:before { content: "\f151"; }
+ .fonticon-right:before { content: "\f152"; }
+ .fonticon-right-1:before { content: "\f153"; }
+ .fonticon-right-circled:before { content: "\f154"; }
+ .fonticon-right-dir:before { content: "\f155"; }
+ .fonticon-right-open:before { content: "\f156"; }
+ .fonticon-save:before { content: "\f157"; }
+ .fonticon-search:before { content: "\f158"; }
+ .fonticon-select-all:before { content: "\f159"; }
+ .fonticon-sidenav-filter-function:before { content: "\f15a"; }
+ .fonticon-sidenav-info:before { content: "\f15b"; }
+ .fonticon-sidenav-list-function:before { content: "\f15c"; }
+ .fonticon-sidenav-map-reduce:before { content: "\f15d"; }
+ .fonticon-sidenav-search:before { content: "\f15e"; }
+ .fonticon-sidenav-show-function:before { content: "\f15f"; }
+ .fonticon-sidenav-update-function:before { content: "\f160"; }
+ .fonticon-sitemap:before { content: "\f161"; }
+ .fonticon-stats:before { content: "\f162"; }
+ .fonticon-support:before { content: "\f163"; }
+ .fonticon-swap-arrows:before { content: "\f164"; }
+ .fonticon-table:before { content: "\f165"; }
+ .fonticon-trash:before { content: "\f166"; }
+ .fonticon-up:before { content: "\f167"; }
+ .fonticon-up-1:before { content: "\f168"; }
+ .fonticon-up-circled:before { content: "\f169"; }
+ .fonticon-up-dir:before { content: "\f16a"; }
+ .fonticon-up-open:before { content: "\f16b"; }
+ .fonticon-user:before { content: "\f16c"; }
+ .fonticon-users:before { content: "\f16d"; }
+ .fonticon-wrench:before { content: "\f16e"; }
++>>>>>>> pr/11
      </style>
  
      <!--[if lte IE 8]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
@@@ -407,7 -411,7 +517,11 @@@
    <body class="characters-off">
      <div id="page" class="container">
        <header>
++<<<<<<< HEAD
 +        <h1>fauxtonicon contains 109 glyphs:</h1>
++=======
+         <h1>fauxtonicon contains 111 glyphs:</h1>
++>>>>>>> pr/11
          <a onclick="toggleCharacters(); return false;" href="#">Toggle Preview Characters</a>
        </header>
  
@@@ -421,7 -425,7 +535,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-activetasks" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf173;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf100;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -629,7 -633,7 +747,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-circle-empty" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf174;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf110;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -642,7 -646,7 +764,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-clipboard" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf117;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf111;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -655,7 -659,7 +781,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-clock" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf118;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf112;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -668,7 -672,7 +798,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-cog" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf119;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf113;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -681,7 -685,7 +815,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-collapse" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11a;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf114;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -694,7 -698,7 +832,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-cw" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11b;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf115;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -707,7 -711,7 +849,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-dashboard" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11c;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf116;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -720,7 -724,20 +866,24 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-database" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11d;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf117;" />
+         </div>
+       </div>
+       
+       <div class="glyph">
+         <div class="preview-glyphs">
+           <span class="step size-12"><span class="letters">Pp</span><i id="fonticon-deselect-all" class="fonticon-deselect-all"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="fonticon-deselect-all" class="fonticon-deselect-all"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="fonticon-deselect-all" class="fonticon-deselect-all"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="fonticon-deselect-all" class="fonticon-deselect-all"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="fonticon-deselect-all" class="fonticon-deselect-all"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="fonticon-deselect-all" class="fonticon-deselect-all"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="fonticon-deselect-all" class="fonticon-deselect-all"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="fonticon-deselect-
 all" class="fonticon-deselect-all"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="fonticon-deselect-all" class="fonticon-deselect-all"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="fonticon-deselect-all" class="fonticon-deselect-all"></i></span>
+         </div>
+         <div class="preview-scale">
+           <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+         </div>
+         <div class="usage">
+           <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-deselect-all" />
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf118;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -733,7 -750,7 +896,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-document" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11e;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf119;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -746,7 -763,7 +913,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-documents" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11f;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11a;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -759,7 -776,7 +930,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-dot-circled" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf120;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11b;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -772,7 -789,7 +947,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-down" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf121;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11c;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -785,7 -802,7 +964,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-down-1" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf122;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11d;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -798,7 -815,7 +981,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-down-circled" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf123;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11e;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -811,7 -828,7 +998,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-down-dir" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf124;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf11f;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -824,7 -841,7 +1015,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-down-open" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf125;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf120;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -837,7 -854,7 +1032,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-drop-down-dots" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf126;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf121;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -850,7 -867,7 +1049,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-exchange" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf127;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf122;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -863,7 -880,7 +1066,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-expand" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf128;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf123;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -876,7 -893,7 +1083,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-eye" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf129;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf124;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -889,7 -906,7 +1100,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-help" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf12a;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf125;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -902,7 -919,7 +1117,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-help-circled" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf12b;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf126;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -915,7 -932,7 +1134,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-info-circled" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf12c;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf127;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -928,7 -945,7 +1151,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-json" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf12d;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf128;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -941,7 -958,7 +1168,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-key" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf12e;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf129;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -954,7 -971,7 +1185,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-left" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf12f;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf12a;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -967,7 -984,7 +1202,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-left-1" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf130;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf12b;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -980,7 -997,7 +1219,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-left-circled" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf131;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf12c;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -993,7 -1010,7 +1236,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-left-dir" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf132;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf12d;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1006,7 -1023,7 +1253,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-left-open" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf133;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf12e;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1019,7 -1036,7 +1270,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-link" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf134;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf12f;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1032,7 -1049,7 +1287,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-list-alt" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf135;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf130;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1045,7 -1062,7 +1304,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-lock" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf136;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf131;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1058,7 -1075,7 +1321,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-mail" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf138;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf132;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1071,7 -1088,7 +1338,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-mail-alt" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf139;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf133;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1084,7 -1101,7 +1355,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-megaphone" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf13a;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf134;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1097,7 -1114,7 +1372,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-minus" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf13b;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf135;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1110,7 -1127,7 +1389,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-minus-circled" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf13c;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf136;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1123,7 -1140,7 +1406,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-minus-circled2" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf175;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf137;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1136,7 -1153,7 +1423,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-minus-squared" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf13d;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf138;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1149,7 -1166,7 +1440,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-minus-squared-alt" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf13e;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf139;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1162,7 -1179,7 +1457,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-mixer" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf13f;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf13a;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1175,7 -1192,7 +1474,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-new-database" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf140;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf13b;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1188,7 -1205,7 +1491,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-ok" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf141;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf13c;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1201,7 -1218,7 +1508,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-ok-circled" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf142;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf13d;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1214,7 -1231,7 +1525,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-ok-circled-2" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf143;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf13e;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1227,7 -1244,7 +1542,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-paperclip" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf144;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf13f;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1240,7 -1257,7 +1559,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-pencil" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf145;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf140;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1253,7 -1270,7 +1576,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-picture" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf146;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf141;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1266,7 -1283,7 +1593,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-play" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf147;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf142;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1279,7 -1296,7 +1610,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-plus" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf148;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf143;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1292,7 -1309,7 +1627,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-plus-circled" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf149;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf144;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1305,7 -1322,7 +1644,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-plus-circled2" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf176;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf145;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1318,7 -1335,7 +1661,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-plus-squared" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf14a;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf146;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1331,7 -1348,7 +1678,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-plus-squared-alt" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf14b;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf147;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1344,7 -1361,7 +1695,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-popin" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf14c;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf148;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1357,7 -1374,7 +1712,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-popout" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf14d;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf149;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1370,7 -1387,7 +1729,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-profile" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf14e;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf14a;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1383,7 -1400,7 +1746,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-replicate" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf14f;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf14b;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1396,7 -1413,7 +1763,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-reply" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf150;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf14c;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1409,7 -1426,7 +1780,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-reply-all" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf151;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf14d;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1422,7 -1439,7 +1797,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-resize-full" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf152;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf14e;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1435,7 -1452,7 +1814,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-resize-full-reverse" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf153;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf14f;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1448,7 -1465,7 +1831,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-resize-small" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf154;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf150;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1461,7 -1478,7 +1848,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-resize-small-reverse" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf155;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf151;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1474,7 -1491,7 +1865,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-right" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf156;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf152;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1487,7 -1504,7 +1882,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-right-1" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf157;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf153;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1500,7 -1517,7 +1899,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-right-circled" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf158;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf154;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1513,7 -1530,7 +1916,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-right-dir" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf159;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf155;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1526,7 -1543,7 +1933,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-right-open" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf15a;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf156;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1539,7 -1556,7 +1950,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-save" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf15b;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf157;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1552,7 -1569,20 +1967,24 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-search" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf15c;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf158;" />
+         </div>
+       </div>
+       
+       <div class="glyph">
+         <div class="preview-glyphs">
+           <span class="step size-12"><span class="letters">Pp</span><i id="fonticon-select-all" class="fonticon-select-all"></i></span><span class="step size-14"><span class="letters">Pp</span><i id="fonticon-select-all" class="fonticon-select-all"></i></span><span class="step size-16"><span class="letters">Pp</span><i id="fonticon-select-all" class="fonticon-select-all"></i></span><span class="step size-18"><span class="letters">Pp</span><i id="fonticon-select-all" class="fonticon-select-all"></i></span><span class="step size-21"><span class="letters">Pp</span><i id="fonticon-select-all" class="fonticon-select-all"></i></span><span class="step size-24"><span class="letters">Pp</span><i id="fonticon-select-all" class="fonticon-select-all"></i></span><span class="step size-36"><span class="letters">Pp</span><i id="fonticon-select-all" class="fonticon-select-all"></i></span><span class="step size-48"><span class="letters">Pp</span><i id="fonticon-select-all" class="fonticon-select-al
 l"></i></span><span class="step size-60"><span class="letters">Pp</span><i id="fonticon-select-all" class="fonticon-select-all"></i></span><span class="step size-72"><span class="letters">Pp</span><i id="fonticon-select-all" class="fonticon-select-all"></i></span>
+         </div>
+         <div class="preview-scale">
+           <span class="step">12</span><span class="step">14</span><span class="step">16</span><span class="step">18</span><span class="step">21</span><span class="step">24</span><span class="step">36</span><span class="step">48</span><span class="step">60</span><span class="step">72</span>
+         </div>
+         <div class="usage">
+           <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-select-all" />
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf159;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1565,7 -1595,7 +1997,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-sidenav-filter-function" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf15d;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf15a;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1578,7 -1608,7 +2014,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-sidenav-info" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf15e;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf15b;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1591,7 -1621,7 +2031,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-sidenav-list-function" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf15f;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf15c;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1604,7 -1634,7 +2048,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-sidenav-map-reduce" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf160;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf15d;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1617,7 -1647,7 +2065,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-sidenav-search" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf161;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf15e;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1630,7 -1660,7 +2082,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-sidenav-show-function" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf162;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf15f;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1643,7 -1673,7 +2099,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-sidenav-update-function" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf163;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf160;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1656,7 -1686,7 +2116,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-sitemap" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf164;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf161;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1669,7 -1699,7 +2133,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-stats" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf165;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf162;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1682,7 -1712,7 +2150,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-support" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf166;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf163;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1695,7 -1725,7 +2167,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-swap-arrows" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf167;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf164;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1708,7 -1738,7 +2184,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-table" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf168;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf165;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1721,7 -1751,7 +2201,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-trash" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf169;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf166;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1734,7 -1764,7 +2218,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-up" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf16a;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf167;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1747,7 -1777,7 +2235,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-up-1" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf16b;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf168;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1760,7 -1790,7 +2252,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-up-circled" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf16c;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf169;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1773,7 -1803,7 +2269,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-up-dir" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf16d;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf16a;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1786,7 -1816,7 +2286,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-up-open" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf16e;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf16b;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1799,7 -1829,7 +2303,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-user" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf16f;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf16c;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1812,7 -1842,7 +2320,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-users" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf170;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf16d;" />
++>>>>>>> pr/11
          </div>
        </div>
        
@@@ -1825,7 -1855,7 +2337,11 @@@
          </div>
          <div class="usage">
            <input class="class" type="text" readonly="readonly" onClick="this.select();" value=".fonticon-wrench" />
++<<<<<<< HEAD
 +          <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf171;" />
++=======
+           <input class="point" type="text" readonly="readonly" onClick="this.select();" value="&amp;#xf16e;" />
++>>>>>>> pr/11
          </div>
        </div>
        

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c713f633/assets/less/icons.less
----------------------------------------------------------------------
diff --cc assets/less/icons.less
index 2a1166c,8b8559e..7171461
--- a/assets/less/icons.less
+++ b/assets/less/icons.less
@@@ -127,6 -128,7 +128,10 @@@ https://github.com/seanbarclay/fontcust
  .fonticon-right-open:before,
  .fonticon-save:before,
  .fonticon-search:before,
++<<<<<<< HEAD
++=======
+ .fonticon-select-all:before,
++>>>>>>> pr/11
  .fonticon-sidenav-filter-function:before,
  .fonticon-sidenav-info:before,
  .fonticon-sidenav-list-function:before,
@@@ -162,7 -164,7 +167,11 @@@
    font-smoothing: antialiased;
  }
  
++<<<<<<< HEAD
 +.fonticon-activetasks:before { content: "\f173"; }
++=======
+ .fonticon-activetasks:before { content: "\f100"; }
++>>>>>>> pr/11
  .fonticon-arrow-box-down:before { content: "\f101"; }
  .fonticon-arrow-box-up:before { content: "\f102"; }
  .fonticon-arrow_left:before { content: "\f103"; }
@@@ -178,96 -180,98 +187,194 @@@
  .fonticon-cancel:before { content: "\f10d"; }
  .fonticon-cancel-circled:before { content: "\f10e"; }
  .fonticon-cancel-circled2:before { content: "\f10f"; }
++<<<<<<< HEAD
 +.fonticon-circle-empty:before { content: "\f174"; }
 +.fonticon-clipboard:before { content: "\f117"; }
 +.fonticon-clock:before { content: "\f118"; }
 +.fonticon-cog:before { content: "\f119"; }
 +.fonticon-collapse:before { content: "\f11a"; }
 +.fonticon-cw:before { content: "\f11b"; }
 +.fonticon-dashboard:before { content: "\f11c"; }
 +.fonticon-database:before { content: "\f11d"; }
 +.fonticon-document:before { content: "\f11e"; }
 +.fonticon-documents:before { content: "\f11f"; }
 +.fonticon-dot-circled:before { content: "\f120"; }
 +.fonticon-down:before { content: "\f121"; }
 +.fonticon-down-1:before { content: "\f122"; }
 +.fonticon-down-circled:before { content: "\f123"; }
 +.fonticon-down-dir:before { content: "\f124"; }
 +.fonticon-down-open:before { content: "\f125"; }
 +.fonticon-drop-down-dots:before { content: "\f126"; }
 +.fonticon-exchange:before { content: "\f127"; }
 +.fonticon-expand:before { content: "\f128"; }
 +.fonticon-eye:before { content: "\f129"; }
 +.fonticon-help:before { content: "\f12a"; }
 +.fonticon-help-circled:before { content: "\f12b"; }
 +.fonticon-info-circled:before { content: "\f12c"; }
 +.fonticon-json:before { content: "\f12d"; }
 +.fonticon-key:before { content: "\f12e"; }
 +.fonticon-left:before { content: "\f12f"; }
 +.fonticon-left-1:before { content: "\f130"; }
 +.fonticon-left-circled:before { content: "\f131"; }
 +.fonticon-left-dir:before { content: "\f132"; }
 +.fonticon-left-open:before { content: "\f133"; }
 +.fonticon-link:before { content: "\f134"; }
 +.fonticon-list-alt:before { content: "\f135"; }
 +.fonticon-lock:before { content: "\f136"; }
 +.fonticon-mail:before { content: "\f138"; }
 +.fonticon-mail-alt:before { content: "\f139"; }
 +.fonticon-megaphone:before { content: "\f13a"; }
 +.fonticon-minus:before { content: "\f13b"; }
 +.fonticon-minus-circled:before { content: "\f13c"; }
 +.fonticon-minus-circled2:before { content: "\f175"; }
 +.fonticon-minus-squared:before { content: "\f13d"; }
 +.fonticon-minus-squared-alt:before { content: "\f13e"; }
 +.fonticon-mixer:before { content: "\f13f"; }
 +.fonticon-new-database:before { content: "\f140"; }
 +.fonticon-ok:before { content: "\f141"; }
 +.fonticon-ok-circled:before { content: "\f142"; }
 +.fonticon-ok-circled-2:before { content: "\f143"; }
 +.fonticon-paperclip:before { content: "\f144"; }
 +.fonticon-pencil:before { content: "\f145"; }
 +.fonticon-picture:before { content: "\f146"; }
 +.fonticon-play:before { content: "\f147"; }
 +.fonticon-plus:before { content: "\f148"; }
 +.fonticon-plus-circled:before { content: "\f149"; }
 +.fonticon-plus-circled2:before { content: "\f176"; }
 +.fonticon-plus-squared:before { content: "\f14a"; }
 +.fonticon-plus-squared-alt:before { content: "\f14b"; }
 +.fonticon-popin:before { content: "\f14c"; }
 +.fonticon-popout:before { content: "\f14d"; }
 +.fonticon-profile:before { content: "\f14e"; }
 +.fonticon-replicate:before { content: "\f14f"; }
 +.fonticon-reply:before { content: "\f150"; }
 +.fonticon-reply-all:before { content: "\f151"; }
 +.fonticon-resize-full:before { content: "\f152"; }
 +.fonticon-resize-full-reverse:before { content: "\f153"; }
 +.fonticon-resize-small:before { content: "\f154"; }
 +.fonticon-resize-small-reverse:before { content: "\f155"; }
 +.fonticon-right:before { content: "\f156"; }
 +.fonticon-right-1:before { content: "\f157"; }
 +.fonticon-right-circled:before { content: "\f158"; }
 +.fonticon-right-dir:before { content: "\f159"; }
 +.fonticon-right-open:before { content: "\f15a"; }
 +.fonticon-save:before { content: "\f15b"; }
 +.fonticon-search:before { content: "\f15c"; }
 +.fonticon-sidenav-filter-function:before { content: "\f15d"; }
 +.fonticon-sidenav-info:before { content: "\f15e"; }
 +.fonticon-sidenav-list-function:before { content: "\f15f"; }
 +.fonticon-sidenav-map-reduce:before { content: "\f160"; }
 +.fonticon-sidenav-search:before { content: "\f161"; }
 +.fonticon-sidenav-show-function:before { content: "\f162"; }
 +.fonticon-sidenav-update-function:before { content: "\f163"; }
 +.fonticon-sitemap:before { content: "\f164"; }
 +.fonticon-stats:before { content: "\f165"; }
 +.fonticon-support:before { content: "\f166"; }
 +.fonticon-swap-arrows:before { content: "\f167"; }
 +.fonticon-table:before { content: "\f168"; }
 +.fonticon-trash:before { content: "\f169"; }
 +.fonticon-up:before { content: "\f16a"; }
 +.fonticon-up-1:before { content: "\f16b"; }
 +.fonticon-up-circled:before { content: "\f16c"; }
 +.fonticon-up-dir:before { content: "\f16d"; }
 +.fonticon-up-open:before { content: "\f16e"; }
 +.fonticon-user:before { content: "\f16f"; }
 +.fonticon-users:before { content: "\f170"; }
- .fonticon-wrench:before { content: "\f171"; }
++.fonticon-wrench:before { content: "\f171"; }
++=======
+ .fonticon-circle-empty:before { content: "\f110"; }
+ .fonticon-clipboard:before { content: "\f111"; }
+ .fonticon-clock:before { content: "\f112"; }
+ .fonticon-cog:before { content: "\f113"; }
+ .fonticon-collapse:before { content: "\f114"; }
+ .fonticon-cw:before { content: "\f115"; }
+ .fonticon-dashboard:before { content: "\f116"; }
+ .fonticon-database:before { content: "\f117"; }
+ .fonticon-deselect-all:before { content: "\f118"; }
+ .fonticon-document:before { content: "\f119"; }
+ .fonticon-documents:before { content: "\f11a"; }
+ .fonticon-dot-circled:before { content: "\f11b"; }
+ .fonticon-down:before { content: "\f11c"; }
+ .fonticon-down-1:before { content: "\f11d"; }
+ .fonticon-down-circled:before { content: "\f11e"; }
+ .fonticon-down-dir:before { content: "\f11f"; }
+ .fonticon-down-open:before { content: "\f120"; }
+ .fonticon-drop-down-dots:before { content: "\f121"; }
+ .fonticon-exchange:before { content: "\f122"; }
+ .fonticon-expand:before { content: "\f123"; }
+ .fonticon-eye:before { content: "\f124"; }
+ .fonticon-help:before { content: "\f125"; }
+ .fonticon-help-circled:before { content: "\f126"; }
+ .fonticon-info-circled:before { content: "\f127"; }
+ .fonticon-json:before { content: "\f128"; }
+ .fonticon-key:before { content: "\f129"; }
+ .fonticon-left:before { content: "\f12a"; }
+ .fonticon-left-1:before { content: "\f12b"; }
+ .fonticon-left-circled:before { content: "\f12c"; }
+ .fonticon-left-dir:before { content: "\f12d"; }
+ .fonticon-left-open:before { content: "\f12e"; }
+ .fonticon-link:before { content: "\f12f"; }
+ .fonticon-list-alt:before { content: "\f130"; }
+ .fonticon-lock:before { content: "\f131"; }
+ .fonticon-mail:before { content: "\f132"; }
+ .fonticon-mail-alt:before { content: "\f133"; }
+ .fonticon-megaphone:before { content: "\f134"; }
+ .fonticon-minus:before { content: "\f135"; }
+ .fonticon-minus-circled:before { content: "\f136"; }
+ .fonticon-minus-circled2:before { content: "\f137"; }
+ .fonticon-minus-squared:before { content: "\f138"; }
+ .fonticon-minus-squared-alt:before { content: "\f139"; }
+ .fonticon-mixer:before { content: "\f13a"; }
+ .fonticon-new-database:before { content: "\f13b"; }
+ .fonticon-ok:before { content: "\f13c"; }
+ .fonticon-ok-circled:before { content: "\f13d"; }
+ .fonticon-ok-circled-2:before { content: "\f13e"; }
+ .fonticon-paperclip:before { content: "\f13f"; }
+ .fonticon-pencil:before { content: "\f140"; }
+ .fonticon-picture:before { content: "\f141"; }
+ .fonticon-play:before { content: "\f142"; }
+ .fonticon-plus:before { content: "\f143"; }
+ .fonticon-plus-circled:before { content: "\f144"; }
+ .fonticon-plus-circled2:before { content: "\f145"; }
+ .fonticon-plus-squared:before { content: "\f146"; }
+ .fonticon-plus-squared-alt:before { content: "\f147"; }
+ .fonticon-popin:before { content: "\f148"; }
+ .fonticon-popout:before { content: "\f149"; }
+ .fonticon-profile:before { content: "\f14a"; }
+ .fonticon-replicate:before { content: "\f14b"; }
+ .fonticon-reply:before { content: "\f14c"; }
+ .fonticon-reply-all:before { content: "\f14d"; }
+ .fonticon-resize-full:before { content: "\f14e"; }
+ .fonticon-resize-full-reverse:before { content: "\f14f"; }
+ .fonticon-resize-small:before { content: "\f150"; }
+ .fonticon-resize-small-reverse:before { content: "\f151"; }
+ .fonticon-right:before { content: "\f152"; }
+ .fonticon-right-1:before { content: "\f153"; }
+ .fonticon-right-circled:before { content: "\f154"; }
+ .fonticon-right-dir:before { content: "\f155"; }
+ .fonticon-right-open:before { content: "\f156"; }
+ .fonticon-save:before { content: "\f157"; }
+ .fonticon-search:before { content: "\f158"; }
+ .fonticon-select-all:before { content: "\f159"; }
+ .fonticon-sidenav-filter-function:before { content: "\f15a"; }
+ .fonticon-sidenav-info:before { content: "\f15b"; }
+ .fonticon-sidenav-list-function:before { content: "\f15c"; }
+ .fonticon-sidenav-map-reduce:before { content: "\f15d"; }
+ .fonticon-sidenav-search:before { content: "\f15e"; }
+ .fonticon-sidenav-show-function:before { content: "\f15f"; }
+ .fonticon-sidenav-update-function:before { content: "\f160"; }
+ .fonticon-sitemap:before { content: "\f161"; }
+ .fonticon-stats:before { content: "\f162"; }
+ .fonticon-support:before { content: "\f163"; }
+ .fonticon-swap-arrows:before { content: "\f164"; }
+ .fonticon-table:before { content: "\f165"; }
+ .fonticon-trash:before { content: "\f166"; }
+ .fonticon-up:before { content: "\f167"; }
+ .fonticon-up-1:before { content: "\f168"; }
+ .fonticon-up-circled:before { content: "\f169"; }
+ .fonticon-up-dir:before { content: "\f16a"; }
+ .fonticon-up-open:before { content: "\f16b"; }
+ .fonticon-user:before { content: "\f16c"; }
+ .fonticon-users:before { content: "\f16d"; }
 -.fonticon-wrench:before { content: "\f16e"; }
++.fonticon-wrench:before { content: "\f16e"; }
++>>>>>>> pr/11


Mime
View raw message