From be2dd30bef3d2e88358a3123f89fabebd5004c25 Mon Sep 17 00:00:00 2001 From: samwinslet Date: Tue, 2 May 2017 15:08:34 +0100 Subject: [PATCH 01/23] homepage and support pages stackoverflow changes --- packages/composer-website/jekylldocs/_layouts/support.html | 4 ++-- packages/composer-website/jekylldocs/index.html | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/composer-website/jekylldocs/_layouts/support.html b/packages/composer-website/jekylldocs/_layouts/support.html index e49150d68b..07925ea998 100644 --- a/packages/composer-website/jekylldocs/_layouts/support.html +++ b/packages/composer-website/jekylldocs/_layouts/support.html @@ -37,8 +37,8 @@

Hyperledger Rocket.Chat

Stack Overflow

-

Ask questions in Stack Overflow with the tag fabric-composer.

- Ask now +

Ask questions in Stack Overflow with the tag #hyperledger-composer.

+ Ask now
diff --git a/packages/composer-website/jekylldocs/index.html b/packages/composer-website/jekylldocs/index.html index b903f45f9f..96c09fcf78 100644 --- a/packages/composer-website/jekylldocs/index.html +++ b/packages/composer-website/jekylldocs/index.html @@ -17,7 +17,7 @@

Build Hyperledger Fabric applications and business networks your way

    • -
  • +
    • @@ -70,9 +70,9 @@

    Calls happen every other Thursday at 16:00 UTC

    - + -

    #fabric-composer

    +

    #hyperledger-composer

    From d6b1d8cdbda00774cbfb9abedcb5f6704ca8315a Mon Sep 17 00:00:00 2001 From: samwinslet Date: Wed, 3 May 2017 10:02:44 +0100 Subject: [PATCH 02/23] typography changes for readme section --- .../src/assets/styles/base/_typography.scss | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/packages/composer-playground/src/assets/styles/base/_typography.scss b/packages/composer-playground/src/assets/styles/base/_typography.scss index 303be3641a..00040ac973 100644 --- a/packages/composer-playground/src/assets/styles/base/_typography.scss +++ b/packages/composer-playground/src/assets/styles/base/_typography.scss @@ -85,3 +85,96 @@ } } + +//Readme text styling + +.readme { + max-width: 1100px; + box-shadow: 0 1px 4px 0 rgba(0,0,0,0.10); + border-radius: 5px; + max-height: 75vh; + // padding: 1rem; + + p { + margin-top: 1.3rem; + } + + h1 { + font-weight: 300; + font-size: 1.5em; + } + + h2 { + margin-top: 3rem; + } + + h3 { + font-family: $font-stack; + font-weight: 300; + font-size: 1rem; + line-height: 130%; + color: $primary-text; + margin-top: 2rem; + } + + h4 { + font-family: $font-stack; + font-weight: 600; + font-size: 0.9rem; + } + + pre { + background-color: $third-highlight; + border: 1px solid $keyline-highlight; + padding: 1rem; + border-radius: 5px; + } + + blockquote { + // background-color: $third-highlight; + // border: 1px solid $primary-text; + border-left: 2px solid $first-highlight; + padding-left: 1rem; + padding-top: 0.1rem; + padding-bottom: 0.1rem; + margin: 1rem; + margin-left: 0; + + p { + font-style: italic; + } + + } + + ul { + list-style: none; + padding-left: 2em; + text-indent: -1em; + + li:before { + color: $primary-text; + content: '- \0000a0'; + font-size: 1rem; + font-weight: 600; + } + + li { + padding-bottom: 0.5rem; + p { + display: inline; + } + + } + } + + ol { + border-left: 1px solid $keyline-highlight; + li { + margin-top: 1.3rem; + } + } + + a { + color: $first-highlight; + } +} From 0487da0c3de57e28ad315a2f72f4f45b6aa6d646 Mon Sep 17 00:00:00 2001 From: samwinslet Date: Thu, 4 May 2017 13:45:42 +0100 Subject: [PATCH 03/23] initial dropdown styling --- .../assets/styles/components/_dropdown.scss | 88 ++++++++++++++++--- 1 file changed, 78 insertions(+), 10 deletions(-) diff --git a/packages/composer-playground/src/assets/styles/components/_dropdown.scss b/packages/composer-playground/src/assets/styles/components/_dropdown.scss index 7cb8b10a7a..1119ddc816 100644 --- a/packages/composer-playground/src/assets/styles/components/_dropdown.scss +++ b/packages/composer-playground/src/assets/styles/components/_dropdown.scss @@ -3,20 +3,27 @@ .dropup, .dropdown { position: relative; + background-color: #F9F9F9; + width: 300px; + text-align: left; + padding-left: 15px; + margin: 0 auto; + overflow: hidden; + text-overflow: ellipsis; } .dropdown-toggle { // Generate the caret automatically &::after { - display: inline-block; + // display: inline-block; + // width: 10px; + // height: 10px; + content:url(data:image/svg+xml;base64,DQo8c3ZnIHdpZHRoPSI5cHgiIGhlaWdodD0iNnB4IiB2aWV3Qm94PSIwIDAgOSA2IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPg0KICAgIDxkZWZzPjwvZGVmcz4NCiAgICA8ZyBpZD0iRmxvdyIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+DQogICAgICAgIDxnIGlkPSJUZXh0LUVudHJ5LUZpZWxkcyIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTE1OTEuMDAwMDAwLCAtMTA2LjAwMDAwMCkiIGZpbGw9IiMxOTI3M0MiPg0KICAgICAgICAgICAgPHBvbHlnb24gaWQ9IlNoYXBlLUNvcHkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDE1OTUuNTAwMDAwLCAxMDkuMDAwMDAwKSByb3RhdGUoLTkwLjAwMDAwMCkgdHJhbnNsYXRlKC0xNTk1LjUwMDAwMCwgLTEwOS4wMDAwMDApICIgcG9pbnRzPSIxNTk4LjUgMTEyIDE1OTUuNSAxMDkgMTU5OC41IDEwNiAxNTk3IDEwNC41IDE1OTIuNSAxMDkgMTU5NyAxMTMuNSI+PC9wb2x5Z29uPg0KICAgICAgICA8L2c+DQogICAgPC9nPg0KPC9zdmc+); + position: fixed; + right: 36%; + cursor: pointer; width: 0; height: 0; - margin-left: 10px; - vertical-align: middle; - content: ""; - border-top: 10px solid; - border-right: 10px solid transparent; - border-left: 10px solid transparent; } // Prevent the focus on the dropdown toggle when closing dropdowns @@ -49,9 +56,25 @@ color: grey; text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer) list-style: none; - background-color: white; + // background-color: white; background-clip: padding-box; - border: 0px solid lightgray; + // border: 0px solid lightgray; + + background: #FBFCFC; + border: 1px solid #E3ECEC; + border-bottom-right-radius: 5px; + border-bottom-left-radius: 5px; + border-top: 2px solid $first-highlight; + box-shadow: 0 1px 10px 0 rgba(0,0,0,0.10); + width: 300px; + text-align: left; + // white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + + &:active { + border-bottom: 2px solid transparent; + } @@ -68,13 +91,21 @@ text-align: left; // For `