Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 0b6e48c57 -> 25fbb612b
IGNITE-843 Tweak headers colors. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25fbb612 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25fbb612 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25fbb612 Branch: refs/heads/ignite-843 Commit: 25fbb612b75cc424fc25fd6c0ac56e8df7b0fe07 Parents: 0b6e48c Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Aug 5 22:06:59 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Aug 5 22:06:59 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/models/caches.json | 2 +- .../main/js/controllers/models/clusters.json | 2 +- .../src/main/js/public/stylesheets/style.scss | 44 +++++++++++++------- .../src/main/js/views/includes/controls.jade | 6 +-- .../src/main/js/views/sql/sql.jade | 7 ++-- 5 files changed, 38 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25fbb612/modules/control-center-web/src/main/js/controllers/models/caches.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json index 83b3166..31648e0 100644 --- a/modules/control-center-web/src/main/js/controllers/models/caches.json +++ b/modules/control-center-web/src/main/js/controllers/models/caches.json @@ -5,7 +5,7 @@ "<ul>", " <li>Configure caches.</li>", " <li>Associate metadata with cache queries and/or cache store.</li>", - "</ul>" + "</ul><br/>" ], "whatsNextTitle": "What's next:", "whatsNextContent": [ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25fbb612/modules/control-center-web/src/main/js/controllers/models/clusters.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json index 7cffeb5..e95990d 100644 --- a/modules/control-center-web/src/main/js/controllers/models/clusters.json +++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json @@ -5,7 +5,7 @@ "<ul>", " <li>Configure clusters.</li>", " <li>Associate clusters with caches.</li>", - "</ul>" + "</ul><br/>" ], "whatsNextTitle": "What's next:", "whatsNextContent": [ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25fbb612/modules/control-center-web/src/main/js/public/stylesheets/style.scss ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss index 7a5dd5d..d1e1c2e 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss @@ -18,9 +18,10 @@ $logo-path: "https://www.filepicker.io/api/file/QagunjDGRFul2JgNCAli";; $input-height: 28px; $ignite-red: #ec1c24; -$ignite-block-callout-background: #f3f8f3; -$ignite-block-callout: #50af51; -$ignite-block-callout-header-left: #248fb2; +$ignite-block-callout-left: #248fb2; +$ignite-block-callout-left-background: #f4f8fa; +$ignite-block-callout-right: #50af51; +$ignite-block-callout-right-background: #f3f8f3; hr { margin: 20px 0; @@ -1149,12 +1150,11 @@ a { } .block-callout-parent { - background-color: $ignite-block-callout-background; overflow: hidden; } .block-callout { - background-color: $ignite-block-callout-background; + border-left: 5px solid; display: inline-block; vertical-align: top; width: 50%; @@ -1178,18 +1178,34 @@ a { } } -.block-callout-header-left { - color: $ignite-block-callout-header-left; -} +.block-callout-left { + @extend .block-callout; + + background-color: $ignite-block-callout-left-background; + border-color: $ignite-block-callout-left; + + i { + color: $ignite-block-callout-left; + } -.block-callout-header-right { - color: $ignite-block-callout; + label { + color: $ignite-block-callout-left; + } } -.block-callout-border { - border-left: 5px solid; - border-right: 5px solid; - border-color: $ignite-block-callout; +.block-callout-right { + @extend .block-callout; + + background-color: $ignite-block-callout-right-background; + border-color: $ignite-block-callout-right; + + i { + color: $ignite-block-callout-right; + } + + label { + color: $ignite-block-callout-right; + } } .labelHeader { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25fbb612/modules/control-center-web/src/main/js/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade index 0df34cf..d6bad13 100644 --- a/modules/control-center-web/src/main/js/views/includes/controls.jade +++ b/modules/control-center-web/src/main/js/views/includes/controls.jade @@ -15,12 +15,12 @@ limitations under the License. mixin block-callout(titleWorkflow, contentWorkflow, whatsNextWorkflow, whatsNextContent) - .block-callout-parent.block-callout-border.margin-bottom-dflt - .block-callout + .block-callout-parent.margin-bottom-dflt + .block-callout-left i.fa.fa-check-square.block-callout-header-left label.block-callout-header-left #{titleWorkflow} p(ng-bind-html=contentWorkflow) - .block-callout + .block-callout-right i.fa.fa-check-square.block-callout-header-right label.block-callout-header-right #{whatsNextWorkflow} p(ng-bind-html=whatsNextContent) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25fbb612/modules/control-center-web/src/main/js/views/sql/sql.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade index df24e7c..5818fb4 100644 --- a/modules/control-center-web/src/main/js/views/sql/sql.jade +++ b/modules/control-center-web/src/main/js/views/sql/sql.jade @@ -30,9 +30,8 @@ block container hr .docs-body(ng-controller='sqlController' ng-init='noteId = #{JSON.stringify(noteId)};') div(ng-if='!caches') - .block-callout-parent.block-callout-border.margin-bottom-dflt - .block-callout - p(ng-bind-html='joinTip(missingClientTip)') + .block-callout-right.margin-bottom-dflt(style='width: 100%') + p(ng-bind-html='joinTip(missingClientTip)') div(ng-if='caches') .block-callout-parent.block-callout-border.margin-bottom-dflt .block-callout @@ -88,4 +87,4 @@ block container // td(colspan='{{#{tab}.cols.length}}') // .loading-indicator tr(ng-repeat='row in displayedCollection track by $index') - td(ng-repeat='val in row track by $index') {{ val }} \ No newline at end of file + td(ng-repeat='val in row track by $index') {{ val }}
