diff --git a/web/app/assets/javascripts/user_dropdown.js b/web/app/assets/javascripts/user_dropdown.js new file mode 100644 index 000000000..e69de29bb diff --git a/web/app/assets/javascripts/landing/congratulations.js b/web/app/assets/javascripts/web/congratulations.js similarity index 100% rename from web/app/assets/javascripts/landing/congratulations.js rename to web/app/assets/javascripts/web/congratulations.js diff --git a/web/app/assets/javascripts/landing/downloads.js b/web/app/assets/javascripts/web/downloads.js similarity index 100% rename from web/app/assets/javascripts/landing/downloads.js rename to web/app/assets/javascripts/web/downloads.js diff --git a/web/app/assets/javascripts/web/web.js b/web/app/assets/javascripts/web/web.js new file mode 100644 index 000000000..e69de29bb diff --git a/web/app/assets/stylesheets/client/user_dropdown.css.scss b/web/app/assets/stylesheets/client/user_dropdown.css.scss new file mode 100644 index 000000000..5e7cc23c7 --- /dev/null +++ b/web/app/assets/stylesheets/client/user_dropdown.css.scss @@ -0,0 +1,67 @@ + +#logo { + float:left; + width:247px; +} + +#profile { + width:auto; + float:right; + height:54px; +} + +.avatar_large { + float:left; + padding:2px; + width:54px; + height:54px; + background-color: $ColorScreenPrimary; + -webkit-border-radius:28px; + -moz-border-radius:28px; + border-radius:28px; +} + +.avatar_large img { + width:54px; + height:54px; + -webkit-border-radius:26px; + -moz-border-radius:26px; + border-radius:26px; +} + +#user { + margin:18px 0px 0px 10px; + font-size:20px; + font-weight:200; + color:#ccc; + float:left; +} + +.arrow-down { + float:left; + cursor:pointer; + margin-left:16px; + margin-top:26px; + width: 0; + height: 0; + border-left: 8px solid transparent; + border-right: 8px solid transparent; + border-top: 8px solid #fff; +} + +.userinfo { + cursor:pointer; +} + +.userinfo ul { + clear:both; + background: scale-lightness($ColorUIBackground, 10%); + display:none; +} +.userinfo li { + display:block; + margin: 2px; + padding: 2px; + background: scale-lightness($ColorUIBackground, 20%); +} + diff --git a/web/app/assets/stylesheets/web/footer.css.scss b/web/app/assets/stylesheets/web/footer.css.scss new file mode 100644 index 000000000..e69de29bb diff --git a/web/app/assets/stylesheets/web/main.css.scss b/web/app/assets/stylesheets/web/main.css.scss new file mode 100644 index 000000000..e69de29bb diff --git a/web/app/assets/stylesheets/web/web.css b/web/app/assets/stylesheets/web/web.css new file mode 100644 index 000000000..e69de29bb diff --git a/web/app/views/layouts/web.erb b/web/app/views/layouts/web.erb new file mode 100644 index 000000000..f3328c7b7 --- /dev/null +++ b/web/app/views/layouts/web.erb @@ -0,0 +1,43 @@ + + + + <%= full_title(yield(:title)) %> + + + + <%= stylesheet_link_tag "landing/landing", media: "all" %> + <% if bugsnag? %> + + + <% end %> + <%= include_gon %> + <%= csrf_meta_tags %> + + +
+ <%= javascript_include_tag "landing/landing" %> + +
+ <%= link_to root_path do %> + <%= image_tag("header/logo.png", :alt => "JamKazam logo", :size => "247x45") %> + <% end %> +
+ +
+
+ +
+ <%= yield %> +
+
+ + + + <%= render "shared/ga" %> + + + diff --git a/web/app/views/users/_downloads.html.erb b/web/app/views/users/_downloads.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/web/app/views/users/_user_dropdown.html.erb b/web/app/views/users/_user_dropdown.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/web/public/favicon.ico b/web/public/favicon.ico index e69de29bb..31bfba8f3 100644 Binary files a/web/public/favicon.ico and b/web/public/favicon.ico differ diff --git a/web/spec/features/download_spec.rb b/web/spec/features/download_spec.rb new file mode 100644 index 000000000..e69de29bb