From 2924cd4c2b9554b5c06055d6b2b47f368d9a9aa1 Mon Sep 17 00:00:00 2001 From: "E. P. Moffatt" Date: Wed, 15 Mar 2017 16:41:30 +0000 Subject: [PATCH 1/3] restructure nav bar ready for Ed P docs changes and Sam W homepage changes, add NPS link to Community page --- .../jekylldocs/_includes/navbar.html | 34 ++++--------------- .../jekylldocs/_layouts/support.html | 8 +++-- 2 files changed, 13 insertions(+), 29 deletions(-) diff --git a/packages/composer-website/jekylldocs/_includes/navbar.html b/packages/composer-website/jekylldocs/_includes/navbar.html index 1abe2a37d6..76b8354e31 100644 --- a/packages/composer-website/jekylldocs/_includes/navbar.html +++ b/packages/composer-website/jekylldocs/_includes/navbar.html @@ -16,7 +16,7 @@ - Fabric Composer + Fabric Composer diff --git a/packages/composer-website/jekylldocs/_layouts/support.html b/packages/composer-website/jekylldocs/_layouts/support.html index e98392cc08..c432dbccc8 100644 --- a/packages/composer-website/jekylldocs/_layouts/support.html +++ b/packages/composer-website/jekylldocs/_layouts/support.html @@ -8,13 +8,13 @@

- Support + Community

We're building a community to help people use and contribute to Fabric Composer: either join our team discussion on Rocket.chat, or ask us a question on Stackoverflow. We'd also love to hear your thoughts or feedback on what we're doing!


-

