From 8fb33e46174bd8182eec3574a79b635f60ce7969 Mon Sep 17 00:00:00 2001 From: Santiago Siri Date: Mon, 31 Dec 2018 12:34:58 -0500 Subject: [PATCH 01/34] space for landing --- imports/ui/css/earth.css | 9 +++++++++ imports/ui/templates/layout/main.html | 8 +++++++- imports/ui/templates/layout/main.js | 6 ++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/imports/ui/css/earth.css b/imports/ui/css/earth.css index be0f1be09..3a0348272 100755 --- a/imports/ui/css/earth.css +++ b/imports/ui/css/earth.css @@ -4778,6 +4778,10 @@ blockquote { left: 0px; } +.right.right-hero { + top: 400px; +} + .float-left { float: left; } @@ -6254,6 +6258,11 @@ blockquote { margin-bottom: 20px; } +.hero { + width: 100%; + min-height: 400px; +} + @media (max-width: 991px) { .contract { margin-right: 15px; diff --git a/imports/ui/templates/layout/main.html b/imports/ui/templates/layout/main.html index a1861760d..7c67923cb 100644 --- a/imports/ui/templates/layout/main.html +++ b/imports/ui/templates/layout/main.html @@ -15,7 +15,13 @@ {{> sidebar}} -
+ {{#unless currentUser}} +
+ test +
+ {{/unless}} + +
{{#if isPhone}} {{> navigation}} diff --git a/imports/ui/templates/layout/main.js b/imports/ui/templates/layout/main.js index ad9820d2e..fdb57c630 100644 --- a/imports/ui/templates/layout/main.js +++ b/imports/ui/templates/layout/main.js @@ -112,6 +112,12 @@ Template.main.helpers({ showNotice() { return Session.get('showNotice'); }, + landingStyle() { + if (!Meteor.user()) { + return 'right-hero'; + } + return ''; + } }); Template.main.events({ From 9497f1a4f9de9bdfaf0e9a5167ea4439383f848b Mon Sep 17 00:00:00 2001 From: Santiago Siri Date: Wed, 2 Jan 2019 15:59:31 -0500 Subject: [PATCH 02/34] less prominent sidebar --- .meteor/packages | 6 ++--- .meteor/release | 2 +- .meteor/versions | 12 ++++----- imports/ui/css/earth.css | 26 ++++++++++++------- .../ui/templates/layout/sidebar/sidebar.html | 2 ++ .../ui/templates/widgets/feed/paginator.js | 2 +- 6 files changed, 29 insertions(+), 21 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 4173c5f12..18aadc5ef 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -12,7 +12,7 @@ meteor-base@1.4.0 # Packages every Meteor app needs to have tracker@1.2.0 # Meteor's client-side reactive programming library es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers. -ecmascript@0.12.0 # Enable ECMAScript2015+ syntax in app code +ecmascript@0.12.3 # Enable ECMAScript2015+ syntax in app code # standard libraries jquery@1.11.10 # Helpful client-side library @@ -22,7 +22,7 @@ blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views mrt:jquery-ui rajit:bootstrap3-datepicker mystor:device-detection -standard-minifier-css@1.5.0 +standard-minifier-css@1.5.2 # standard-minifier-js@2.1.2 velocityjs:velocityjs @@ -44,7 +44,7 @@ iron:router tap:i18n # accounts, users -session@1.1.8 # Client-side reactive dictionary for your app +session@1.2.0 # Client-side reactive dictionary for your app accounts-ui@1.3.1 accounts-password@1.5.1 accounts-twitter@1.4.2 diff --git a/.meteor/release b/.meteor/release index e76dedee1..2299ae70d 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.8 +METEOR@1.8.0.1 diff --git a/.meteor/versions b/.meteor/versions index d360c8c31..08c4cc1c8 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -12,7 +12,7 @@ aldeed:schema-index@1.1.1 aldeed:simple-schema@1.5.4 allow-deny@1.1.0 autoupdate@1.5.0 -babel-compiler@7.2.1 +babel-compiler@7.2.3 babel-runtime@1.3.0 base64@1.0.11 binary-heap@1.0.11 @@ -35,11 +35,11 @@ ddp-common@1.4.0 ddp-rate-limiter@1.0.7 ddp-server@2.2.0 deps@1.0.12 -diff-sequence@1.1.0 +diff-sequence@1.1.1 dispatch:mocha-phantomjs@0.1.9 dispatch:phantomjs-tests@0.0.7 dynamic-import@0.5.0 -ecmascript@0.12.1 +ecmascript@0.12.3 ecmascript-runtime@0.7.0 ecmascript-runtime-client@0.8.0 ecmascript-runtime-server@0.7.1 @@ -91,7 +91,7 @@ minifier-css@1.4.1 minimongo@1.4.5 mobile-experience@1.0.5 mobile-status-bar@1.0.14 -modern-browsers@0.1.2 +modern-browsers@0.1.3 modules@0.13.0 modules-runtime@0.10.3 mongo@1.6.0 @@ -127,7 +127,7 @@ retry@1.1.0 routepolicy@1.1.0 server-render@0.3.1 service-configuration@1.0.11 -session@1.1.8 +session@1.2.0 sha@1.0.9 shell-server@0.4.0 socket-stream-client@0.2.2 @@ -151,7 +151,7 @@ ui@1.0.13 underscore@1.0.10 url@1.2.0 velocityjs:velocityjs@1.2.1 -webapp@1.7.0 +webapp@1.7.1 webapp-hashing@1.0.9 xolvio:backdoor@0.2.1 xolvio:cleaner@0.3.3 diff --git a/imports/ui/css/earth.css b/imports/ui/css/earth.css index 3a0348272..1faf5ea70 100755 --- a/imports/ui/css/earth.css +++ b/imports/ui/css/earth.css @@ -484,7 +484,7 @@ blockquote { margin-top: 10px; margin-bottom: 10px; float: left; - border: 1px solid #dfdfdf; + border: 1px solid #adadad; border-radius: 100px; background-color: #e6f9f4; cursor: pointer; @@ -4144,7 +4144,7 @@ blockquote { width: 0px; margin-left: -10000px; float: left; - background-color: #fff; + background-color: #d4d4d4; text-align: left; } @@ -4335,8 +4335,8 @@ blockquote { padding-right: 15px; padding-bottom: 20px; padding-left: 15px; - background-color: #fff; - box-shadow: 0 0 20px 10px #fff; + background-color: #d4d4d4; + box-shadow: 0 0 20px 10px #d4d4d4; text-align: left; } @@ -4355,11 +4355,11 @@ blockquote { } .menu-item:hover { - background-color: #f0eef2; + background-color: #e0e0e0; } .menu-item:active { - background-color: #dbd8de; + background-color: #e0e0e0; } .menu-item.cast-action { @@ -4652,11 +4652,11 @@ blockquote { } .collective:hover { - background-color: rgba(180, 171, 189, .2); + background-color: #e0e0e0; } .collective:active { - background-color: #dbd8de; + background-color: #e0e0e0; } .collective.collective-selected { @@ -4949,7 +4949,6 @@ blockquote { top: 0px; bottom: 0px; display: inline-block; - overflow: auto; width: 50%; padding-right: 15px; padding-left: 15px; @@ -5137,7 +5136,7 @@ blockquote { display: block; width: 5px; float: left; - border-left: 1px dotted #ccc; + border-left-style: none; cursor: ew-resize; } @@ -6731,6 +6730,9 @@ blockquote { margin-bottom: 0px; padding-bottom: 0px; } + .left { + background-color: #fff; + } .alert { width: 90%; max-width: 360px; @@ -6764,6 +6766,10 @@ blockquote { .menu.menu-empty { font-weight: 400; } + .menu.menu-empty.menu-footer { + background-color: #fff; + box-shadow: 0 0 20px 10px #fff; + } .menu-item { font-weight: 400; } diff --git a/imports/ui/templates/layout/sidebar/sidebar.html b/imports/ui/templates/layout/sidebar/sidebar.html index 5df099210..2bcc444f4 100644 --- a/imports/ui/templates/layout/sidebar/sidebar.html +++ b/imports/ui/templates/layout/sidebar/sidebar.html @@ -20,6 +20,7 @@
{{/each}} +
-
- -
- + + +
+ + + + + + {{else}} + + {{/if}} diff --git a/imports/ui/templates/layout/sidebar/sidebar.js b/imports/ui/templates/layout/sidebar/sidebar.js index 97cc7d26e..530791315 100644 --- a/imports/ui/templates/layout/sidebar/sidebar.js +++ b/imports/ui/templates/layout/sidebar/sidebar.js @@ -331,4 +331,7 @@ Template.sidebar.helpers({ menu() { return _userMenu(Meteor.user()); }, + sidebarContext() { + return (Meteor.Device.isPhone() || (!Meteor.Device.isPhone() && Meteor.user())); + }, }); diff --git a/imports/ui/templates/layout/url/home/home.html b/imports/ui/templates/layout/url/home/home.html index 743b7d8b3..b871d1288 100644 --- a/imports/ui/templates/layout/url/home/home.html +++ b/imports/ui/templates/layout/url/home/home.html @@ -9,19 +9,21 @@ - - + +