You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wave-commits@incubator.apache.org by wi...@apache.org on 2016/05/04 08:55:18 UTC
incubator-wave git commit: fix issues with website with the header
being too large.
Repository: incubator-wave
Updated Branches:
refs/heads/wavy 52a478451 -> d7d9c651a
fix issues with website with the header being too large.
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/d7d9c651
Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/d7d9c651
Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/d7d9c651
Branch: refs/heads/wavy
Commit: d7d9c651ad3e2558b82c10a36270522af1a51764
Parents: 52a4784
Author: wisebaldone <wi...@apache.org>
Authored: Wed May 4 16:54:48 2016 +1000
Committer: wisebaldone <wi...@apache.org>
Committed: Wed May 4 16:54:48 2016 +1000
----------------------------------------------------------------------
TODO.md | 11 ++++++++++-
website/config.rb | 5 +++--
website/source/index.html.erb | 5 ++---
website/source/layouts/layout.erb | 4 ++--
website/source/stylesheets/site.css.scss | 10 +++++++---
5 files changed, 24 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/d7d9c651/TODO.md
----------------------------------------------------------------------
diff --git a/TODO.md b/TODO.md
index 36d8ff3..7186324 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,7 +2,8 @@ While the project is being setup a few todo's will be added and removed here
to track tasks which must be completed before full development can start.
# Apache Related
-- Integrate Apache Whisker after prebuilt jars are released.
+- Whisker doesnt meet the requirements needed, home grown solution will be
+ needed in the future.
# Project Related
- Create initial Android base
@@ -15,3 +16,11 @@ to track tasks which must be completed before full development can start.
- Add mobile menu for website
- Change text to be imported by T function for localisation.
- Fill in blurbs on website
+
+# Server
+
+# Client
+
+# Editor
+
+# Web Client
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/d7d9c651/website/config.rb
----------------------------------------------------------------------
diff --git a/website/config.rb b/website/config.rb
index 09a8cb5..a9c0194 100644
--- a/website/config.rb
+++ b/website/config.rb
@@ -1,6 +1,7 @@
###
# Page options, layouts, aliases and proxies
###
+activate :relative_assets
# Per-page layout changes:
#
@@ -37,8 +38,8 @@ end
# Build-specific configuration
configure :build do
# Minify CSS on build
- # activate :minify_css
+ activate :minify_css
# Minify Javascript on build
- # activate :minify_javascript
+ activate :minify_javascript
end
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/d7d9c651/website/source/index.html.erb
----------------------------------------------------------------------
diff --git a/website/source/index.html.erb b/website/source/index.html.erb
index 1e5dfad..0e211ab 100644
--- a/website/source/index.html.erb
+++ b/website/source/index.html.erb
@@ -1,10 +1,9 @@
---
---
-
<div class="row full" style="max-height: 600px;">
<video src="images/WaveDemo.webm" loop autoplay style="max-width: 100%; max-height: 600px;"></video>
</div>
-<div class="row column large-6">
+<div class="row column large-6" style="padding-top: 20px;">
<p class="text-left">
Apache Wave is a distributed, near-real-time, rich collaboration platform
that allows users to work together in new and exciting ways. Wave allows
@@ -22,7 +21,7 @@
</p>
<h1 class="text-left header-line">Server</h1>
<p class="text-left">
- blurb about the server
+ blurb about the serve
</p>
<a href="#" class="button">Learn More</a>
<h1 class="text-left header-line">Client</h1>
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/d7d9c651/website/source/layouts/layout.erb
----------------------------------------------------------------------
diff --git a/website/source/layouts/layout.erb b/website/source/layouts/layout.erb
index ea4cfbf..d2e1897 100644
--- a/website/source/layouts/layout.erb
+++ b/website/source/layouts/layout.erb
@@ -15,8 +15,8 @@
<body class="<%= page_classes %>">
<div id="container" class="">
<div id="header" class="row">
- <span class="title" style="float: left;"><%= image_tag "OpenWaveLogo.svg", width: "120px" %> Apache Wave</span>
- <span style="float: right; padding-top: 10px;">
+ <span class="title" style="float: left;"><%= image_tag "OpenWaveLogo.svg", style: "height: 4rem;" %> Apache Wave</span>
+ <span style="float: right; padding-top: 0.9rem;">
<ul class="dropdown menu hide-for-small-only" data-dropdown-menu>
<li>
<a href="#">About</a>
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/d7d9c651/website/source/stylesheets/site.css.scss
----------------------------------------------------------------------
diff --git a/website/source/stylesheets/site.css.scss b/website/source/stylesheets/site.css.scss
index c5a3cec..b0cd1fd 100644
--- a/website/source/stylesheets/site.css.scss
+++ b/website/source/stylesheets/site.css.scss
@@ -8,9 +8,9 @@ body {
}
h1 {
- color: rgba(0,0,0,0.5);
+ color: rgba(0,0,0,0.8);
font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 1.8em;
+ font-size: 2em;
font-weight: 400;
margin: 0;
}
@@ -19,6 +19,10 @@ h1 {
min-height: 100%;
}
+#header {
+ font-size: 0.8rem;
+}
+
#footer {
clear: both;
font-size: 0.7rem;
@@ -34,7 +38,7 @@ h1 {
.title {
color: rgba(0,0,0,0.8);
- font-size: 1.6rem;
+ font-size: 1rem;
font-family: "Lato", "Helvetica Neue", Helvetica, Arial, sans-serif;
}