Home Explore Help
Sign In
mirrors
/
Fork-Awesome
mirror of https://github.com/ForkAwesome/Fork-Awesome
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

fixing ie8 issues, updating textures

davegandy 12 years ago
parent
eb4bebcca8
commit
a3c97068fb
9 changed files with 55 additions and 43 deletions
Split View Show Diff Stats
  1. 2 1
      css/font-awesome.css
  2. 1 1
      css/font-awesome.min.css
  3. 6 6
      less/path.less
  4. 9 17
      src/_layouts/base.html
  5. 8 0
      src/assets/js/html5shiv.js
  6. 5 0
      src/assets/js/respond.min.js
  7. 8 1
      src/assets/less/site/bootstrap/variables.less
  8. 16 16
      src/assets/less/site/jumbotron-carousel.less
  9. 0 1
      src/assets/less/site/textured-bg.less

+ 2 - 1
css/font-awesome.css
View File 

@@ -27,7 +27,8 @@
 
  * -------------------------- */
 
 @font-face {
 
   font-family: 'FontAwesome';
 
-  src: url('../fonts/FontAwesome.otf') format('opentype');
 
+  src: url('../fonts/fontawesome-webfont.eot?v=4.0.0');
 
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.0#fontawesomeregular') format('svg');
 
   font-weight: normal;
 
   font-style: normal;
 
 }

+ 1 - 1
css/font-awesome.min.css
View File 

@@ -1,4 +1,4 @@
 
-@font-face{font-family:'FontAwesome';src:url('../fonts/FontAwesome.otf') format('opentype');font-weight:normal;font-style:normal;}.fa-icon{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;}
 
+@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.0.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.0.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.0.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.0.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal;}.fa-icon{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;}
 
 .fa-icon-lg{font-size:1.3333333333333333em;line-height:0.75em;vertical-align:-15%;}
 
 .fa-icon-fixed-width{width:1.1428571428571428em;padding-right:0.2857142857142857em;text-align:right;}.fa-icon-fixed-width.fa-icon-lg{width:1.4285714285714286em;}
 
 .fa-icon-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none;}.fa-icon-ul>li{position:relative;}

+ 6 - 6
less/path.less
View File 

@@ -3,12 +3,12 @@
 
 
 @font-face {
 
   font-family: 'FontAwesome';
 
-//  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}');
 
-//  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
 
-//    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
 
-//    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'),
 
-//    url('@{FontAwesomePath}/fontawesome-webfont.svg?v=@{FontAwesomeVersion}#fontawesomeregular') format('svg');
 
-  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
 
+  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}');
 
+  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
 
+    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
 
+    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'),
 
+    url('@{FontAwesomePath}/fontawesome-webfont.svg?v=@{FontAwesomeVersion}#fontawesomeregular') format('svg');
 
+//  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
 
   font-weight: normal;
 
   font-style: normal;
 
 }

+ 9 - 17
src/_layouts/base.html
View File 

@@ -1,34 +1,26 @@
 
 <!DOCTYPE html>
 
-<!--[if lt IE 7 ]><html class="ie ie6" lang="en"> <![endif]-->
 
-<!--[if IE 7 ]><html class="ie ie7" lang="en"> <![endif]-->
 
-<!--[if IE 8 ]><html class="ie ie8" lang="en"> <![endif]-->
 
-<!--[if (gte IE 9)|!(IE)]><!-->
 
-<html lang="en" xmlns="http://www.w3.org/1999/html"> <!--<![endif]-->
 
+<html lang="en">
 
 <head>
 
   <!-- Basic Page Needs
 
  ================================================== -->
 
   <meta charset="utf-8" />
 
-  <title>{% if page.title %}{{ page.title }}{% endif %}</title>
 
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <meta name="description" content="Font Awesome, the iconic font designed for Bootstrap">
 
   <meta name="author" content="Dave Gandy">
 
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <!--<meta name="viewport" content="initial-scale=1; maximum-scale=1">-->
 
+  <link rel="shortcut icon" href="{{ page.relative_path }}assets/ico/favicon.ico">
 
 
-  <!--[if lt IE 9]>
 
