ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: IGNITE-1671 Fixed chart setting under firefox
Date Wed, 14 Oct 2015 08:29:47 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 173f565b5 -> 78df19b14


IGNITE-1671 Fixed chart setting under firefox


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/78df19b1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/78df19b1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/78df19b1

Branch: refs/heads/ignite-843-rc1
Commit: 78df19b146a7c65ae6eca5c6b09f8479360f01bb
Parents: 173f565
Author: Andrey <anovikov@gridgain.com>
Authored: Wed Oct 14 15:29:46 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Wed Oct 14 15:29:46 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/public/stylesheets/style.scss                 | 5 +++++
 modules/control-center-web/src/main/js/views/sql/sql.jade     | 7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/78df19b1/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 b1fcc8b..4e77d93 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
@@ -1527,6 +1527,11 @@ a {
         font-size: $font-size-base;
         color: $link-color !important;
     }
+
+    div {
+        margin-left: 5px;
+        display: inline-block;
+    }
 }
 
 .chart-settings {

http://git-wip-us.apache.org/repos/asf/ignite/blob/78df19b1/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 7cce7c9..0bad548 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
@@ -33,10 +33,9 @@ mixin btn-toolbar-data(btn, kind, tip)
 
 mixin chart-settings(mdl)
     .chart-settings-link.row(ng-show='paragraph.chart')
-        .col-sm-2
-            i.fa.fa-chevron-circle-down
-            a(ng-click='$event.stopPropagation()' bs-popover data-template-url='chart-settings'
data-placement='bottom' data-auto-close='1' data-trigger='click') Chart settings
-        .col-sm-3(ng-show='paragraphTimeSpanVisible(paragraph)')
+        i.fa.fa-chevron-circle-down
+        a(ng-click='$event.stopPropagation()' bs-popover data-template-url='chart-settings'
data-placement='bottom' data-auto-close='1' data-trigger='click') Chart settings
+        div(ng-show='paragraphTimeSpanVisible(paragraph)')
             label Show
             button.select-manual-caret.btn.btn-default(ng-model='paragraph.timeLineSpan'
bs-options='item for item in timeLineSpans' bs-select data-caret-html='<span class="caret"></span>')
             label min


Mime
View raw message