From f559695b03826158eb302e60b40d4924f28a8bf4 Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Mon, 9 Nov 2015 13:19:56 +1000 Subject: [PATCH 1/4] Make the hamburger menu work with the top-navigation enabled and sidebar-navigation disabled --- .../src/main/resources/META-INF/maven/site.vm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm b/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm index f2081f6..a2817ee 100644 --- a/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm +++ b/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm @@ -976,11 +976,22 @@ #else #if ( $decoration.custom.getChild('fluidoSkin') && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarContainerStyle' ) ) -
+
+ + + + + +
#else -
+
+ + + + + +
#end - #end #if ( $decoration.custom.getChild('fluidoSkin') && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarIcon' ) ) From 4dd8e63bd74b8c6c055d13012ef9204096f5e3b8 Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Tue, 10 Nov 2015 07:21:45 +1000 Subject: [PATCH 2/4] Add CSS for mobile devices --- .../src/main/resources/css/maven-theme.css | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/maven-fluido-skin/src/main/resources/css/maven-theme.css b/maven-fluido-skin/src/main/resources/css/maven-theme.css index c09947b..d62df55 100644 --- a/maven-fluido-skin/src/main/resources/css/maven-theme.css +++ b/maven-fluido-skin/src/main/resources/css/maven-theme.css @@ -137,3 +137,64 @@ li.pull-right { margin-left: 3px; margin-right: 3px; } + +/* Fix a bug with being able to click the dropdowns on mobile */ +.dropdown-backdrop { + position: static; +} + +/* CSS for small screens */ +@media only screen and (max-width: 979px) { + /* Bump the font size for legibility */ + body { + width: 100%; + font-size: 120%; + } + /* Make the main divs fill most space, with a little margin for readability */ + div#topbar, + div#banner, + div#breadcrumbs, + div#bodyColumn, + footer { + width: 98%; + margin-left: 5px; + margin-right: 5px; + clear: both; + height: auto; + } + /* Without this rule, drop-down divs are a fixed height + * the first time they are expanded */ + .collapse.in { + height: auto; + overflow: visible; + } + /* Not sure why, but I had to add this to take care of extra space at the top + * of the hamburger menu in mobile */ + .navbar-inner { + margin-top: -60px; + } + /* Put the search bar on its own line and make it wide */ + form#search-form.navbar-search.pull-right, .pull-right { + width: 95%; + margin: 2px; + float: left; + clear: both; + } + /* Fix the publish date in the footer */ + li#publishDate.pull-right { + display: block; + width: 95%; + float: left; + margin-top: 5px; + list-style: none; + } +} + +/* CSS for small screens with high-density pixels */ +/* such as iphone 6 and 6+ but not iPad (768 px) */ +only screen and (max-width: 767px) and (-webkit-min-device-pixel-ratio : 1.5), +only screen and (max-width: 767px) and (min-device-pixel-ratio : 1.5) { + body { + font-size: 140%; + } +} From 4af77b9e2e7dc5cd9413e184bccfd544fc6d0ab0 Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Tue, 10 Nov 2015 14:59:49 +1000 Subject: [PATCH 3/4] Add the ability to specify a Google custom search ID This allows you to configure your custom search in the Google dashboard. You can specify multiple search sites (including using wildcards), specify some styling, enable a different search language, etc. Just use the custom search ID in the tags to get the goodies. Also shows the search results in a pop-up div instead of taking you to google.com. --- .../src/main/resources/META-INF/maven/site.vm | 30 ++++++++++++++----- maven-fluido-skin/src/site/apt/index.apt.vm | 17 ++++++++++- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm b/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm index a2817ee..d6eae3e 100644 --- a/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm +++ b/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm @@ -630,19 +630,35 @@ #end ## #macro ( googleSearch $top ) - #end +#end ## #macro ( forkMeOnGitHub ) #if ( $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'gitHub' ) diff --git a/maven-fluido-skin/src/site/apt/index.apt.vm b/maven-fluido-skin/src/site/apt/index.apt.vm index db9d55f..c2159c7 100644 --- a/maven-fluido-skin/src/site/apt/index.apt.vm +++ b/maven-fluido-skin/src/site/apt/index.apt.vm @@ -164,7 +164,7 @@ Welcome to ${project.name}! Users can optionally enable the <> for the generated site, requirements are: - * the <<>> property in <<>>, unless the <<>> property is set in the <<>>: + * the <<>> property in <<>>, unless the <<>> or <<>> property is set in the <<>>: +-----+ @@ -190,6 +190,21 @@ Welcome to ${project.name}! +-----+ + * the <<>> element in <<>>: + ++-----+ + + [...] + + + + ID_from_Google + + + + [...] + ++-----+ [] By default, the search form: From ac98c6442a2b51bea283b50ed60afdd27cdeb611 Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Wed, 11 Nov 2015 13:02:17 +1000 Subject: [PATCH 4/4] Revert "Add CSS for mobile devices" This reverts commit 4dd8e63bd74b8c6c055d13012ef9204096f5e3b8. --- .../src/main/resources/css/maven-theme.css | 61 ------------------- 1 file changed, 61 deletions(-) diff --git a/maven-fluido-skin/src/main/resources/css/maven-theme.css b/maven-fluido-skin/src/main/resources/css/maven-theme.css index d62df55..c09947b 100644 --- a/maven-fluido-skin/src/main/resources/css/maven-theme.css +++ b/maven-fluido-skin/src/main/resources/css/maven-theme.css @@ -137,64 +137,3 @@ li.pull-right { margin-left: 3px; margin-right: 3px; } - -/* Fix a bug with being able to click the dropdowns on mobile */ -.dropdown-backdrop { - position: static; -} - -/* CSS for small screens */ -@media only screen and (max-width: 979px) { - /* Bump the font size for legibility */ - body { - width: 100%; - font-size: 120%; - } - /* Make the main divs fill most space, with a little margin for readability */ - div#topbar, - div#banner, - div#breadcrumbs, - div#bodyColumn, - footer { - width: 98%; - margin-left: 5px; - margin-right: 5px; - clear: both; - height: auto; - } - /* Without this rule, drop-down divs are a fixed height - * the first time they are expanded */ - .collapse.in { - height: auto; - overflow: visible; - } - /* Not sure why, but I had to add this to take care of extra space at the top - * of the hamburger menu in mobile */ - .navbar-inner { - margin-top: -60px; - } - /* Put the search bar on its own line and make it wide */ - form#search-form.navbar-search.pull-right, .pull-right { - width: 95%; - margin: 2px; - float: left; - clear: both; - } - /* Fix the publish date in the footer */ - li#publishDate.pull-right { - display: block; - width: 95%; - float: left; - margin-top: 5px; - list-style: none; - } -} - -/* CSS for small screens with high-density pixels */ -/* such as iphone 6 and 6+ but not iPad (768 px) */ -only screen and (max-width: 767px) and (-webkit-min-device-pixel-ratio : 1.5), -only screen and (max-width: 767px) and (min-device-pixel-ratio : 1.5) { - body { - font-size: 140%; - } -}