-  <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
 
-  <![endif]-->
 
+  <title>{% if page.title %}{{ page.title }}{% endif %}</title>
 
 
   <!-- CSS
 
- ================================================== -->
 
-
 
+  ================================================== -->
 
   <link rel="stylesheet" href="{{ page.relative_path }}assets/css/site.css">
 
   <link rel="stylesheet" href="{{ page.relative_path }}assets/css/pygments.css">
 
   <link rel="stylesheet" href="{{ page.relative_path }}assets/font-awesome/css/font-awesome.css">
 
-  <!--[if IE 7]>
 
-  <link rel="stylesheet" href="{{ page.relative_path }}assets/font-awesome/css/font-awesome-ie7.css">
 
+
 
+  <!--[if lt IE 9]>
 
+    <script src="{{ page.relative_path }}assets/js/html5shiv.js"></script>
 
+    <script src="{{ page.relative_path }}assets/js/respond.min.js"></script>
 
   <![endif]-->
 
-  <!-- Le fav and touch icons -->
 
-  <link rel="shortcut icon" href="{{ page.relative_path }}assets/ico/favicon.ico">
 
 
   <script type="text/javascript" src="//use.typekit.net/wnc7ioh.js"></script>
 
   <script type="text/javascript">try{Typekit.load();}catch(e){}</script>

+ 8 - 0
src/assets/js/html5shiv.js
View File 

@@ -0,0 +1,8 @@
 
+/*
 
+ HTML5 Shiv v3.6.2pre | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
 
+*/
 
+(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
 
+a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/\w+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}</style>";
 
+c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
 
+"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",version:"3.6.2pre",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);if(g)return a.createDocumentFragment();
 
+for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);

File diff suppressed because it is too large
+ 5 - 0
src/assets/js/respond.min.js


+ 8 - 1
src/assets/less/site/bootstrap/variables.less
View File 

@@ -114,4 +114,11 @@
 
 //@brand-success:         @green;
 
 //@brand-warning:         @yellow-dark;
 
 //@brand-danger:          @red;
 
-//@brand-info:            @blue;
 
+//@brand-info:            @blue;
 
+
 
+
 
+// Carousel
 
+@carousel-text-shadow:                        0 1px 0 rgba(255,255,255,0.25);
 
+
 
+@carousel-control-color:                      @jumbotron-bg-dark;
 
+@carousel-control-font-size:                  30px;

+ 16 - 16
src/assets/less/site/jumbotron-carousel.less
View File 

@@ -1,29 +1,29 @@
 
+@size: 220px;
 
 #icon-carousel {
 
-  @size: 220px;
 
   margin-top: @buffer-sm;
 
   font-size: @size;
 
   text-align: center;
 
   line-height: @size + 5;
 
   text-shadow: 0 2px 0 rgba(0,0,0,0.15);
 
-  a {
 
-    color: @jumbotron-bg-dark;
 
-    text-shadow: 0 1px 0 rgba(255,255,255,0.25);
 
+}
 
+.carousel-control {
 
+  top: @size + 10px;
 
+  .square(30px);
 
+  border-width: 0;
 
+  font-size: 30px;
 
+  line-height: 25px;
 
+  left: 300/2 - 36px;
 
+  &.right {
 
+    left: auto;
 
+    right: 300/2 - 36px;
 
   }
 
-  .carousel-control {
 
-    top: @size + 10px;
 
-    .square(30px);
 
-    background: none;
 
-    border-width: 0;
 
-    font-size: 30px;
 
-    line-height: 25px;
 
-    left: 300/2 - 36px;
 
-    &.right {
 
-      left: auto;
 
-      right: 300/2 - 36px;
 
-    }
 
+  &.right, &.left {
 
+    background-image: none;
 
+    filter: none;
 
   }
 
 }
 
 
+
 
 .jumbotron-carousel {
 
   padding-top: 40px;
 
   .btn {

File diff suppressed because it is too large
+ 0 - 1
src/assets/less/site/textured-bg.less


Some files were not shown because too many files changed in this diff