From 33ce8f29592eab7fc03c93d346f653821f72e2cf Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sat, 19 Oct 2013 13:50:19 -0500 Subject: [PATCH] * VRFS-789 - updated favicon in. still need to update nginx recipe via chef --- web/app/assets/javascripts/user_dropdown.js | 0 .../{landing => web}/congratulations.js | 0 .../javascripts/{landing => web}/downloads.js | 0 web/app/assets/javascripts/web/web.js | 0 .../stylesheets/client/user_dropdown.css.scss | 67 ++++++++++++++++++ .../assets/stylesheets/web/footer.css.scss | 0 web/app/assets/stylesheets/web/main.css.scss | 0 web/app/assets/stylesheets/web/web.css | 0 web/app/views/layouts/web.erb | 43 +++++++++++ web/app/views/users/_downloads.html.erb | 0 web/app/views/users/_user_dropdown.html.erb | 0 web/public/favicon.ico | Bin 0 -> 4286 bytes web/spec/features/download_spec.rb | 0 13 files changed, 110 insertions(+) create mode 100644 web/app/assets/javascripts/user_dropdown.js rename web/app/assets/javascripts/{landing => web}/congratulations.js (100%) rename web/app/assets/javascripts/{landing => web}/downloads.js (100%) create mode 100644 web/app/assets/javascripts/web/web.js create mode 100644 web/app/assets/stylesheets/client/user_dropdown.css.scss create mode 100644 web/app/assets/stylesheets/web/footer.css.scss create mode 100644 web/app/assets/stylesheets/web/main.css.scss create mode 100644 web/app/assets/stylesheets/web/web.css create mode 100644 web/app/views/layouts/web.erb create mode 100644 web/app/views/users/_downloads.html.erb create mode 100644 web/app/views/users/_user_dropdown.html.erb create mode 100644 web/spec/features/download_spec.rb 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..31bfba8f3f7a253f88890a18e2cd0844f2ab1a24 100644 GIT binary patch literal 4286 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 literal 0 HcmV?d00001 diff --git a/web/spec/features/download_spec.rb b/web/spec/features/download_spec.rb new file mode 100644 index 000000000..e69de29bb