From a8802b3ce41d22c05dc1aa87efc807a249045970 Mon Sep 17 00:00:00 2001 From: benweet Date: Mon, 26 Aug 2013 13:29:46 +0100 Subject: [PATCH] Upgrade to Bootstrap 3 --- cache.manifest | 2 +- res-min/themes/blue-gray.css | 2 +- res-min/themes/default.css | 2 +- res-min/themes/night.css | 2 +- res/libs/fontello/css/fontello.css | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cache.manifest b/cache.manifest index dfc1b7a3..605ab3db 100644 --- a/cache.manifest +++ b/cache.manifest @@ -87,7 +87,7 @@ lib/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/SuppMathOperators.js #dynamic -# Mon 26 Aug 2013 12:46:43 WEST +# Mon 26 Aug 2013 13:29:32 WEST res-min/font/fontello.eot res-min/font/fontello.svg res-min/font/fontello.ttf diff --git a/res-min/themes/blue-gray.css b/res-min/themes/blue-gray.css index 95b565ff..f3be1e23 100644 --- a/res-min/themes/blue-gray.css +++ b/res-min/themes/blue-gray.css @@ -1,4 +1,4 @@ -@font-face{font-family:'fontello';src:url('../font/fontello.eot?65226408');src:url('../font/fontello.eot?65226408#iefix') format('embedded-opentype'),url('../font/fontello.woff?65226408') format('woff'),url('../font/fontello.ttf?65226408') format('truetype'),url('../font/fontello.svg?65226408#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;} +@font-face{font-family:'fontello';src:url('../font/fontello.eot');src:url('../font/fontello.eot#iefix') format('embedded-opentype'),url('../font/fontello.woff') format('woff'),url('../font/fontello.ttf') format('truetype'),url('../font/fontello.svg#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;} .icon-plus:before{content:'\e81f'} .icon-minus:before{content:'\e823'} .icon-left-big:before{content:'\e88a'} diff --git a/res-min/themes/default.css b/res-min/themes/default.css index 1da0f2c5..fc40cb06 100644 --- a/res-min/themes/default.css +++ b/res-min/themes/default.css @@ -1,4 +1,4 @@ -@font-face{font-family:'fontello';src:url('../font/fontello.eot?65226408');src:url('../font/fontello.eot?65226408#iefix') format('embedded-opentype'),url('../font/fontello.woff?65226408') format('woff'),url('../font/fontello.ttf?65226408') format('truetype'),url('../font/fontello.svg?65226408#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;} +@font-face{font-family:'fontello';src:url('../font/fontello.eot');src:url('../font/fontello.eot#iefix') format('embedded-opentype'),url('../font/fontello.woff') format('woff'),url('../font/fontello.ttf') format('truetype'),url('../font/fontello.svg#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;} .icon-plus:before{content:'\e81f'} .icon-minus:before{content:'\e823'} .icon-left-big:before{content:'\e88a'} diff --git a/res-min/themes/night.css b/res-min/themes/night.css index 2178c102..1ee6ee55 100644 --- a/res-min/themes/night.css +++ b/res-min/themes/night.css @@ -1,4 +1,4 @@ -@font-face{font-family:'fontello';src:url('../font/fontello.eot?65226408');src:url('../font/fontello.eot?65226408#iefix') format('embedded-opentype'),url('../font/fontello.woff?65226408') format('woff'),url('../font/fontello.ttf?65226408') format('truetype'),url('../font/fontello.svg?65226408#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;} +@font-face{font-family:'fontello';src:url('../font/fontello.eot');src:url('../font/fontello.eot#iefix') format('embedded-opentype'),url('../font/fontello.woff') format('woff'),url('../font/fontello.ttf') format('truetype'),url('../font/fontello.svg#fontello') format('svg');font-weight:normal;font-style:normal}[class^="icon-"]:before,[class*=" icon-"]:before{font-family:"fontello";font-style:normal;font-weight:normal;speak:none;display:inline-block;text-decoration:inherit;width:1em;margin-right:.2em;text-align:center;font-variant:normal;text-transform:none;line-height:1em;margin-left:.2em;} .icon-plus:before{content:'\e81f'} .icon-minus:before{content:'\e823'} .icon-left-big:before{content:'\e88a'} diff --git a/res/libs/fontello/css/fontello.css b/res/libs/fontello/css/fontello.css index 8750085a..ad4c6d90 100644 --- a/res/libs/fontello/css/fontello.css +++ b/res/libs/fontello/css/fontello.css @@ -1,10 +1,10 @@ @font-face { font-family: 'fontello'; - src: url('../font/fontello.eot?65226408'); - src: url('../font/fontello.eot?65226408#iefix') format('embedded-opentype'), - url('../font/fontello.woff?65226408') format('woff'), - url('../font/fontello.ttf?65226408') format('truetype'), - url('../font/fontello.svg?65226408#fontello') format('svg'); + src: url('../font/fontello.eot'); + src: url('../font/fontello.eot#iefix') format('embedded-opentype'), + url('../font/fontello.woff') format('woff'), + url('../font/fontello.ttf') format('truetype'), + url('../font/fontello.svg#fontello') format('svg'); font-weight: normal; font-style: normal; } @@ -14,7 +14,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'fontello'; - src: url('../font/fontello.svg?65226408#fontello') format('svg'); + src: url('../font/fontello.svg#fontello') format('svg'); } } */