Skip to content

Instantly share code, notes, and snippets.

@apetro

apetro/82a109b33d4007b68586edd70b7800fbe2af217a.diff

Created May 8, 2014 15:27
Show Gist options
  • Save apetro/459fca11e2cd7c016eeb to your computer and use it in GitHub Desktop.
Save apetro/459fca11e2cd7c016eeb to your computer and use it in GitHub Desktop.
Download ZIP
Changing container to container-fluid
Raw
82a109b33d4007b68586edd70b7800fbe2af217a.diff
diff --git a/uportal-war/src/main/resources/layout/theme/respondr/regions.xsl b/uportal-war/src/main/resources/layout/theme/respondr/regions.xsl
index 20c7f53..0a51e67 100644
--- a/uportal-war/src/main/resources/layout/theme/respondr/regions.xsl
+++ b/uportal-war/src/main/resources/layout/theme/respondr/regions.xsl
@@ -62,7 +62,7 @@
-->
<xsl:template name="region.hidden-top">
<xsl:if test="//region[@name='hidden-top']/channel">
- <div id="region-page-top-hidden" class="container">
+ <div id="region-page-top-hidden" class="container-fluid">
<div class="row">
<div class="col-sm-12">
<xsl:for-each select="//region[@name='hidden-top']/channel">
@@ -81,7 +81,7 @@
-->
<xsl:template name="region.page-top">
<xsl:if test="//region[@name='page-top']/channel">
- <div id="region-page-top" class="container">
+ <div id="region-page-top" class="container-fluid">
<div class="row">
<div class="col-sm-12">
<xsl:for-each select="//region[@name='page-top']/channel">
@@ -157,7 +157,7 @@
-->
<xsl:template name="region.header-bottom">
<xsl:if test="//region[@name='header-bottom']/channel">
- <div id="region-header-bottom" class="container">
+ <div id="region-header-bottom" class="container-fluid">
<div class="row">
<div class="col-sm-12">
<xsl:for-each select="//region[@name='header-bottom']/channel">
@@ -238,7 +238,7 @@
-->
<xsl:template name="region.page-bottom">
<xsl:if test="//region[@name='page-bottom']/channel">
- <div id="region-page-bottom" class="container">
+ <div id="region-page-bottom" class="container-fluid">
<div class="row">
<div class="col-sm-12">
<xsl:for-each select="//region[@name='page-bottom']/channel">
@@ -257,7 +257,7 @@
-->
<xsl:template name="region.hidden-bottom">
<xsl:if test="//region[@name='hidden-bottom']/channel">
- <div id="region-page-bottom-hidden" class="container">
+ <div id="region-page-bottom-hidden" class="container-fluid">
<div class="row">
<div class="col-sm-12">
<xsl:for-each select="//region[@name='hidden-bottom']/channel">
@@ -277,7 +277,7 @@
<xsl:template name="region.customize">
<xsl:if test="upAuth:hasPermission('UP_SYSTEM', 'CUSTOMIZE', 'ALL')">
<xsl:if test="//region[@name='customize']/channel">
- <div id="region-customize" class="container">
+ <div id="region-customize" class="container-fluid">
<div id="customizeOptionsWrapper">
<div id="customizeOptions" class="collapse">
<xsl:for-each select="//region[@name='customize']/channel">
diff --git a/uportal-war/src/main/resources/layout/theme/respondr/respondr.xsl b/uportal-war/src/main/resources/layout/theme/respondr/respondr.xsl
index aac0320..edd0a50 100644
--- a/uportal-war/src/main/resources/layout/theme/respondr/respondr.xsl
+++ b/uportal-war/src/main/resources/layout/theme/respondr/respondr.xsl
@@ -303,7 +303,7 @@
-->
<xsl:template name="footer.nav">
<footer class="portal-footer-nav" role="contentinfo">
- <div class="container">
+ <div class="container-fluid">
<!--
| Tab layout:
@@ -373,7 +373,7 @@
-->
<xsl:template name="footer.legal">
<footer class="portal-footer-legal" role="contentinfo">
- <div class="container">
+ <div class="container-fluid">
<div class="portal-power">
<h2><a href="http://www.jasig.org/uportal" target="_blank">Powered by uPortal</a>, an open-source project by <a href="http://www.jasig.org" title="Jasig.org - Open for Higher Education">Jasig</a></h2>
<ul>
@@ -657,7 +657,7 @@
</head>
<body class="up dashboard portal fl-theme-mist">
<div id="up-notification"></div>
- <div class="global-container">
+ <div class="container-fluid global-container">
<div class="row">
<xsl:variable name="GLOBAL_SIDEBAR_LEFT_COLUMNS">
<xsl:choose>
@@ -674,10 +674,10 @@
<xsl:call-template name="region.page-top" />
<header class="portal-header" role="banner">
<div class="portal-global">
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<xsl:if test="//region[@name='global-sidebar-left']/channel">
- <div class="col-xs-1">
+ <div class="col-xs-1 col-lg-0">
<div id="global-sidebar-left-hamburger" class="pull-left hidden-lg">
<button class="button" style="background: inherit; border: none; padding: .5em;">
<span class="glyphicon glyphicon-align-justify"></span>
@@ -710,7 +710,7 @@
</div>
</div>
</div>
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<xsl:call-template name="region.header-left" />
<xsl:call-template name="region.header-right" />
@@ -721,7 +721,7 @@
</header>
<div id="portalPageBody" class="portal-content" role="main"><!-- #portalPageBody selector is used with BackgroundPreference framework portlet -->
<xsl:call-template name="region.customize" />
- <div class="container">
+ <div class="container-fluid">
<div class="row"><!-- Fixed-grid row containing content (pre-, regular, and post-), plus optionally sidebar-left, sidebar-right, or both -->
<xsl:call-template name="region.sidebar-left" />
<!-- The following div must know how many columns are taken by sidebar-left and sidebar-right, if any -->
@@ -831,7 +831,7 @@
<header class="portal-header" role="banner">
<div class="portal-global">
<div class="navbar navbar-fixed-top" role="navigation">
- <div class="container">
+ <div class="container-fluid">
<div class="portal-user">
<div class="navbar-header">
<a href="/uPortal" title="{upMsg:getMessage('return.to.dashboard.view', $USER_LANG)}" class="up-portlet-control hide-content pull-left fa fa-home portal-return-to-dashboard"></a>
@@ -860,7 +860,7 @@
</header>
</div>
<div class="portal-sticky-content" role="main">
- <div class="portal-sticky-container container">
+ <div class="portal-sticky-container container-fluid">
<div class="row">
<div id="portalPageBodyMessage" class="col-md-12"></div>
</div>
diff --git a/uportal-war/src/main/resources/layout/theme/respondr/uw-specific.xsl b/uportal-war/src/main/resources/layout/theme/respondr/uw-specific.xsl
index 13a1c71..a7bfd06 100644
--- a/uportal-war/src/main/resources/layout/theme/respondr/uw-specific.xsl
+++ b/uportal-war/src/main/resources/layout/theme/respondr/uw-specific.xsl
@@ -53,7 +53,7 @@
version="1.0">
<xsl:template name="uw.footer">
<footer class="portal-footer-legal" role="contentinfo">
- <div class="container">
+ <div class="container-fluid">
<div class="portal-power">
<xsl:variable name="feedbackUrl">
<xsl:call-template name="portalUrl">
diff --git a/uportal-war/src/main/webapp/WEB-INF/jsp/Invoker/greeting.jsp b/uportal-war/src/main/webapp/WEB-INF/jsp/Invoker/greeting.jsp
index daa0eeb..c151177 100644
--- a/uportal-war/src/main/webapp/WEB-INF/jsp/Invoker/greeting.jsp
+++ b/uportal-war/src/main/webapp/WEB-INF/jsp/Invoker/greeting.jsp
@@ -27,4 +27,4 @@
</c:choose>
</c:set>
-<span class="user-name">${greeting} ${userInfo['displayName']}</span>
+<span class="user-name">${greeting}&nbsp;${userInfo['displayName']}</span>
diff --git a/uportal-war/src/main/webapp/media/skins/respondr/common/less/header.less b/uportal-war/src/main/webapp/media/skins/respondr/common/less/header.less
index c7865a0..7790e2f 100644
--- a/uportal-war/src/main/webapp/media/skins/respondr/common/less/header.less
+++ b/uportal-war/src/main/webapp/media/skins/respondr/common/less/header.less
@@ -29,7 +29,7 @@
}
.portal-global {
- top: 10px;
+ padding-top: 10px;
right: 0;
.logout-launcher {
@@ -75,7 +75,7 @@ h1.portal-logo {
@media only screen and (min-width: 769px) {
.portal-global {
position: relative;
- top: 0;
+ padding-top: 10px;
left: 0;
.gradient(@portal-global-background-color, @portal-global-background-gradient);
border-bottom: 1px solid @portal-global-border-color;
@@ -111,3 +111,7 @@ h1.portal-logo {
z-index: 99999;
width: 100%;
}
+
+div.global-container {
+ padding: 0;
+}
Raw
82a109b33d4007b68586edd70b7800fbe2af217a.patch
From 82a109b33d4007b68586edd70b7800fbe2af217a Mon Sep 17 00:00:00 2001
From: Tim Levett <[email protected]>
Date: Thu, 1 May 2014 13:31:55 -0500
Subject: [PATCH] MUMUP-509: cleanup header
---
.../main/resources/layout/theme/respondr/regions.xsl | 12 ++++++------
.../main/resources/layout/theme/respondr/respondr.xsl | 18 +++++++++---------
.../resources/layout/theme/respondr/uw-specific.xsl | 2 +-
.../src/main/webapp/WEB-INF/jsp/Invoker/greeting.jsp | 2 +-
.../media/skins/respondr/common/less/header.less | 8 ++++++--
5 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/uportal-war/src/main/resources/layout/theme/respondr/regions.xsl b/uportal-war/src/main/resources/layout/theme/respondr/regions.xsl
index 20c7f53..0a51e67 100644
--- a/uportal-war/src/main/resources/layout/theme/respondr/regions.xsl
+++ b/uportal-war/src/main/resources/layout/theme/respondr/regions.xsl
@@ -62,7 +62,7 @@
-->
<xsl:template name="region.hidden-top">
<xsl:if test="//region[@name='hidden-top']/channel">
- <div id="region-page-top-hidden" class="container">
+ <div id="region-page-top-hidden" class="container-fluid">
<div class="row">
<div class="col-sm-12">
<xsl:for-each select="//region[@name='hidden-top']/channel">
@@ -81,7 +81,7 @@
-->
<xsl:template name="region.page-top">
<xsl:if test="//region[@name='page-top']/channel">
- <div id="region-page-top" class="container">
+ <div id="region-page-top" class="container-fluid">
<div class="row">
<div class="col-sm-12">
<xsl:for-each select="//region[@name='page-top']/channel">
@@ -157,7 +157,7 @@
-->
<xsl:template name="region.header-bottom">
<xsl:if test="//region[@name='header-bottom']/channel">
- <div id="region-header-bottom" class="container">
+ <div id="region-header-bottom" class="container-fluid">
<div class="row">
<div class="col-sm-12">
<xsl:for-each select="//region[@name='header-bottom']/channel">
@@ -238,7 +238,7 @@
-->
<xsl:template name="region.page-bottom">
<xsl:if test="//region[@name='page-bottom']/channel">
- <div id="region-page-bottom" class="container">
+ <div id="region-page-bottom" class="container-fluid">
<div class="row">
<div class="col-sm-12">
<xsl:for-each select="//region[@name='page-bottom']/channel">
@@ -257,7 +257,7 @@
-->
<xsl:template name="region.hidden-bottom">
<xsl:if test="//region[@name='hidden-bottom']/channel">
- <div id="region-page-bottom-hidden" class="container">
+ <div id="region-page-bottom-hidden" class="container-fluid">
<div class="row">
<div class="col-sm-12">
<xsl:for-each select="//region[@name='hidden-bottom']/channel">
@@ -277,7 +277,7 @@
<xsl:template name="region.customize">
<xsl:if test="upAuth:hasPermission('UP_SYSTEM', 'CUSTOMIZE', 'ALL')">
<xsl:if test="//region[@name='customize']/channel">
- <div id="region-customize" class="container">
+ <div id="region-customize" class="container-fluid">
<div id="customizeOptionsWrapper">
<div id="customizeOptions" class="collapse">
<xsl:for-each select="//region[@name='customize']/channel">
diff --git a/uportal-war/src/main/resources/layout/theme/respondr/respondr.xsl b/uportal-war/src/main/resources/layout/theme/respondr/respondr.xsl
index aac0320..edd0a50 100644
--- a/uportal-war/src/main/resources/layout/theme/respondr/respondr.xsl
+++ b/uportal-war/src/main/resources/layout/theme/respondr/respondr.xsl
@@ -303,7 +303,7 @@
-->
<xsl:template name="footer.nav">
<footer class="portal-footer-nav" role="contentinfo">
- <div class="container">
+ <div class="container-fluid">
<!--
| Tab layout:
@@ -373,7 +373,7 @@
-->
<xsl:template name="footer.legal">
<footer class="portal-footer-legal" role="contentinfo">
- <div class="container">
+ <div class="container-fluid">
<div class="portal-power">
<h2><a href="http://www.jasig.org/uportal" target="_blank">Powered by uPortal</a>, an open-source project by <a href="http://www.jasig.org" title="Jasig.org - Open for Higher Education">Jasig</a></h2>
<ul>
@@ -657,7 +657,7 @@
</head>
<body class="up dashboard portal fl-theme-mist">
<div id="up-notification"></div>
- <div class="global-container">
+ <div class="container-fluid global-container">
<div class="row">
<xsl:variable name="GLOBAL_SIDEBAR_LEFT_COLUMNS">
<xsl:choose>
@@ -674,10 +674,10 @@
<xsl:call-template name="region.page-top" />
<header class="portal-header" role="banner">
<div class="portal-global">
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<xsl:if test="//region[@name='global-sidebar-left']/channel">
- <div class="col-xs-1">
+ <div class="col-xs-1 col-lg-0">
<div id="global-sidebar-left-hamburger" class="pull-left hidden-lg">
<button class="button" style="background: inherit; border: none; padding: .5em;">
<span class="glyphicon glyphicon-align-justify"></span>
@@ -710,7 +710,7 @@
</div>
</div>
</div>
- <div class="container">
+ <div class="container-fluid">
<div class="row">
<xsl:call-template name="region.header-left" />
<xsl:call-template name="region.header-right" />
@@ -721,7 +721,7 @@
</header>
<div id="portalPageBody" class="portal-content" role="main"><!-- #portalPageBody selector is used with BackgroundPreference framework portlet -->
<xsl:call-template name="region.customize" />
- <div class="container">
+ <div class="container-fluid">
<div class="row"><!-- Fixed-grid row containing content (pre-, regular, and post-), plus optionally sidebar-left, sidebar-right, or both -->
<xsl:call-template name="region.sidebar-left" />
<!-- The following div must know how many columns are taken by sidebar-left and sidebar-right, if any -->
@@ -831,7 +831,7 @@
<header class="portal-header" role="banner">
<div class="portal-global">
<div class="navbar navbar-fixed-top" role="navigation">
- <div class="container">
+ <div class="container-fluid">
<div class="portal-user">
<div class="navbar-header">
<a href="/uPortal" title="{upMsg:getMessage('return.to.dashboard.view', $USER_LANG)}" class="up-portlet-control hide-content pull-left fa fa-home portal-return-to-dashboard"></a>
@@ -860,7 +860,7 @@
</header>
</div>
<div class="portal-sticky-content" role="main">
- <div class="portal-sticky-container container">
+ <div class="portal-sticky-container container-fluid">
<div class="row">
<div id="portalPageBodyMessage" class="col-md-12"></div>
</div>
diff --git a/uportal-war/src/main/resources/layout/theme/respondr/uw-specific.xsl b/uportal-war/src/main/resources/layout/theme/respondr/uw-specific.xsl
index 13a1c71..a7bfd06 100644
--- a/uportal-war/src/main/resources/layout/theme/respondr/uw-specific.xsl
+++ b/uportal-war/src/main/resources/layout/theme/respondr/uw-specific.xsl
@@ -53,7 +53,7 @@
version="1.0">
<xsl:template name="uw.footer">
<footer class="portal-footer-legal" role="contentinfo">
- <div class="container">
+ <div class="container-fluid">
<div class="portal-power">
<xsl:variable name="feedbackUrl">
<xsl:call-template name="portalUrl">
diff --git a/uportal-war/src/main/webapp/WEB-INF/jsp/Invoker/greeting.jsp b/uportal-war/src/main/webapp/WEB-INF/jsp/Invoker/greeting.jsp
index daa0eeb..c151177 100644
--- a/uportal-war/src/main/webapp/WEB-INF/jsp/Invoker/greeting.jsp
+++ b/uportal-war/src/main/webapp/WEB-INF/jsp/Invoker/greeting.jsp
@@ -27,4 +27,4 @@
</c:choose>
</c:set>
-<span class="user-name">${greeting} ${userInfo['displayName']}</span>
+<span class="user-name">${greeting}&nbsp;${userInfo['displayName']}</span>
diff --git a/uportal-war/src/main/webapp/media/skins/respondr/common/less/header.less b/uportal-war/src/main/webapp/media/skins/respondr/common/less/header.less
index c7865a0..7790e2f 100644
--- a/uportal-war/src/main/webapp/media/skins/respondr/common/less/header.less
+++ b/uportal-war/src/main/webapp/media/skins/respondr/common/less/header.less
@@ -29,7 +29,7 @@
}
.portal-global {
- top: 10px;
+ padding-top: 10px;
right: 0;
.logout-launcher {
@@ -75,7 +75,7 @@ h1.portal-logo {
@media only screen and (min-width: 769px) {
.portal-global {
position: relative;
- top: 0;
+ padding-top: 10px;
left: 0;
.gradient(@portal-global-background-color, @portal-global-background-gradient);
border-bottom: 1px solid @portal-global-border-color;
@@ -111,3 +111,7 @@ h1.portal-logo {
z-index: 99999;
width: 100%;
}
+
+div.global-container {
+ padding: 0;
+}
--
1.9.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment