ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [1/2] ignite git commit: # GG-843 Fixed scrollbars under mac.
Date Fri, 11 Sep 2015 08:12:26 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843 61c4a57a7 -> 3a7c11eff


# GG-843 Fixed scrollbars under mac.


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

Branch: refs/heads/ignite-843
Commit: a12d2edf9b3fbff70dffc949d8f73ec61dc722d4
Parents: 9a18467
Author: Andrey <anovikov@gridgain.com>
Authored: Fri Sep 11 15:13:01 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Fri Sep 11 15:13:01 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/public/stylesheets/style.scss   | 40 ++++++++++++++++++--
 .../src/main/js/views/sql/sql.jade              |  8 ++--
 2 files changed, 41 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a12d2edf/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 d0504a9..aaeaa1c 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
@@ -980,19 +980,20 @@ label {
 .fa-chevron-circle-down {
     color: $brand-primary;
     margin-right: 5px;
-    font-size: 16px;
 }
 
 .fa-chevron-circle-up {
     color: $brand-primary;
     margin-right: 5px;
-    font-size: 16px;
 }
 
 .fa-chevron-circle-right {
     color: $brand-primary;
     margin-right: 5px;
-    font-size: 16px;
+
+    font-size: 15px;
+
+    line-height: $line-height-base;
 }
 
 label.required:after {
@@ -1157,6 +1158,10 @@ a {
 .advanced-options {
     @extend .section;
     margin-bottom: 20px;
+
+    i {
+        font-size: 16px;
+    }
 }
 
 .margin-left-dflt {
@@ -1449,3 +1454,32 @@ a {
 button.dropdown-toggle {
     margin-right: 5px;
 }
+
+// Prevent scroll bars from being hidden for OS X.
+::-webkit-scrollbar {
+    -webkit-appearance: none;
+}
+
+::-webkit-scrollbar:vertical {
+    width: 11px;
+}
+
+::-webkit-scrollbar:horizontal {
+    height: 11px;
+}
+
+::-webkit-scrollbar-thumb {
+    border-radius: 8px;
+    border: 2px solid white; /* should match background, can't be transparent */
+    background-color: rgba(0, 0, 0, .5);
+}
+
+::-webkit-scrollbar-track {
+    background-color: #fff;
+    border-radius: 8px;
+}
+
+.btn:focus {
+    outline: none;
+    border: 1px solid #ccc;
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/a12d2edf/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 1152159..9d7e7e9 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
@@ -103,7 +103,7 @@ block container
                                         a.btn.btn-primary(ng-disabled='!actionAvailable(paragraph,
false)' ng-click='actionAvailable(paragraph, false) ? scan(paragraph): ""' data-placement='bottom'
bs-tooltip data-title='{{actionTooltip(paragraph, "execute scan", false)}}') Scan
                                         .pull-right
                                             labelHide Hide system columns:
-                                            button.btn.btn-default.fa.fa-columns.tipLabel(ng-class='{"btn-info":
paragraph.hideSystemColumns}' ng-click='toggleSystemColumns(paragraph)' ng-disabled='paragraph.disabledSystemColumns')
+                                            a.btn.btn-default.fa.fa-columns.tipLabel(ng-class='{"btn-info":
paragraph.hideSystemColumns}' ng-click='toggleSystemColumns(paragraph)' ng-disabled='paragraph.disabledSystemColumns')
                                             label.tipLabel Refresh rate:
                                             button.btn.btn-default.fa.fa-clock-o.tipLabel(ng-class='{"btn-info":
paragraph.rate && paragraph.rate.installed}' bs-popover data-template-url='rate' data-placement='left'
data-auto-close='1' data-trigger='click') {{rateAsString(paragraph)}}
                                             label.tipLabel Page size:
@@ -116,7 +116,7 @@ block container
                                     .sql-empty-result(ng-show='!paragraph.rows') Result set
is empty.
                                     div(ng-show='paragraph.rows && paragraph.result
=== "table"')
                                         .sql-table-total(ng-show='paragraph.rows &&
paragraph.result === "table"')
-                                            label Page #:&nbsp;
+                                            label Page #&nbsp;
                                             b {{paragraph.page}}&nbsp;&nbsp;&nbsp;
                                             label Results so far:&nbsp;
                                             b {{paragraph.rows.length + paragraph.total}}
@@ -141,5 +141,5 @@ block container
                                             svg
                                     div(ng-show='paragraph.queryId')
                                         hr(style='margin-top: 0; margin-bottom: 5px')
-                                        a(style='float: right; margin-bottom: 5px;margin-right:
10px;' ng-click='nextPage(paragraph)') Next page
-                                        i.fa.fa-chevron-circle-right(style='float: right'
ng-click='nextPage(paragraph)')
+                                        i.fa.fa-chevron-circle-right(style='float: right;margin-right:
10px;' ng-click='nextPage(paragraph)')
+                                        a(style='float: right; margin-bottom: 5px;margin-right:
5px;' ng-click='nextPage(paragraph)') Next


Mime
View raw message