diff --git a/assets/css/site.css b/assets/css/site.css index e30a627b1..a15a42ee9 100644 --- a/assets/css/site.css +++ b/assets/css/site.css @@ -7662,14 +7662,14 @@ fieldset[disabled] #banner.font-awesome-survey .btn-primary.active { border-color: #434346; } #banner.black-tie { - background-color: #222222; - border-bottom: solid 1px #2d2d2d; + background-color: #2e2e2e; + border-bottom: solid 1px #383838; } #banner.black-tie .btn-primary { font-weight: bold; - color: #222222; - background-color: #e9e9e9; - border-color: #a7a7a7; + color: #e0e0e0; + background-color: #212121; + border-color: #141414; border-bottom-width: 2px; text-shadow: none; border-radius: 4px; @@ -7680,9 +7680,9 @@ fieldset[disabled] #banner.font-awesome-survey .btn-primary.active { #banner.black-tie .btn-primary.active, .open > #banner.black-tie .btn-primary.dropdown-toggle { color: #fff; - background-color: #9f9f9f; - border-color: #888888; - border-bottom-color: #797979; + background-color: #141414; + border-color: #000000; + border-bottom-color: #000000; } #banner.black-tie .btn-primary:active, #banner.black-tie .btn-primary.active, @@ -7704,54 +7704,54 @@ fieldset[disabled] #banner.black-tie .btn-primary:active, #banner.black-tie .btn-primary.disabled.active, #banner.black-tie .btn-primary[disabled].active, fieldset[disabled] #banner.black-tie .btn-primary.active { - background-color: #e9e9e9; - border-color: #a7a7a7; + background-color: #212121; + border-color: #141414; } -#banner.fonticons { - background-color: #fa8144; - border-bottom: solid 1px #d97240; +#banner.fort-awesome { + background-color: #242735; + border-bottom: solid 1px #050608; } -#banner.fonticons .btn-primary { +#banner.fort-awesome .btn-primary { font-weight: bold; color: #ffffff; - background-color: #33343e; - border-color: #1c1e29; + background-color: #454753; + border-color: #1a1c26; border-bottom-width: 2px; text-shadow: none; border-radius: 4px; } -#banner.fonticons .btn-primary:hover, -#banner.fonticons .btn-primary:focus, -#banner.fonticons .btn-primary:active, -#banner.fonticons .btn-primary.active, -.open > #banner.fonticons .btn-primary.dropdown-toggle { +#banner.fort-awesome .btn-primary:hover, +#banner.fort-awesome .btn-primary:focus, +#banner.fort-awesome .btn-primary:active, +#banner.fort-awesome .btn-primary.active, +.open > #banner.fort-awesome .btn-primary.dropdown-toggle { color: #fff; - background-color: #161720; - border-color: #030305; + background-color: #424761; + border-color: #010101; border-bottom-color: #000000; } -#banner.fonticons .btn-primary:active, -#banner.fonticons .btn-primary.active, -.open > #banner.fonticons .btn-primary.dropdown-toggle { +#banner.fort-awesome .btn-primary:active, +#banner.fort-awesome .btn-primary.active, +.open > #banner.fort-awesome .btn-primary.dropdown-toggle { background-image: none; } -#banner.fonticons .btn-primary.disabled, -#banner.fonticons .btn-primary[disabled], -fieldset[disabled] #banner.fonticons .btn-primary, -#banner.fonticons .btn-primary.disabled:hover, -#banner.fonticons .btn-primary[disabled]:hover, -fieldset[disabled] #banner.fonticons .btn-primary:hover, -#banner.fonticons .btn-primary.disabled:focus, -#banner.fonticons .btn-primary[disabled]:focus, -fieldset[disabled] #banner.fonticons .btn-primary:focus, -#banner.fonticons .btn-primary.disabled:active, -#banner.fonticons .btn-primary[disabled]:active, -fieldset[disabled] #banner.fonticons .btn-primary:active, -#banner.fonticons .btn-primary.disabled.active, -#banner.fonticons .btn-primary[disabled].active, -fieldset[disabled] #banner.fonticons .btn-primary.active { - background-color: #33343e; - border-color: #1c1e29; +#banner.fort-awesome .btn-primary.disabled, +#banner.fort-awesome .btn-primary[disabled], +fieldset[disabled] #banner.fort-awesome .btn-primary, +#banner.fort-awesome .btn-primary.disabled:hover, +#banner.fort-awesome .btn-primary[disabled]:hover, +fieldset[disabled] #banner.fort-awesome .btn-primary:hover, +#banner.fort-awesome .btn-primary.disabled:focus, +#banner.fort-awesome .btn-primary[disabled]:focus, +fieldset[disabled] #banner.fort-awesome .btn-primary:focus, +#banner.fort-awesome .btn-primary.disabled:active, +#banner.fort-awesome .btn-primary[disabled]:active, +fieldset[disabled] #banner.fort-awesome .btn-primary:active, +#banner.fort-awesome .btn-primary.disabled.active, +#banner.fort-awesome .btn-primary[disabled].active, +fieldset[disabled] #banner.fort-awesome .btn-primary.active { + background-color: #454753; + border-color: #1a1c26; } #fusionads { float: right; diff --git a/assets/font-awesome-4.5.0.zip b/assets/font-awesome-4.5.0.zip index 413998c32..3a5b287d6 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/img/logo-approveme.png b/assets/img/logo-approveme.png index 9be7dfd0b..3d9a0a476 100644 Binary files a/assets/img/logo-approveme.png and b/assets/img/logo-approveme.png differ diff --git a/assets/js/site.js b/assets/js/site.js index 259bf82cd..f64dde81d 100644 --- a/assets/js/site.js +++ b/assets/js/site.js @@ -2,65 +2,59 @@ $(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: "Help make Font Awesome more awesome! Fill out our 11-minute survey to 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!" + quote: "Take your icon game to the next level. Check out Fort Awesome, from the maker of Font Awesome.", + class: "fort-awesome", + url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_1_next_level&utm_campaign=promo_4.5_update", + btn_text: "Gimme Some!" + }, + { + quote: "Make your icons load 10x faster! Check out Fort Awesome, from the maker of Font Awesome.", + class: "fort-awesome", + url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_3_faster_loading&utm_campaign=promo_4.5_update", + btn_text: "Gimme Some!" + }, + { + quote: "Looking for other great icon sets? Check out Fort Awesome, from the maker of Font Awesome.", + class: "fort-awesome", + url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_4_more_icons&utm_campaign=promo_4.5_update", + btn_text: "Gimme Some!" + }, + { + quote: "Want to add your own icon? Check out Fort Awesome, from the maker of Font Awesome.", + class: "fort-awesome", + url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_6_your_own_icon&utm_campaign=promo_4.5_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.5_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.5_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.5_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.5_update", + btn_text: "Check it Out!" } ]; - selectFonticonsAd(); + selectAd(); // start the icon carousel $('#icon-carousel').carousel({ @@ -70,7 +64,7 @@ $(function () { $('[data-toggle="tooltip"]').tooltip(); $('[data-toggle="popover"]').popover(); - function selectFonticonsAd() { + function selectAd() { random_number = Math.floor(Math.random() * ads.length); random_ad = ads[random_number]; diff --git a/assets/less/site/banner-ad.less b/assets/less/site/banner-ad.less index 5a4bb9db5..0ce85dea8 100644 --- a/assets/less/site/banner-ad.less +++ b/assets/less/site/banner-ad.less @@ -66,14 +66,14 @@ } &.black-tie { - @black-tie-bg: #222222; + @black-tie-bg: #2E2E2E; background-color: @black-tie-bg; border-bottom: solid 1px mix(@black-tie-bg, #fff, 95%); .btn-primary { - @color: @black-tie-bg; - @background: mix(#fff,@black-tie-bg,90%); - @border: mix(#fff,@black-tie-bg,60%); + @color: mix(#fff, @black-tie-bg, 85%); + @background: darken(@black-tie-bg, 5%); + @border: darken(@black-tie-bg, 10%); font-weight: bold; color: @color; background-color: @background; @@ -88,7 +88,7 @@ &.active, .open > &.dropdown-toggle { color: #fff; - background-color: darken(@border, 3%); + background-color: darken(@background, 5%); border-color: darken(@border, 12%); border-bottom-color: darken(@border, 18%); } @@ -112,15 +112,16 @@ } } - &.fonticons { - @fonticons-bg: #1c1e29; - @fonticons-orange: desaturate(#ff7f3f, 5%); - background-color: @fonticons-orange; - border-bottom: solid 1px mix(@fonticons-bg, @fonticons-orange, 15%); + &.fort-awesome { + @fort-awesome-color: #1C1E29; + @fort-awesome-color-accent: #525879; + @fort-awesome-bg: mix(@fort-awesome-color-accent, @fort-awesome-color, 15%); + background-color: @fort-awesome-bg; + border-bottom: solid 1px mix(@fort-awesome-bg, #000, 15%); .btn-primary { @color: #fff; - @background: mix(#fff,@fonticons-bg,10%); - @border: @fonticons-bg; + @background: mix(#fff,@fort-awesome-bg,15%); + @border: darken(@fort-awesome-bg, 5%); font-weight: bold; color: @color; background-color: @background; @@ -135,7 +136,7 @@ &.active, .open > &.dropdown-toggle { color: #fff; - background-color: darken(@border, 3%); + background-color: mix(@fort-awesome-color, @fort-awesome-color-accent, 30%); border-color: darken(@border, 12%); border-bottom-color: darken(@border, 18%); } diff --git a/cheatsheet/index.html b/cheatsheet/index.html index 638070897..429368648 100644 --- a/cheatsheet/index.html +++ b/cheatsheet/index.html @@ -5785,7 +5785,7 @@