From d7c5a06929dbb175482ad92b17e9f87342966c1c Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Fri, 23 May 2014 12:02:37 +0100 Subject: [PATCH] updated icons --- .../wagtailadmin/scss/components/icons.scss | 6 -- .../wagtailadmin/scss/fonts/wagtail.eot | Bin 26032 -> 26032 bytes .../wagtailadmin/scss/fonts/wagtail.svg | 71 +----------------- .../wagtailadmin/scss/fonts/wagtail.ttf | Bin 25868 -> 25868 bytes .../wagtailadmin/scss/fonts/wagtail.woff | Bin 15080 -> 15080 bytes 5 files changed, 1 insertion(+), 76 deletions(-) diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss index 7fb3320dd..92e83bbe5 100644 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/icons.scss @@ -246,12 +246,6 @@ .icon-form:before{ content:"$"; } -.icon-date:before{ - content:"7"; -} -.icon-form:before{ - content:"$"; -} .icon.text-replace{ font-size:0em; line-height:0; diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.eot index c5d6b5cc58b948ee1c15f5abeb6970cb759b23b8..7d7860a83289d44e2dc32b0b001995f293d6a15c 100755 GIT binary patch delta 57 zcmdmRnsLKv#tAme%N}J;wBN>@@tt+!51&LCgD)Oc@%%Pl8Mv7kK;Zn6+bS@6b3#%8 FGXSQ16;=QM delta 57 zcmdmRnsLKv#tAmeuaf6YwBN?;w=H?&51&LCLyeRB;`wd9GH^37fWZ0byDr1%%?U{X F%mA%N7Eb^G diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg index f25359ec6..dcfa5a08c 100755 --- a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg +++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.svg @@ -6,7 +6,6 @@ -<<<<<<< HEAD @@ -72,72 +71,4 @@ - -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> master + \ No newline at end of file diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf b/wagtail/wagtailadmin/static/wagtailadmin/scss/fonts/wagtail.ttf index c4161bea849d4ddb060928acbc08627d98cbaa78..38d2e1789c3dbff85017292ac2372a17f1b970bb 100755 GIT binary patch delta 50 xcmeA<#n^L-aY7(-#&_0@AwG#R246g?;`wd9GH^37fWY}Bw^d;D<~@l4%mB<)5nccQ delta 50 ycmeA<#n^L-aY7)o-?rq9AwG#Rh8idL#q-;IW#DFF0D<${i2(%8FS)G(qc_`FtYHEG*xM1g delta 47 vcmaD+`l56~FSFma{i2(%8Pv3PJMsK#USi=MW;jI$5