And that's not all: if you're a developer, come join us on GitHub: browse our code, or send us a pull request (and we'll love you forever).

+

And that's not all: if you're a developer, come join us on GitHub. Browse our code, or send us a pull request (and we'll love you forever).

@@ -57,6 +57,10 @@

GitHub

+
+

Oh hey, you're on the Community page! Hopefully that means you've given Fabric Composer a try: what did you think?

+

You can help us out by completing this 1-question survey (score us from 0 to 10) - we really appreciate your feedback!

+
{% if page.social_text %} {% include social.html %} From b46a3ac51d40b598a1d1b3f34d8f5c7475b424c7 Mon Sep 17 00:00:00 2001 From: "E. P. Moffatt" Date: Thu, 16 Mar 2017 11:28:50 +0000 Subject: [PATCH 2/3] Header bar recolour, font fixes, Support copy fixes --- .../jekylldocs/_layouts/support.html | 9 +++++--- .../jekylldocs/assets/css/bootstrap.css | 21 ++++++++----------- .../jekylldocs/assets/css/composer-style.css | 10 +++++---- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/packages/composer-website/jekylldocs/_layouts/support.html b/packages/composer-website/jekylldocs/_layouts/support.html index c432dbccc8..34ad228a8d 100644 --- a/packages/composer-website/jekylldocs/_layouts/support.html +++ b/packages/composer-website/jekylldocs/_layouts/support.html @@ -26,7 +26,7 @@

Hyperledger Rocket Chat

You will need a Linux Foundation id, or alternatively you can log in with Facebook, Github, Google, or OpenStack.

- Rocket.chat + Let's chat
@@ -58,8 +58,11 @@

GitHub

-

Oh hey, you're on the Community page! Hopefully that means you've given Fabric Composer a try: what did you think?

-

You can help us out by completing this 1-question survey (score us from 0 to 10) - we really appreciate your feedback!

+
+

Oh hey, you're on the Community page! Hopefully that means you've given Fabric Composer a try: what did you think?

+

You can help us out by completing this 1-question survey (score us from 0 to 10) - we really appreciate your feedback!

+
+
{% if page.social_text %} diff --git a/packages/composer-website/jekylldocs/assets/css/bootstrap.css b/packages/composer-website/jekylldocs/assets/css/bootstrap.css index aec6b3880e..b1c266391c 100644 --- a/packages/composer-website/jekylldocs/assets/css/bootstrap.css +++ b/packages/composer-website/jekylldocs/assets/css/bootstrap.css @@ -5,7 +5,7 @@ */ /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ html { - font-family: sans-serif; + font-family: "Open Sans", sans-serif; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } @@ -1084,7 +1084,7 @@ html { } body { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 16px; + font-size: 15px; line-height: 1.42857143; color: #333; background-color: #fff; @@ -4247,8 +4247,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } } .navbar-fixed-top { - background-color: #343334; - border-color: #343334; + background-color: #5068C2; + border-color: #5068C2; top: 0; border-width: 0 0 1px; } @@ -4256,14 +4256,14 @@ select[multiple].input-group-sm > .input-group-btn > .btn { bottom: 0; margin-bottom: 0; border-width: 1px 0 0; - background-color: #343334; - border-color: #343334; + background-color: #323232; + border-color: #323232; } .navbar-brand { float: left; height: 50px; padding: 15px 15px; - font-size: 18px; + font-size: 15px; line-height: 20px; } .navbar-brand:hover, @@ -4604,15 +4604,12 @@ fieldset[disabled] .navbar-default .btn-link:focus { .navbar-inverse .navbar-nav > .disabled > a, .navbar-inverse .navbar-nav > .disabled > a:hover, .navbar-inverse .navbar-nav > .disabled > a:focus { - color: #444; + color: #5068C2; background-color: transparent; } -.navbar-inverse .navbar-toggle { - border-color: #333; -} .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { - background-color: #272727; + background-color: #3F55AF; } .navbar-inverse .navbar-toggle .icon-bar { background-color: #fff; diff --git a/packages/composer-website/jekylldocs/assets/css/composer-style.css b/packages/composer-website/jekylldocs/assets/css/composer-style.css index 3a99033b50..83cfb9fa86 100644 --- a/packages/composer-website/jekylldocs/assets/css/composer-style.css +++ b/packages/composer-website/jekylldocs/assets/css/composer-style.css @@ -9,18 +9,20 @@ html, body { height: 100%; - font-family: 'Roboto', sans-serif; + font-family: 'Open Sans', sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } html { - font-family: 'Roboto', sans-serif; + font-family: 'Open Sans', sans-serif; } h1, h2, h3, h4, h5, h6 { - font-family: 'Roboto', sans-serif; + font-family: 'Open Sans', sans-serif; } body { /*padding-top: 50px; /* Required padding for .navbar-fixed-top. Remove if using .navbar-static-top. Change if height of navigation changes. */*/ - font-family: 'Roboto', sans-serif; + font-family: 'Open Sans', sans-serif; } .img-portfolio { From 6bb1db4ddd826b12ad8ba98ce07f3dff98c1746a Mon Sep 17 00:00:00 2001 From: caroline-church Date: Thu, 16 Mar 2017 15:11:15 +0000 Subject: [PATCH 3/3] Minor fixes (#494) Fixed scrolling on connection profile page fixed code text alignment --- .../src/app/add-file/add-file.component.ts | 10 ++--- .../connectionprofile.component.html | 8 ++-- .../connectionprofile.component.scss | 37 +++++++++---------- .../src/app/resource/resource.component.scss | 5 ++- 4 files changed, 29 insertions(+), 31 deletions(-) diff --git a/packages/composer-playground/src/app/add-file/add-file.component.ts b/packages/composer-playground/src/app/add-file/add-file.component.ts index 8a68f39ef7..d6f0459421 100644 --- a/packages/composer-playground/src/app/add-file/add-file.component.ts +++ b/packages/composer-playground/src/app/add-file/add-file.component.ts @@ -114,8 +114,8 @@ export class AddFileComponent implements OnInit { if (this.fileType === 'js') { let code = `/** - * New script file - */`; + * New script file + */`; let scriptManager = this.businessNetwork.getScriptManager(); let existingScripts = scriptManager.getScripts(); let filteredScripts = existingScripts.filter((script) => { @@ -141,10 +141,10 @@ export class AddFileComponent implements OnInit { let code = `/** - * New model file - */ + * New model file + */ - namespace ${this.addModelNamespace + numModels}`; +namespace ${this.addModelNamespace + numModels}`; this.currentFile = new ModelFile(modelManager, code, this.addModelFileName + numModels + this.addModelFileExtension); this.currentFileName = this.currentFile.getFileName(); diff --git a/packages/composer-playground/src/app/connectionprofile/connectionprofile.component.html b/packages/composer-playground/src/app/connectionprofile/connectionprofile.component.html index 8a6ebf702f..33b91f8ecb 100644 --- a/packages/composer-playground/src/app/connectionprofile/connectionprofile.component.html +++ b/packages/composer-playground/src/app/connectionprofile/connectionprofile.component.html @@ -37,13 +37,13 @@

Contact Us

-
-
+
+
-
+

Connection Profiles are not available in Web Playground

It is not possible to add Connection Profiles in the Web Playground version of Fabric Composer. @@ -53,7 +53,7 @@

Connection Profiles are not available in Web Playground

And of course it's still 100% open source

Learn more in the docs

-
+
diff --git a/packages/composer-playground/src/app/connectionprofile/connectionprofile.component.scss b/packages/composer-playground/src/app/connectionprofile/connectionprofile.component.scss index 73ba172e8b..adf91895f1 100644 --- a/packages/composer-playground/src/app/connectionprofile/connectionprofile.component.scss +++ b/packages/composer-playground/src/app/connectionprofile/connectionprofile.component.scss @@ -4,15 +4,11 @@ connection-profile { display: flex; width: 100%; - height: 100vh; .side-bar { - width: 25%; display: flex; flex-direction: column; - box-shadow: 5px 0 5px -5px #333; - .profiles { & > * { padding: $space-medium $space-large; @@ -30,7 +26,7 @@ connection-profile { } .about { - flex:1; + flex: 1; justify-content: flex-end; padding: $space-medium $space-large; } @@ -38,9 +34,24 @@ connection-profile { .main-view { background-color: $fourth-highlight; - width: 75%; padding: $space-large $space-large $space-medium $space-large; + .playground-profile-warning { + background-color: $white; + border: 1px solid $fourth-highlight; + border-radius: 0.25em; + padding: $space-medium; + margin-bottom: $space-large; + + .profile-warning-content { + display: flex; + + .profile-warning-text { + margin: 0 $space-smedium; + } + } + } + .business-network-details { display: flex; @@ -56,18 +67,4 @@ connection-profile { } } } - - .playground-profile-warning{ - background-color:$white; - border: 1px solid $fourth-highlight; - border-radius: 0.25em; - padding: $space-medium; - margin-bottom: $space-large; - - } - - .current-profile{ - - } - } diff --git a/packages/composer-playground/src/app/resource/resource.component.scss b/packages/composer-playground/src/app/resource/resource.component.scss index 0c0c05c60d..c7ef51080e 100644 --- a/packages/composer-playground/src/app/resource/resource.component.scss +++ b/packages/composer-playground/src/app/resource/resource.component.scss @@ -19,8 +19,9 @@ resource-modal { .resource-bound { max-height: 40px; - min-width: 410px; - max-width: 410px; + min-width: 100%; + // min-width: 410px; + // max-width: 410px; margin-top: $space-medium; }