From cdd7ecfaf91f245ad5d7d2352f98d3d6f679d7ce Mon Sep 17 00:00:00 2001
From: Charles Oliveira <18oliveira.charles@gmail.com>
Date: Mon, 3 Nov 2014 15:22:45 -0200
Subject: [PATCH] Changed css to use colab's BS icons
---
colab/proxy/noosfero/static/noosfero/css/bootstrap-colab-style.css | 4 ++--
colab/proxy/noosfero/static/noosfero/css/fix.css | 64 ----------------------------------------------------------------
colab/proxy/noosfero/static/noosfero/css/screen.css | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.eot | Bin 14079 -> 0 bytes
colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.svg | 228 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.ttf | Bin 29512 -> 0 bytes
colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.woff | Bin 16448 -> 0 bytes
colab/proxy/noosfero/templates/proxy/noosfero.html | 2 +-
8 files changed, 67 insertions(+), 295 deletions(-)
delete mode 100644 colab/proxy/noosfero/static/noosfero/css/fix.css
create mode 100644 colab/proxy/noosfero/static/noosfero/css/screen.css
delete mode 100644 colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.eot
delete mode 100644 colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.svg
delete mode 100644 colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.ttf
delete mode 100644 colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.woff
diff --git a/colab/proxy/noosfero/static/noosfero/css/bootstrap-colab-style.css b/colab/proxy/noosfero/static/noosfero/css/bootstrap-colab-style.css
index 1ce5568..c8cef10 100644
--- a/colab/proxy/noosfero/static/noosfero/css/bootstrap-colab-style.css
+++ b/colab/proxy/noosfero/static/noosfero/css/bootstrap-colab-style.css
@@ -2138,8 +2138,8 @@
}
@font-face {
font-family: 'Glyphicons Halflings';
- src: url('../fonts/glyphicons-halflings-regular.eot');
- src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
+ src: url('../../third-party/bootstrap/fonts/glyphicons-halflings-regular.eot');
+ src: url('../../third-party/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../third-party/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../third-party/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../third-party/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
}
.colab-style .glyphicon {
position: relative;
diff --git a/colab/proxy/noosfero/static/noosfero/css/fix.css b/colab/proxy/noosfero/static/noosfero/css/fix.css
deleted file mode 100644
index 408dbae..0000000
--- a/colab/proxy/noosfero/static/noosfero/css/fix.css
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Fix search input size */
-.colab-style #header-searchbox {
- width: 200px;
-}
-
-/* Fix positioning at the navigation bar */
-.colab-style .navbar-default .navbar-brand,
-.colab-style .navbar a.dropdown-toggle.user {
- padding: 0;
- margin-top: 5px;
- margin-left: 10px;
-}
-
-/* Fix lefter logo */
-.colab-style .navbar-brand img {
- width: 192px;
- height: 40px;
-}
-
-/* Make menus never disapear */
-.colab-style li.dropdown {
- display: block!important;
-}
-
-/* Fix righter profile image icon */
-.colab-style li#user-menu a img {
- margin-right: 4px;
-}
-
-/* Fix user menu pop up */
-.colab-style #user-menu .wrapper {
- padding: 3px 10px;
- white-space: nowrap;
-}
-
-.colab-style #user-menu .dropdown-menu .thumbnail {
- width: 100px;
- display: inline-block;
-}
-
-.colab-style #user-menu .user-info {
- display: inline-block;
- vertical-align: top;
- padding-left: 5px;
-}
-
-.colab-style #user-menu .user-info span {
- display: block;
-}
-
-.colab-style #user-menu .wrapper a {
- margin: 5px 0;
-}
-
-.colab-style .quiet {
- color: #999;
- font-size: 85%;
-}
-/* end of Fix user menu pop up */
-
-/* Increase container margin because of noosfero pup ups */
-div#main-content {
- margin-top: 100px;
-}
diff --git a/colab/proxy/noosfero/static/noosfero/css/screen.css b/colab/proxy/noosfero/static/noosfero/css/screen.css
new file mode 100644
index 0000000..408dbae
--- /dev/null
+++ b/colab/proxy/noosfero/static/noosfero/css/screen.css
@@ -0,0 +1,64 @@
+/* Fix search input size */
+.colab-style #header-searchbox {
+ width: 200px;
+}
+
+/* Fix positioning at the navigation bar */
+.colab-style .navbar-default .navbar-brand,
+.colab-style .navbar a.dropdown-toggle.user {
+ padding: 0;
+ margin-top: 5px;
+ margin-left: 10px;
+}
+
+/* Fix lefter logo */
+.colab-style .navbar-brand img {
+ width: 192px;
+ height: 40px;
+}
+
+/* Make menus never disapear */
+.colab-style li.dropdown {
+ display: block!important;
+}
+
+/* Fix righter profile image icon */
+.colab-style li#user-menu a img {
+ margin-right: 4px;
+}
+
+/* Fix user menu pop up */
+.colab-style #user-menu .wrapper {
+ padding: 3px 10px;
+ white-space: nowrap;
+}
+
+.colab-style #user-menu .dropdown-menu .thumbnail {
+ width: 100px;
+ display: inline-block;
+}
+
+.colab-style #user-menu .user-info {
+ display: inline-block;
+ vertical-align: top;
+ padding-left: 5px;
+}
+
+.colab-style #user-menu .user-info span {
+ display: block;
+}
+
+.colab-style #user-menu .wrapper a {
+ margin: 5px 0;
+}
+
+.colab-style .quiet {
+ color: #999;
+ font-size: 85%;
+}
+/* end of Fix user menu pop up */
+
+/* Increase container margin because of noosfero pup ups */
+div#main-content {
+ margin-top: 100px;
+}
diff --git a/colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.eot b/colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.eot
deleted file mode 100644
index 87eaa43..0000000
Binary files a/colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.eot and /dev/null differ
diff --git a/colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.svg b/colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.svg
deleted file mode 100644
index 5fee068..0000000
--- a/colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.svg
+++ /dev/null
@@ -1,228 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.ttf b/colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.ttf
deleted file mode 100644
index be784dc..0000000
Binary files a/colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.ttf and /dev/null differ
diff --git a/colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.woff b/colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.woff
deleted file mode 100644
index 2cc3e48..0000000
Binary files a/colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.woff and /dev/null differ
diff --git a/colab/proxy/noosfero/templates/proxy/noosfero.html b/colab/proxy/noosfero/templates/proxy/noosfero.html
index ae8e68e..5b7aef6 100644
--- a/colab/proxy/noosfero/templates/proxy/noosfero.html
+++ b/colab/proxy/noosfero/templates/proxy/noosfero.html
@@ -4,7 +4,7 @@
{% block head_css %}
-
+
--
libgit2 0.21.2