Merge remote-tracking branch 'upstream/master' into develop

[friendica.git] / view / theme / vier / css / font2.css

diff --git a/view/theme/vier/css/font2.css b/view/theme/vier/css/font2.css
index 2357af604b6d4c99b3ef161411eb20de8754d099..a62cffc00c2cac88bbde4080658f026d04bce8a1 100644 (file)
--- a/view/theme/vier/css/font2.css
+++ b/view/theme/vier/css/font2.css
@@ -30,13 +30,13 @@
 }
 
 .icon.s10 {
-  font-size: 1em;
+  font-size: 0.7em;
 }
 .icon.s16 {
   font-size: 1.2em;
 }
 .icon.s22 {
-  font-size: 1.37em;
+  font-size: 1.2em;
 }
 .icon.s48 {
   font-size: 2em;
@@ -51,7 +51,7 @@
   display: inline-block;
   text-decoration: inherit;
   vertical-align: top;
-  font-size: 1.3333333333333333em;
+  font-size: 1.2em;
 }
 a .icon {
   display: inline-block;
@@ -60,7 +60,8 @@ a .icon {
 /* makes the font 33% larger relative to the icon container */
 .icon-large:before {
   vertical-align: top;
-  font-size: 1.3333333333333333em;
+/*  font-size: 1.3333333333333333em; */
+  font-size: 1.2em;
 }
 .btn .icon {
   /* keeps button heights with and without icons the same */
@@ -139,7 +140,8 @@ li.icon.icon-large:before {
 .icon-bookmark:before             { content: "\f02e"; }
 .icon-print:before                { content: "\f02f"; }
 
-.icon.camera:before               { content: "\f030"; }
+.icon-camera:before               { content: "\f030"; }
+.icon.camera:before               { content: "\f03e"; }
 .icon-font:before                 { content: "\f031"; }
 .icon-bold:before                 { content: "\f032"; }
 .icon-italic:before               { content: "\f033"; }
@@ -197,7 +199,7 @@ li.icon.icon-large:before {
 .icon.add:before                  { content: "\f067"; }
 .icon-minus:before                { content: "\f068"; }
 .icon-asterisk:before             { content: "\f069"; }
-.icon.notify:before               { content: "\f06a"; }
+.icon.exclamation:before          { content: "\f06a"; }
 .icon-gift:before                 { content: "\f06b"; }
 .icon-leaf:before                 { content: "\f06c"; }
 .icon-fire:before                 { content: "\f06d"; }
@@ -226,6 +228,7 @@ li.icon.icon-large:before {
 .icon-key:before                  { content: "\f084"; }
 .icon.gears:before                { content: "\f085"; }
 .icon-comments:before             { content: "\f086"; }
+.icon-commenting:before           { content: "\f27a"; }
 .icon.like:before                 { content: "\f087"; }
 .icon.dislike:before              { content: "\f088"; }
 .icon-star-half:before            { content: "\f089"; }
@@ -233,7 +236,7 @@ li.icon.icon-large:before {
 .icon-signout:before              { content: "\f08b"; }
 .icon-linkedin-sign:before        { content: "\f08c"; }
 .icon-pushpin:before              { content: "\f08d"; }
-.icon-external-link:before        { content: "\f08e"; }
+.icon.remote-link:before          { content: "\f08e"; }
 
 .icon-signin:before               { content: "\f090"; }
 .icon-trophy:before               { content: "\f091"; }
@@ -251,9 +254,13 @@ li.icon.icon-large:before {
 .icon-credit-card:before          { content: "\f09d"; }
 .icon-rss:before                  { content: "\f09e"; }
 
+.icon-bell-slash:before           { content: "\f1f6"; }
+.icon-bell-slash-o:before         { content: "\f1f7"; }
+
 .icon-hdd:before                  { content: "\f0a0"; }
 .icon-bullhorn:before             { content: "\f0a1"; }
-.icon-bell:before                 { content: "\f0a2"; }
+.icon.notify:before               { content: "\f0a2"; }
+.icon.notify.show:before          { content: "\f0f3"; }
 .icon-certificate:before          { content: "\f0a3"; }
 .icon-hand-right:before           { content: "\f0a4"; }
 .icon-hand-left:before            { content: "\f0a5"; }
@@ -314,14 +321,16 @@ li.icon.icon-large:before {
 .icon-sitemap:before              { content: "\f0e8"; }
 .icon-umbrella:before             { content: "\f0e9"; }
 .icon-paste:before                { content: "\f0ea"; }
+.icon-sliders:before              { content: "\f1de"; }
 
 .icon-user-md:before              { content: "\f200"; }
 
-.icon.type-image:before           { content: "\f03e"; }
-.icon.type-video:before           { content: "\f008"; }
-.icon.type-audio:before           { content: "\f001"; }
-.icon.type-text:before            { content: "\f036"; }
-.icon.type.unkn:before            { content: "\f059"; }
+.icon.type-image:before           { content: "\f1c5"; }
+.icon.type-video:before           { content: "\f1c8"; }
+.icon.type-audio:before           { content: "\f1c7"; }
+.icon.type-text:before            { content: "\f0f6"; }
+.icon.type-application:before     { content: "\f016"; }
+.icon.type-unkn:before            { content: "\f016"; }
 
 .icon.drop:before                 { content: "\f014"; }
 .icon.drophide:before             { content: "\f014"; }