diff --git a/Gemfile.lock b/Gemfile.lock index b898d9d52..9394f2dd5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,6 +62,3 @@ DEPENDENCIES safe_yaml (~> 1.0.4) sass (~> 3.0) therubyracer - -BUNDLED WITH - 1.10.6 diff --git a/src/_includes/navbar.html b/src/_includes/navbar.html index 48b5ade07..830f06762 100644 --- a/src/_includes/navbar.html +++ b/src/_includes/navbar.html @@ -19,7 +19,7 @@ Toggle navigation - +
diff --git a/src/assets/js/site.js b/src/assets/js/site.js index 1bf04a071..75a7c7158 100644 --- a/src/assets/js/site.js +++ b/src/assets/js/site.js @@ -1,64 +1,76 @@ $(function () { - $("#newsletter").validate(); + $("#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!" - }, + 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!" - } - ]; - - selectFonticonsAd(); - - // start the icon carousel - $('#icon-carousel').carousel({ - interval: 5000 - }); - - $('[data-toggle="popover"]').popover(); - - function selectFonticonsAd() { - random_number = Math.floor(Math.random() * ads.length); - random_ad = ads[random_number]; - - $('#banner').addClass(random_ad.class); - $('#rotating-message').html(random_ad.quote); - $('#rotating-url').attr("href", random_ad.url); - $('#rotating-url').html(random_ad.btn_text); - $('#banner').collapse('show'); + { + 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!" } + ]; + + selectFonticonsAd(); + + // start the icon carousel + $('#icon-carousel').carousel({ + interval: 5000 + }); + + $('[data-toggle="popover"]').popover(); + + function selectFonticonsAd() { + random_number = Math.floor(Math.random() * ads.length); + random_ad = ads[random_number]; + + $('#banner').addClass(random_ad.class); + $('#rotating-message').html(random_ad.quote); + $('#rotating-url').attr("href", random_ad.url); + $('#rotating-url').html(random_ad.btn_text); + $('#banner').collapse('show'); + } }); diff --git a/src/assets/less/site.less b/src/assets/less/site.less index c6fa221c1..f31be8dbb 100644 --- a/src/assets/less/site.less +++ b/src/assets/less/site.less @@ -8,6 +8,7 @@ @import "site/bootstrap/jumbotron"; @import "site/bootstrap/wells"; @import "site/bootstrap/type"; +@import "site/bootstrap/alerts"; @import "site/bootstrap/modals"; @import "site/layout"; @@ -25,6 +26,7 @@ @import "site/fusion-ad"; @import "site/bsap-ad"; @import "site/sumome"; +@import "site/algolia"; @import "site/responsive/screen-lg"; @import "site/responsive/screen-md"; diff --git a/src/assets/less/site/algolia.less b/src/assets/less/site/algolia.less new file mode 100644 index 000000000..4e5383ac9 --- /dev/null +++ b/src/assets/less/site/algolia.less @@ -0,0 +1,11 @@ +.algolia { + text-align: center; + a { + color: @text-color; + &:hover { color: @link-hover-color; } + } + .fas-algolia { + font-size: 32px; + vertical-align: middle; + } +} \ No newline at end of file diff --git a/src/assets/less/site/bootstrap/alerts.less b/src/assets/less/site/bootstrap/alerts.less new file mode 100644 index 000000000..a82f5ef47 --- /dev/null +++ b/src/assets/less/site/bootstrap/alerts.less @@ -0,0 +1 @@ +.alert-link { text-decoration: underline; } diff --git a/src/assets/less/site/bootstrap/variables.less b/src/assets/less/site/bootstrap/variables.less index 1d08aa668..655866484 100644 --- a/src/assets/less/site/bootstrap/variables.less +++ b/src/assets/less/site/bootstrap/variables.less @@ -107,6 +107,10 @@ @state-info-bg: @blue-lighter; @state-info-border: darken(spin(@state-info-bg, -10), 7%); +@state-danger-text: @brand-danger; +@state-danger-bg: mix(@state-danger-text,#fff,10%); +@state-danger-border: darken(spin(@state-danger-bg, -10), 5%); + // Carousel @carousel-text-shadow: 0 1px 0 rgba(255,255,255,0.25); diff --git a/src/assets/less/site/search.less b/src/assets/less/site/search.less index 3304dc87b..ca0064615 100644 --- a/src/assets/less/site/search.less +++ b/src/assets/less/site/search.less @@ -7,7 +7,7 @@ label { position: absolute; left: 17px; - top: 50px; + top: 51px; } #search-input, .hint { diff --git a/src/icons.html b/src/icons.html index 7d13f5196..e6f61a17c 100644 --- a/src/icons.html +++ b/src/icons.html @@ -22,16 +22,16 @@ relative_path: ../ {% include stripe-ad.html %}
-
+
-
+
@@ -68,11 +68,25 @@ relative_path: ../ <% }); %>
<% } else { %> -