From 49f603922b07c0fe3705b01e1ec557f6e7fd71bd Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Wed, 20 Jul 2016 15:32:10 +0100 Subject: [PATCH 1/7] Highlight info cell. --- services/web/public/stylesheets/app/editor.less | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/services/web/public/stylesheets/app/editor.less b/services/web/public/stylesheets/app/editor.less index f629d076d2..17466a4795 100644 --- a/services/web/public/stylesheets/app/editor.less +++ b/services/web/public/stylesheets/app/editor.less @@ -254,16 +254,20 @@ .sl_references_search_hint { position: absolute; - bottom: -22px; + bottom: -33px; left: -1px; right: 0px; + padding: 7px 2px; text-align: center; - padding: 2px; - background: rgb(202, 214, 250); - border: 1px solid lightgray; + background: @state-info-text; + color: @state-info-bg; box-shadow: 3px 3px 5px rgba(0,0,0,.2); + font-family: @font-family-sans-serif; + font-size: 13px; + font-weight: 600; + span { - color: black; + padding-left: 10px; } } // -- References Search Modal -- From 2d3aa02eedafb4bda855e6d9fbd3773540803db5 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Wed, 20 Jul 2016 17:04:02 +0100 Subject: [PATCH 2/7] Make info cell a button container. --- services/web/public/stylesheets/app/editor.less | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/services/web/public/stylesheets/app/editor.less b/services/web/public/stylesheets/app/editor.less index 17466a4795..2da411db61 100644 --- a/services/web/public/stylesheets/app/editor.less +++ b/services/web/public/stylesheets/app/editor.less @@ -254,21 +254,17 @@ .sl_references_search_hint { position: absolute; - bottom: -33px; + bottom: -67px; left: -1px; right: 0px; - padding: 7px 2px; + padding: 0 6px 6px; text-align: center; - background: @state-info-text; - color: @state-info-bg; + background: #fbfbfb; + color: #FFF; box-shadow: 3px 3px 5px rgba(0,0,0,.2); font-family: @font-family-sans-serif; font-size: 13px; font-weight: 600; - - span { - padding-left: 10px; - } } // -- References Search Modal -- .references-search-modal-backdrop { From b0c3a89a83ac268766bb3faeffcd563e4eb2f682 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Wed, 20 Jul 2016 17:04:25 +0100 Subject: [PATCH 3/7] Style button and content. --- .../web/public/stylesheets/app/editor.less | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/services/web/public/stylesheets/app/editor.less b/services/web/public/stylesheets/app/editor.less index 2da411db61..49945a76ce 100644 --- a/services/web/public/stylesheets/app/editor.less +++ b/services/web/public/stylesheets/app/editor.less @@ -254,7 +254,7 @@ .sl_references_search_hint { position: absolute; - bottom: -67px; + bottom: -65px; left: -1px; right: 0px; padding: 0 6px 6px; @@ -265,6 +265,26 @@ font-family: @font-family-sans-serif; font-size: 13px; font-weight: 600; + + hr { + margin: 6px -6px; + } + + button { + width: 100%; + font-size: inherit; + line-height: 1.4; + } + + span { + padding-left: 10px; + } + + &_keybinding { + display: block; + font-size: 12px; + font-weight: normal; + } } // -- References Search Modal -- .references-search-modal-backdrop { From c076d76c7df3807642ba8d719d96207b0242c120 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Thu, 21 Jul 2016 14:11:17 +0100 Subject: [PATCH 4/7] Namespace new variant. --- services/web/public/stylesheets/app/editor.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/web/public/stylesheets/app/editor.less b/services/web/public/stylesheets/app/editor.less index 49945a76ce..439264c95f 100644 --- a/services/web/public/stylesheets/app/editor.less +++ b/services/web/public/stylesheets/app/editor.less @@ -252,7 +252,7 @@ margin-bottom:0px; } -.sl_references_search_hint { +.sl_references_search_hint-varButton { position: absolute; bottom: -65px; left: -1px; @@ -286,6 +286,7 @@ font-weight: normal; } } + // -- References Search Modal -- .references-search-modal-backdrop { // don't grey out the editor when the From 5c6d6f0e740e5760ac3165a48cd21169e610dfcd Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Thu, 21 Jul 2016 14:12:14 +0100 Subject: [PATCH 5/7] Pull back existing styles and namespace them as the control variant. --- services/web/public/stylesheets/app/editor.less | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/services/web/public/stylesheets/app/editor.less b/services/web/public/stylesheets/app/editor.less index 439264c95f..8113692e51 100644 --- a/services/web/public/stylesheets/app/editor.less +++ b/services/web/public/stylesheets/app/editor.less @@ -252,6 +252,21 @@ margin-bottom:0px; } +.sl_references_search_hint-varDefault { + position: absolute; + bottom: -22px; + left: -1px; + right: 0px; + text-align: center; + padding: 2px; + background: rgb(202, 214, 250); + border: 1px solid lightgray; + box-shadow: 3px 3px 5px rgba(0,0,0,.2); + span { + color: black; + } +} + .sl_references_search_hint-varButton { position: absolute; bottom: -65px; From 2c857c0afa2caab79f7cd0c801fd4166ed464147 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Thu, 21 Jul 2016 14:24:52 +0100 Subject: [PATCH 6/7] Minor adjustments to make both variants coexist without affecting each other. --- services/web/public/stylesheets/app/editor.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/web/public/stylesheets/app/editor.less b/services/web/public/stylesheets/app/editor.less index 8113692e51..09b972c342 100644 --- a/services/web/public/stylesheets/app/editor.less +++ b/services/web/public/stylesheets/app/editor.less @@ -262,6 +262,7 @@ background: rgb(202, 214, 250); border: 1px solid lightgray; box-shadow: 3px 3px 5px rgba(0,0,0,.2); + span { color: black; } @@ -277,6 +278,7 @@ background: #fbfbfb; color: #FFF; box-shadow: 3px 3px 5px rgba(0,0,0,.2); + border-left: 1px solid lightgray; font-family: @font-family-sans-serif; font-size: 13px; font-weight: 600; @@ -295,8 +297,9 @@ padding-left: 10px; } - &_keybinding { + kbd { display: block; + font-family: inherit; font-size: 12px; font-weight: normal; } From 6a46b46cf47cf2ae3d6eb94738981918556cb0e3 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Thu, 21 Jul 2016 16:42:22 +0100 Subject: [PATCH 7/7] Expose sign-up date as an user attribute in the editor. --- .../web/app/coffee/Features/Project/ProjectController.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/services/web/app/coffee/Features/Project/ProjectController.coffee b/services/web/app/coffee/Features/Project/ProjectController.coffee index 52d99ae866..d273516056 100644 --- a/services/web/app/coffee/Features/Project/ProjectController.coffee +++ b/services/web/app/coffee/Features/Project/ProjectController.coffee @@ -245,6 +245,7 @@ module.exports = ProjectController = first_name : user.first_name last_name : user.last_name referal_id : user.referal_id + signUpDate : user.signUpDate subscription : freeTrial: {allowed: allowedFreeTrial} featureSwitches: user.featureSwitches