You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ca...@apache.org on 2012/04/20 20:09:06 UTC
svn commit: r1328471 - in
/rave/branches/bootstrap/rave-portal-resources/src/main/webapp:
WEB-INF/jsp/templates/base_layout.jsp WEB-INF/tags/third_party_head_js.tag
css/default.css css/rave.css
Author: carlucci
Date: Fri Apr 20 18:09:05 2012
New Revision: 1328471
URL: http://svn.apache.org/viewvc?rev=1328471&view=rev
Log:
Code in support of RAVE-567: Clean up implementation (Bootstrap). Patch supplied by Kristen Legacy.
Added:
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_head_js.tag
- copied, changed from r1328439, rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag
Modified:
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/default.css
rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/rave.css
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp?rev=1328471&r1=1328470&r2=1328471&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp Fri Apr 20 18:09:05 2012
@@ -22,14 +22,15 @@ under the License.
<%-- Expose any attributes defined in the tiles-defs.xml to the request scope for use in other tiles --%>
<tiles:importAttribute scope="request"/>
<!DOCTYPE html>
-<html>
+<html class="no-js">
<head>
<meta charset="ISO-8859-1"/>
<meta name="viewport" content="width=device-width" />
<title><rave:title /></title>
<rave:rave_css/>
<rave:custom_css/>
-</head>
+ <rave:third_party_head_js/>
+ </head>
<body>
<%-- Header Content --%>
<tiles:insertAttribute name="header"/>
Copied: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_head_js.tag (from r1328439, rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag)
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_head_js.tag?p2=rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_head_js.tag&p1=rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag&r1=1328439&r2=1328471&rev=1328471&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_head_js.tag Fri Apr 20 18:09:05 2012
@@ -19,18 +19,14 @@
--%>
<%--
This file includes references to all external third party javascript libraries required by rave
+ that must be loaded in the <HEAD> tag.
+
Overlay this file in custom extensions of Rave if you host these libraries internally and don't need
to pull them in externally.
+
+ NOTE: use this file sparingly and only for libraries that absolutely have to
+ be loaded in the <HEAD>. For improved performance all other JavaScript
+ libraries should be loaded from third_party_js.tag
--%>
-<%-- json script --%>
-<script src="//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
-<%-- jquery scripts --%>
-<script src="//ajax.aspnetcdn.com/ajax/jquery/jquery-1.7.2.min.js"></script>
-<script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.17/jquery-ui.min.js"></script>
-<script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.min.js"></script>
-<%-- bootstrap --%>
-<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/2.0.2/bootstrap.min.js"></script>
-<%-- google css3 mediaqueries script --%>
-<!--[if lt IE 9]><script src=//css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js></script><![endif]-->
-<%-- google html5 script --%>
-<!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
\ No newline at end of file
+<!-- Modernizr MUST come first!-->
+<script src="http://cdnjs.cloudflare.com/ajax/libs/modernizr/2.5.3/modernizr.min.js"></script>
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/default.css
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/default.css?rev=1328471&r1=1328470&r2=1328471&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/default.css (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/default.css Fri Apr 20 18:09:05 2012
@@ -20,7 +20,7 @@
-header {
+header, .navbar {
line-height: 3em;
}
@@ -76,30 +76,31 @@ dt {
}
/* Header */
-header {
+header{
+ display: block;
height: 3em;
+ width: 100%;
color: #F2F2F2;
background-color: #222222;
}
-header img {
+header img{
max-width: 150px;
}
-header a, header a:visited {
+header a, header a:visited,
+header a:hover{
color: #F2F2F2;
text-decoration: none;
padding: 2px;
font-weight: bold;
}
-header a:hover {
- color: #F2F2F2;
- background-color: #666666;
- text-decoration: none;
+header a.brand:hover{
+ cursor: default;
}
-header h1 {
+header h1{
text-transform: none;
font-size: 1.5em;
font-weight: bold;
@@ -159,7 +160,6 @@ header h1 {
.widget {
padding: 5px;
background-color: white;
- box-shadow: 2px 2px 4px #666666;
border-radius: 0 0 5px 5px;
height: 100%;
}
@@ -192,7 +192,12 @@ header h1 {
vertical-align: top;
margin-bottom: 20px;
/* prevents adjusting of other gadgets when gadget is being dragged */
- border: 1px solid transparent;
+ border: 1px solid #cfcfcf;
+ border-radius: 5px;
+ /*Can be replaced with bootstrap mixin: .box-shadow(1px 1px 3px rgba(0,0,0,.25))*/
+ box-shadow: 1px 1px 3px rgba(0,0,0,.25);
+ -webkit-box-shadow: 1px 1px 5px rgba(0,0,0,.25);
+ -moz-box-shadow: 2px 2px 2px rgba(0,0,0,.25);
}
.widget-wrapper-mobile {
@@ -215,10 +220,9 @@ header h1 {
border-color: #e6e6e6 #e6e6e6 #bfbfbf;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter: progid:dximagetransform.microsoft.gradient(enabled=false);
-
border-radius: 5px 5px 0 0;
padding: 4px 10px 4px;
- box-shadow: 2px 2px 4px #666666;
+
}
.widget-title-bar:hover {
@@ -442,13 +446,15 @@ header h1 {
}
.storeItem {
- border: 1px solid #B3C4CF;
+ border: 1px solid #ddd;
margin: 1em auto;
padding: 10px;
- background-color: #F2F2F2;
+ background-color: #f9f9f9;
color: black;
border-radius: 5px;
- box-shadow: 2px 2px 2px black;
+ box-shadow: 2px 2px 3px rgba(0,0,0,0.4);
+ -moz-box-shadow: 2px 2px 2px rgba(0,0,0,0.4);
+ -webkit-box-shadow: 2px 2px 4px rgba(0,0,0,0.4);
}
.storeItemFeatured {
@@ -900,7 +906,9 @@ span.error, label.error {
display: none;
}
-.profile-info-hidden {
+.profile-info-hidden,
+ .btn.profile-info-hidden,
+ .btn.primary-btn.profile-info-hidden{
display: none;
}
Modified: rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/rave.css
URL: http://svn.apache.org/viewvc/rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/rave.css?rev=1328471&r1=1328470&r2=1328471&view=diff
==============================================================================
--- rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/rave.css (original)
+++ rave/branches/bootstrap/rave-portal-resources/src/main/webapp/css/rave.css Fri Apr 20 18:09:05 2012
@@ -22,4 +22,20 @@
.menu-item-disabled a:hover {
color: #CCCCCC !important;
background-color: #FFFFFF;
+}
+/*Dropdowns in widget-bar are inheriting text-align: center. All dropdowns should left align by default.*/
+.dropdown-menu{
+ text-align: left;
+}
+
+/*Creating Outlined Tabs*/
+.nav-tabs.outlined{
+ margin: 0px 4px -1px 0;
+ border-bottom: none;
+}
+.tab-content.outlined{
+ border: 1px solid #ddd;
+ border-radius: 0 5px 5px 5px;
+ padding: 10px 2% 0;
+ width: 96%;
}
\ No newline at end of file