Author: carlucci
Date: Mon Apr 23 15:54:32 2012
New Revision: 1329303
URL: http://svn.apache.org/viewvc?rev=1329303&view=rev
Log:
RAVE-477: fixed bug with slideout not opening post-bootstrap merge
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
rave/trunk/rave-portal-resources/src/main/webapp/css/default.css
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp?rev=1329303&r1=1329302&r2=1329303&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
Mon Apr 23 15:54:32 2012
@@ -82,8 +82,7 @@
</c:choose>
</c:set>
-
-<div class="container-fluid">
+<div id="pageContent" class="container-fluid">
<nav>
<ul class="nav nav-tabs">
<c:forEach var="userPage" items="${pages}">
Modified: rave/trunk/rave-portal-resources/src/main/webapp/css/default.css
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css?rev=1329303&r1=1329302&r2=1329303&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/css/default.css (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/css/default.css Mon Apr 23
15:54:32 2012
@@ -794,11 +794,8 @@ span.error, label.error {
*display: inline;
}
-#pageContent, .pageContent {
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr =
"#D7D7D3", endColorstr = "#EBEBEB");
- background: -moz-linear-gradient(center top, #D7D7D3 0%, #EBEBEB 50%)
repeat scroll 0 0 transparent;
- background: -webkit-gradient(linear, left top, left bottom, from(#D7D7D3),
to(#EBEBEB));
- font-size: 1.1em;
+#pageContent {
+
}
.pageContent-mobile {