diff --git a/assets/css/site.css b/assets/css/site.css index 9d06bb20b..e30a627b1 100644 --- a/assets/css/site.css +++ b/assets/css/site.css @@ -7615,6 +7615,52 @@ label.error { font-size: 16px; padding-right: 20px; } +#banner.font-awesome-survey { + background-color: #8e8f94; + border-bottom: solid 1px #949599; +} +#banner.font-awesome-survey .btn-primary { + font-weight: bold; + color: #e8e9ea; + background-color: #68696e; + border-color: #434346; + border-bottom-width: 2px; + text-shadow: none; + border-radius: 4px; +} +#banner.font-awesome-survey .btn-primary:hover, +#banner.font-awesome-survey .btn-primary:focus, +#banner.font-awesome-survey .btn-primary:active, +#banner.font-awesome-survey .btn-primary.active, +.open > #banner.font-awesome-survey .btn-primary.dropdown-toggle { + color: #fff; + background-color: #2a2a2c; + border-color: #111112; + border-bottom-color: #000000; +} +#banner.font-awesome-survey .btn-primary:active, +#banner.font-awesome-survey .btn-primary.active, +.open > #banner.font-awesome-survey .btn-primary.dropdown-toggle { + background-image: none; +} +#banner.font-awesome-survey .btn-primary.disabled, +#banner.font-awesome-survey .btn-primary[disabled], +fieldset[disabled] #banner.font-awesome-survey .btn-primary, +#banner.font-awesome-survey .btn-primary.disabled:hover, +#banner.font-awesome-survey .btn-primary[disabled]:hover, +fieldset[disabled] #banner.font-awesome-survey .btn-primary:hover, +#banner.font-awesome-survey .btn-primary.disabled:focus, +#banner.font-awesome-survey .btn-primary[disabled]:focus, +fieldset[disabled] #banner.font-awesome-survey .btn-primary:focus, +#banner.font-awesome-survey .btn-primary.disabled:active, +#banner.font-awesome-survey .btn-primary[disabled]:active, +fieldset[disabled] #banner.font-awesome-survey .btn-primary:active, +#banner.font-awesome-survey .btn-primary.disabled.active, +#banner.font-awesome-survey .btn-primary[disabled].active, +fieldset[disabled] #banner.font-awesome-survey .btn-primary.active { + background-color: #68696e; + border-color: #434346; +} #banner.black-tie { background-color: #222222; border-bottom: solid 1px #2d2d2d; diff --git a/assets/font-awesome-4.5.0.zip b/assets/font-awesome-4.5.0.zip index 076d49015..95174c851 100644 Binary files a/assets/font-awesome-4.5.0.zip and b/assets/font-awesome-4.5.0.zip differ diff --git a/assets/js/site.js b/assets/js/site.js index 83fdc1112..bdb41be08 100644 --- a/assets/js/site.js +++ b/assets/js/site.js @@ -2,59 +2,65 @@ $(function () { $("#newsletter").validate(); var ads = [ + // { + // quote: "Take your icon game to the next level. Check out Fonticons, from the maker of Font Awesome.", + // class: "fonticons", + // url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_1_next_level&utm_campaign=promo_4.4_update", + // btn_text: "Gimme Some!" + // }, + // { + // quote: "Make your icons load 10x faster! Check out Fonticons, from the maker of Font Awesome.", + // class: "fonticons", + // url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_3_faster_loading&utm_campaign=promo_4.4_update", + // btn_text: "Gimme Some!" + // }, + // { + // quote: "Looking for other great icon sets? Check out Fonticons, from the maker of Font Awesome.", + // class: "fonticons", + // url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_4_more_icons&utm_campaign=promo_4.4_update", + // btn_text: "Gimme Some!" + // }, + // { + // quote: "Want to add your own icon? Check out Fonticons, from the maker of Font Awesome.", + // class: "fonticons", + // url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_6_your_own_icon&utm_campaign=promo_4.4_update", + // btn_text: "Gimme Some!" + // }, + // + // + // { + // quote: "Black Tie, from the creator of Font Awesome. On sale at the Kickstarter price for a limited time.", + // class: "black-tie", + // url: "http://blacktie.io/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_2_kickstarter&utm_campaign=promo_4.4_update", + // btn_text: "Check it Out!" + // }, + // { + // quote: "Want clean, minimalist icons? Check out Black Tie, the new multi-weight icon font from the maker of Font Awesome.", + // class: "black-tie", + // url: "http://blacktie.io/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_5_clean_minimalist&utm_campaign=promo_4.4_update", + // btn_text: "Check it Out!" + // }, + // { + // quote: "Want a different icon look? Check out Black Tie, our new multi-weight icon set.", + // class: "black-tie", + // url: "http://blacktie.io/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_6_different_look&utm_campaign=promo_4.4_update", + // btn_text: "Check it Out!" + // }, + // { + // quote: "Check out Black Tie, our new multi-weight icon set!", + // class: "black-tie", + // url: "http://blacktie.io/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_7_our_new_multi_weight&utm_campaign=promo_4.4_update", + // btn_text: "Check it Out!" + // }, { - quote: "Take your icon game to the next level. Check out Fonticons, from the maker of Font Awesome.", - class: "fonticons", - url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_1_next_level&utm_campaign=promo_4.4_update", - btn_text: "Gimme Some!" - }, - { - quote: "Make your icons load 10x faster! Check out Fonticons, from the maker of Font Awesome.", - class: "fonticons", - url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_3_faster_loading&utm_campaign=promo_4.4_update", - btn_text: "Gimme Some!" - }, - { - quote: "Looking for other great icon sets? Check out Fonticons, from the maker of Font Awesome.", - class: "fonticons", - url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_4_more_icons&utm_campaign=promo_4.4_update", - btn_text: "Gimme Some!" - }, - { - quote: "Want to add your own icon? Check out Fonticons, from the maker of Font Awesome.", - class: "fonticons", - url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_6_your_own_icon&utm_campaign=promo_4.4_update", - btn_text: "Gimme Some!" - }, - - - { - quote: "Black Tie, from the creator of Font Awesome. On sale at the Kickstarter price for a limited time.", - class: "black-tie", - url: "http://blacktie.io/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_2_kickstarter&utm_campaign=promo_4.4_update", - btn_text: "Check it Out!" - }, - { - quote: "Want clean, minimalist icons? Check out Black Tie, the new multi-weight icon font from the maker of Font Awesome.", - class: "black-tie", - url: "http://blacktie.io/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_5_clean_minimalist&utm_campaign=promo_4.4_update", - btn_text: "Check it Out!" - }, - { - quote: "Want a different icon look? Check out Black Tie, our new multi-weight icon set.", - class: "black-tie", - url: "http://blacktie.io/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_6_different_look&utm_campaign=promo_4.4_update", - btn_text: "Check it Out!" - }, - { - quote: "Check out Black Tie, our new multi-weight icon set!", - class: "black-tie", - url: "http://blacktie.io/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_7_our_new_multi_weight&utm_campaign=promo_4.4_update", - btn_text: "Check it Out!" + quote: "Help make Font Awesome more awesome! Fill out a short survey and give us your feedback.", + class: "font-awesome-survey", + url: "http://fontawesome.io/survey/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_survey&utm_campaign=promo_4.5_update", + btn_text: "Take the survey!" } ]; - //selectFonticonsAd(); + selectFonticonsAd(); // start the icon carousel $('#icon-carousel').carousel({ diff --git a/assets/less/site/banner-ad.less b/assets/less/site/banner-ad.less index df478c049..5a4bb9db5 100644 --- a/assets/less/site/banner-ad.less +++ b/assets/less/site/banner-ad.less @@ -16,6 +16,55 @@ padding-right: 20px; } + &.font-awesome-survey { + @survey-bg: #8E8F94; + background-color: @survey-bg; + border-bottom: solid 1px mix(@survey-bg, #fff, 95%); + + .btn-primary { + @color: mix(#fff,@survey-bg,80%); + @background: darken(@survey-bg, 15%); + @border: darken(@background, 15%); + font-weight: bold; + color: @color; + background-color: @background; + border-color: @border; + border-bottom-width: 2px; + text-shadow: none; + border-radius: 4px; + + &:hover, + &:focus, + &:active, + &.active, + .open > &.dropdown-toggle { + color: #fff; + background-color: darken(@border, 10%); + border-color: darken(@border, 20%); + border-bottom-color: darken(@border, 30%); + } + &:active, + &.active, + .open > &.dropdown-toggle { + background-image: none; + } + &.disabled, + &[disabled], + fieldset[disabled] & { + &, + &:hover, + &:focus, + &:active, + &.active { + background-color: @background; + border-color: @border; + } + } + } + + + } + &.black-tie { @black-tie-bg: #222222; background-color: @black-tie-bg; diff --git a/cheatsheet/index.html b/cheatsheet/index.html index e7f506cc6..638070897 100644 --- a/cheatsheet/index.html +++ b/cheatsheet/index.html @@ -48,7 +48,20 @@ })();
-