From c892b950e0f8171d9c9865e26924892a890408d6 Mon Sep 17 00:00:00 2001 From: Braulio Bhavamitra Date: Fri, 31 Jul 2015 19:58:00 -0300 Subject: [PATCH] responsive: support glyphicons --- plugins/responsive/public/bootstrap/all.scss | 1 + plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.svg | 288 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes public/designs/icons/awesome/style.scss | 10 ++++++---- 7 files changed, 295 insertions(+), 4 deletions(-) create mode 100644 plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.eot create mode 100644 plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.svg create mode 100644 plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.ttf create mode 100644 plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.woff create mode 100644 plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.woff2 diff --git a/plugins/responsive/public/bootstrap/all.scss b/plugins/responsive/public/bootstrap/all.scss index 1b561d3..f334d68 100644 --- a/plugins/responsive/public/bootstrap/all.scss +++ b/plugins/responsive/public/bootstrap/all.scss @@ -1,3 +1,4 @@ +$icon-font-path: '/plugins/responsive/bootstrap/fonts/' @import 'variables'; @import 'theme_variables'; diff --git a/plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.eot b/plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.eot new file mode 100644 index 0000000..b93a495 Binary files /dev/null and b/plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.eot differ diff --git a/plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.svg b/plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.svg new file mode 100644 index 0000000..94fb549 --- /dev/null +++ b/plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.svg @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.ttf b/plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.ttf new file mode 100644 index 0000000..1413fc6 Binary files /dev/null and b/plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.ttf differ diff --git a/plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.woff b/plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.woff new file mode 100644 index 0000000..9e61285 Binary files /dev/null and b/plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.woff differ diff --git a/plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.woff2 new file mode 100644 index 0000000..64539b5 Binary files /dev/null and b/plugins/responsive/public/bootstrap/fonts/glyphicons-halflings-regular.woff2 differ diff --git a/public/designs/icons/awesome/style.scss b/public/designs/icons/awesome/style.scss index ec65a15..9d0cda1 100644 --- a/public/designs/icons/awesome/style.scss +++ b/public/designs/icons/awesome/style.scss @@ -6,14 +6,16 @@ $fa-font-path: "fonts"; // noosfero icons stylesheets -[class*=' icon-']:before, -[class^='icon-']:before, -[class*=' icon-next']:after, -[class^='icon-next']:after { +:not(.glyphicon) { + &[class*=' icon-']:before, + &[class^='icon-']:before, + &[class*=' icon-next']:after, + &[class^='icon-next']:after { line-height: 1; width: 1.7em; text-align: center; @include fa-icon; + } } .icon-add:before, -- libgit2 0.21.2