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-5230 Load SVG icons with svg-sprite-loader, add icons JS entry point.
Date Thu, 18 May 2017 07:20:05 GMT
Repository: ignite
Updated Branches:
  refs/heads/master b352fc625 -> 0eb95078e


IGNITE-5230 Load SVG icons with svg-sprite-loader, add icons JS entry point.


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

Branch: refs/heads/master
Commit: 0eb95078e01c797842c4824cd915ab92638b5b0e
Parents: b352fc6
Author: Ilya Borisov <iborisov@gridgain.com>
Authored: Thu May 18 14:19:53 2017 +0700
Committer: Andrey Novikov <anovikov@gridgain.com>
Committed: Thu May 18 14:19:53 2017 +0700

----------------------------------------------------------------------
 modules/web-console/frontend/app/app.js         |  4 +-
 .../activities-user-dialog.tpl.pug              |  1 +
 .../app/components/ignite-icon/directive.js     | 67 +++++++++++++++
 .../app/components/ignite-icon/index.js         | 25 ++++++
 .../app/components/ignite-icon/style.scss       | 21 +++++
 .../list-of-registered-users.tpl.pug            |  6 +-
 .../components/web-console-header/template.pug  |  8 +-
 .../frontend/app/helpers/jade/mixins.pug        | 10 +--
 .../states/configuration/igfs/secondary.pug     |  2 +-
 .../frontend/app/primitives/btn/index.scss      | 42 ----------
 .../app/primitives/datepicker/index.pug         |  2 +-
 .../frontend/app/primitives/dropdown/index.pug  |  9 +-
 .../frontend/app/primitives/dropdown/index.scss | 88 ++++----------------
 .../frontend/app/primitives/modal/index.scss    | 18 ++--
 .../app/primitives/ui-grid-settings/index.scss  | 30 ++-----
 .../frontend/app/primitives/ui-grid/index.scss  |  6 +-
 .../gulpfile.babel.js/webpack/common.js         | 10 ++-
 modules/web-console/frontend/package.json       |  1 +
 .../frontend/public/images/icons/clock.svg      |  1 +
 .../frontend/public/images/icons/cross.svg      |  2 +-
 .../frontend/public/images/icons/csv.svg        |  1 +
 .../frontend/public/images/icons/export.svg     |  1 -
 .../frontend/public/images/icons/gear.svg       |  2 +-
 .../frontend/public/images/icons/index.js       | 22 +++++
 .../frontend/public/images/icons/manual.svg     |  1 +
 modules/web-console/frontend/views/index.pug    |  1 +
 26 files changed, 206 insertions(+), 175 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/app.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/app.js b/modules/web-console/frontend/app/app.js
index ab32589..e32b1ad 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -118,6 +118,7 @@ import clusterSelect from './components/cluster-select';
 import './components/input-dialog';
 import webConsoleHeader from './components/web-console-header';
 import webConsoleFooter from './components/web-console-footer';
+import igniteIcon from './components/ignite-icon';
 
 // Inject external modules.
 import 'ignite_modules_temp/index';
@@ -178,7 +179,8 @@ angular
     'ignite-console.modules',
     // Components
     webConsoleHeader.name,
-    webConsoleFooter.name
+    webConsoleFooter.name,
+    igniteIcon.name
 ])
 // Directives.
 .directive(...igniteAutoFocus)

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug
b/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug
index cb49dd0..33d5f62 100644
--- a/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug
+++ b/modules/web-console/frontend/app/components/activities-user-dialog/activities-user-dialog.tpl.pug
@@ -22,6 +22,7 @@
                     i.fa.fa-info-circle
                     | Activity details: {{ ctrl.user.userName }}
                 button.close(type='button' aria-label='Close' ng-click='$hide()')
+                     svg(ignite-icon='cross')
             .modal-body.modal-body-with-scroll(id='activities-user-dialog')
                 .panel--ignite
                     table.table--ignite(scrollable-container='#activities-user-dialog' st-table='displayedRows'
st-safe-src='ctrl.data')

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/components/ignite-icon/directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/ignite-icon/directive.js b/modules/web-console/frontend/app/components/ignite-icon/directive.js
new file mode 100644
index 0000000..de087d8
--- /dev/null
+++ b/modules/web-console/frontend/app/components/ignite-icon/directive.js
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import * as icons from '../../../public/images/icons/index.js';
+
+export default function() {
+    return {
+        restrict: 'A',
+        controller: class {
+            static $inject = ['$scope', '$attrs', '$sce', '$element', '$window'];
+
+            constructor($scope, $attrs, $sce, $element, $window) {
+                Object.assign(this, {$scope, $attrs, $sce, $element, $window});
+            }
+
+            $onInit() {
+                this.off = this.$scope.$on('$locationChangeSuccess', (e, url) => {
+                    this.render(this.getFragmentURL(url));
+                });
+
+                this.wrapper = document.createElement('div');
+            }
+
+            $onDestroy() {
+                this.$element = this.$window = this.wrapper = null;
+
+                this.off();
+            }
+
+            $postLink() {
+                this.name = this.$attrs.igniteIcon;
+                this.$element.attr('viewBox', icons[this.name].viewBox);
+
+                this.render(this.getFragmentURL());
+            }
+
+            getFragmentURL(url = this.$window.location.href) {
+                // All browsers except for Chrome require absolute URL of a fragment.
+                // Combine that with base tag and HTML5 navigation mode and you get this.
+                return `${url.split('#')[0]}#${this.name}`;
+            }
+
+            render(url) {
+                // templateNamespace: 'svg' does not work in IE11
+                this.wrapper.innerHTML = `<svg><use xlink:href="${url}" href="${url}"
/></svg>`;
+
+                Array.from(this.wrapper.childNodes[0].childNodes).forEach((n) => {
+                    this.$element[0].appendChild(n);
+                });
+            }
+        }
+    };
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/components/ignite-icon/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/ignite-icon/index.js b/modules/web-console/frontend/app/components/ignite-icon/index.js
new file mode 100644
index 0000000..e12b5b0
--- /dev/null
+++ b/modules/web-console/frontend/app/components/ignite-icon/index.js
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import angular from 'angular';
+
+import directive from './directive';
+import './style.scss';
+
+export default angular
+    .module('ignite-console.ignite-icon', [])
+    .directive('igniteIcon', directive);

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/components/ignite-icon/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/ignite-icon/style.scss b/modules/web-console/frontend/app/components/ignite-icon/style.scss
new file mode 100644
index 0000000..60b667f
--- /dev/null
+++ b/modules/web-console/frontend/app/components/ignite-icon/style.scss
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+[ignite-icon] {
+    height: 16px;
+    width: 16px;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.tpl.pug
b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.tpl.pug
index b64a177..d9e55af 100644
--- a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.tpl.pug
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.tpl.pug
@@ -18,7 +18,7 @@ include /app/helpers/jade/mixins
 
 mixin grid-settings()
     .grid-settings
-        i.fa.gear-icon(data-animation='am-flip-x' bs-dropdown='' aria-haspopup='true' aria-expanded='expanded'
data-auto-close='1' data-trigger='click')
+        svg(ignite-icon='gear' data-animation='am-flip-x' bs-dropdown='' aria-haspopup='true'
aria-expanded='expanded' data-auto-close='1' data-trigger='click')
         ul.select.dropdown-menu(role='menu')
             li
                 a(ng-click='$ctrl.gridOptions.selectedAll ? $ctrl.clearAllColumns() : $ctrl.selectAllColumns()')
@@ -53,8 +53,8 @@ mixin grid-settings()
         .panel-heading.ui-grid-settings
             .panel-title
                 +ignite-form-field-bsdropdown('Actions', '$ctrl.action', 'action', '!$ctrl.selected.length',
false, '$ctrl.actionOptions')
-                button.btn.btn--stroke(ng-click='$ctrl.exportCsv()' bs-tooltip='' data-title='Export
table to csv' data-placement='top')
-                    i.fa.export-icon
+                button.btn-ignite.btn-ignite--primary-outline(ng-click='$ctrl.exportCsv()'
bs-tooltip='' data-title='Export table to csv' data-placement='top')
+                    svg(ignite-icon='csv')
                 form.ui-grid-settings-dateperiod(name=form novalidate)
                     -var form = 'admin'
                     +ignite-form-field-datepicker('Period: from', '$ctrl.params.startDate',
'"startDate"', null, '$ctrl.params.endDate')

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/components/web-console-header/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/web-console-header/template.pug b/modules/web-console/frontend/app/components/web-console-header/template.pug
index 9e0d576..b2216c5 100644
--- a/modules/web-console/frontend/app/components/web-console-header/template.pug
+++ b/modules/web-console/frontend/app/components/web-console-header/template.pug
@@ -18,8 +18,8 @@
     | You are currently viewing user #[strong {{$ctrl.$rootScope.user.firstName}} {{$ctrl.$rootScope.user.lastName}}]
as administrator. #[a.link-info(ng-click='$ctrl.$rootScope.revertIdentity()') Revert to your
identity?]
 
 .wch-content.container
-    a(ui-sref="signin")
-        img.wch-logo(ng-src="{{::$ctrl.branding.headerLogo}}")
+    a(ui-sref='signin')
+        img.wch-logo(ng-src='{{::$ctrl.branding.headerLogo}}')
         
-    .wch-slot.wch-slot-left(ng-transclude="slotLeft")
-    .wch-slot.wch-slot-right(ng-transclude="slotRight")
\ No newline at end of file
+    .wch-slot.wch-slot-left(ng-transclude='slotLeft')
+    .wch-slot.wch-slot-right(ng-transclude='slotRight')
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/helpers/jade/mixins.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/helpers/jade/mixins.pug b/modules/web-console/frontend/app/helpers/jade/mixins.pug
index ae80ec8..3176cb8 100644
--- a/modules/web-console/frontend/app/helpers/jade/mixins.pug
+++ b/modules/web-console/frontend/app/helpers/jade/mixins.pug
@@ -531,9 +531,9 @@ mixin preview(master, generator, detail)
                 a(ng-class='{active: mode === "csharp"}' ng-click='mode = "csharp"') C#
                 //a(ng-class='{active: mode === "app.config"}' ng-click='mode = "app.config"')
app.config
             .preview-content(ng-switch='mode')
-                ignite-ui-ace-spring(ng-switch-when="spring" data-master=master data-generator=generator
ng-model='$parent.data' data-detail=detail)
-                ignite-ui-ace-java(ng-switch-when="java" data-master=master data-generator=generator
ng-model='$parent.data' data-detail=detail)
-                ignite-ui-ace-sharp(ng-switch-when="csharp" data-master=master data-generator=generator
ng-model='$parent.data' data-detail=detail)
+                ignite-ui-ace-spring(ng-switch-when='spring' data-master=master data-generator=generator
ng-model='$parent.data' data-detail=detail)
+                ignite-ui-ace-java(ng-switch-when='java' data-master=master data-generator=generator
ng-model='$parent.data' data-detail=detail)
+                ignite-ui-ace-sharp(ng-switch-when='csharp' data-master=master data-generator=generator
ng-model='$parent.data' data-detail=detail)
             .preview-content-empty(ng-if='!data')
                 label All Defaults
 
@@ -547,8 +547,8 @@ mixin preview-xml-java(master, generator, detail)
                 //a(ng-class='{active: mode === "csharp"}' ng-click='mode = "csharp"') C#
                 //a(ng-class='{active: mode === "app.config"}' ng-click='mode = "app.config"')
app.config
             .preview-content(ng-switch='mode')
-                ignite-ui-ace-spring(ng-switch-when="spring" data-master=master data-generator=generator
ng-model='$parent.data' data-detail=detail)
-                ignite-ui-ace-java(ng-switch-when="java" data-master=master data-generator=generator
ng-model='$parent.data' data-detail=detail)
+                ignite-ui-ace-spring(ng-switch-when='spring' data-master=master data-generator=generator
ng-model='$parent.data' data-detail=detail)
+                ignite-ui-ace-java(ng-switch-when='java' data-master=master data-generator=generator
ng-model='$parent.data' data-detail=detail)
                 //ignite-ui-ace-sharp(ng-switch-when="csharp" data-master=master data-generator=generator
ng-model='$parent.data' data-detail=detail)
             .preview-content-empty(ng-if='!data')
                 label All Defaults

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/modules/states/configuration/igfs/secondary.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/igfs/secondary.pug
b/modules/web-console/frontend/app/modules/states/configuration/igfs/secondary.pug
index 87e1f4f..797e877 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/igfs/secondary.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/igfs/secondary.pug
@@ -22,7 +22,7 @@ include /app/helpers/jade/mixins
 .panel.panel-default(ng-form=form novalidate)
     .panel-heading(bs-collapse-toggle='' ng-click=`ui.loadPanel('${form}')`)
         ignite-form-panel-chevron
-        label(id="secondaryFileSystem-title") Secondary file system
+        label(id='secondaryFileSystem-title') Secondary file system
         ignite-form-field-tooltip.tipLabel
             | Secondary file system is provided for pass-through, write-through, and read-through
purposes#[br]
             | #[a(href="https://apacheignite-fs.readme.io/docs/secondary-file-system" target="_blank")
More info]

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/primitives/btn/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/btn/index.scss b/modules/web-console/frontend/app/primitives/btn/index.scss
index deb0e58..7e45b7b 100644
--- a/modules/web-console/frontend/app/primitives/btn/index.scss
+++ b/modules/web-console/frontend/app/primitives/btn/index.scss
@@ -17,48 +17,6 @@
 
 @import "./../../../public/stylesheets/variables.scss";
 
-// TODO IGNITE-5165 Remove and replace with btn-ignite in templates.
-.btn.btn--stroke {
-    min-width: 36px;
-    height: 36px;
-
-    line-height: 34px;
-    text-align: center;
-
-    color: #ee2b27;
-    border: 1px solid #ee2b27;
-    background: initial;
-
-    i {
-        margin: 0;
-
-        &.export-icon {
-            display: block;
-            width: 16px;
-            height: 16px;
-            margin: auto;
-
-            background-image: url('/images/icons/export.svg');
-            background-repeat: no-repeat;
-            background-position: center;
-        }
-    }
-
-    &:hover, &:focus {
-        color: #a8110f;
-        border-color: #a8110f;
-
-        i {
-            filter: hue-rotate(1deg) saturate(85) brightness(.66);
-        }
-    }
-
-    &:focus {
-        outline: none;
-    }
-
-}
-
 @mixin active-focus-shadows(
     $focus: (0 0 5px #095d9a, 0 0 5px #095d9a),
     $active: (inset 0 1px 3px 0 rgba(0, 0, 0, 0.5))

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/primitives/datepicker/index.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/datepicker/index.pug b/modules/web-console/frontend/app/primitives/datepicker/index.pug
index 10453c0..e5da970 100644
--- a/modules/web-console/frontend/app/primitives/datepicker/index.pug
+++ b/modules/web-console/frontend/app/primitives/datepicker/index.pug
@@ -40,7 +40,7 @@ mixin ignite-form-field-datepicker(label, model, name, mindate, maxdate,
disable
 
             tabindex='0'
 
-            onkeydown="return false"
+            onkeydown='return false'
 
             data-ignite-form-panel-field=''
         )&attributes(attributes.attributes)

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/primitives/dropdown/index.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/dropdown/index.pug b/modules/web-console/frontend/app/primitives/dropdown/index.pug
index dfd229c..76fe2ed 100644
--- a/modules/web-console/frontend/app/primitives/dropdown/index.pug
+++ b/modules/web-console/frontend/app/primitives/dropdown/index.pug
@@ -16,7 +16,7 @@
 
 mixin ignite-form-field-bsdropdown(label, model, name, disabled, required, options, tip)
     .dropdown--ignite.ignite-form-field
-        .ignite-form-field__control(
+        button.btn-ignite.btn-ignite--primary-outline(
             data-ng-model=model
 
             data-ng-required=required && `${required}`
@@ -24,7 +24,7 @@ mixin ignite-form-field-bsdropdown(label, model, name, disabled, required,
optio
 
             bs-dropdown=''
 
-            data-trigger='hover focus'
+            data-trigger='hover focus click'
             data-placement='bottom-right'
             data-container='self'
             data-animation=''
@@ -33,9 +33,8 @@ mixin ignite-form-field-bsdropdown(label, model, name, disabled, required,
optio
             aria-haspopup='true'
             aria-expanded='false'
         )&attributes(attributes)
-            a.dropdown-toggle
-                span !{label}
-                span.caret
+            | !{label}
+            span.icon-right.fa.fa-caret-down
 
         ul.dropdown-menu(role='menu')
             li(ng-repeat=`item in ${options}` ng-if='item.available')

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/primitives/dropdown/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/dropdown/index.scss b/modules/web-console/frontend/app/primitives/dropdown/index.scss
index adf87ca..443324c 100644
--- a/modules/web-console/frontend/app/primitives/dropdown/index.scss
+++ b/modules/web-console/frontend/app/primitives/dropdown/index.scss
@@ -15,92 +15,32 @@
  * limitations under the License.
  */
 
-.ignite-form-field {
-    & &__control {
-        &:first-child:last-child {
-          width: 100% !important;
-        }
-    }
-}
+@import '../../../public/stylesheets/variables';
 
 .dropdown--ignite {
     font-style: normal;
 
-    .ignite-form-field__control {
-        outline: none;
-
-        font-size: 14px;
+    ul.dropdown-menu {
+        margin-top: 2px;
+        padding: 0;
 
-        & > a {
-            display: inline-block;
-            height: 36px;
+        border-color: #c5c5c5;
+        box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.3);
 
-            padding: 0 15px;
+        a {
+            padding-left: 15px;
+            padding-right: 15px;
 
-            border: 1px solid #ee2b27;
-            border-radius: 4px;
-
-            color: #de4538;
-            line-height: 34px;
-
-            .caret {
-                margin-left: 9px;
-                margin-right: -6px;
-            }
-        }
-
-        &:hover, &:focus {
-            & > a {
-                border-color: #a8110f;
+            color: $text-color;
+            line-height: 26px;
 
+            &:hover {
                 color: #a8110f;
-                text-decoration: none;
-            }
-        }
-
-        ul {
-            padding: 0;
-
-            border-color: #c5c5c5;
-            box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.3);
-
-            a {
-                padding-left: 15px;
-                padding-right: 15px;
-
-                color: #393939;
-                line-height: 26px;
-
-                &:hover {
-                    color: #a8110f;
-                }
-            }
-
-            li:not(:last-child) {
-                border-bottom: 1px solid #dddddd;
             }
         }
 
-        &[disabled='disabled'] {
-            opacity: .5;
-
-            & > a {
-                border-color: #c5c5c5;
-
-                color: #393939;
-            }
-
-            &:hover, &:focus {
-                & > a {
-                    border-color: #c5c5c5;
-
-                    color: #393939;
-                }
-            }
-
-            ul {
-                display: none !important;
-            }
+        li:not(:last-child) {
+            border-bottom: 1px solid $table-border-color;
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/primitives/modal/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/modal/index.scss b/modules/web-console/frontend/app/primitives/modal/index.scss
index c1c1fbf..e223504 100644
--- a/modules/web-console/frontend/app/primitives/modal/index.scss
+++ b/modules/web-console/frontend/app/primitives/modal/index.scss
@@ -111,21 +111,23 @@
 .modal--ignite {
     .close {
         position: absolute;
-        top: 23px;
+        top: 20px;
         right: 20px;
 
         display: block;
-        width: 16px;
-        height: 16px;
+        width: 12px;
+        height: 12px;
 
         opacity: 1;
-        background-image: url('/images/icons/cross.svg');
-        background-repeat: no-repeat;
-        background-position: center;
+        background: none;
+        color: $gray-light;
+        
+        [ignite-icon] {
+            height: 12px;
+        }
 
         &:hover, &:focus {
-            outline: none;
-            filter: hue-rotate(1deg) brightness(.49);
+            color: $text-color;
         }
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/primitives/ui-grid-settings/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/ui-grid-settings/index.scss b/modules/web-console/frontend/app/primitives/ui-grid-settings/index.scss
index 9cd497f..e192ad8 100644
--- a/modules/web-console/frontend/app/primitives/ui-grid-settings/index.scss
+++ b/modules/web-console/frontend/app/primitives/ui-grid-settings/index.scss
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+@import '../../../public/stylesheets/variables';
+
 .ui-grid-settings {
     color: #393939;
 
@@ -90,10 +92,6 @@
         top: -1px;
     }
 
-    .btn {
-        line-height: 20px;
-    }
-
     &-filter {
         .ignite-form-field {
             $height: 36px;
@@ -161,8 +159,7 @@
         margin-right: 35px;
     }
 
-    .btn.btn--stroke,
-    .dropdown--ignite.ignite-form-field,
+    .btn-ignite,
     &-filter,
     &-number-filter,
     &-dateperiod {
@@ -178,24 +175,9 @@
     }
 
     .grid-settings {
-        i.gear-icon {
-            position: relative;
-            top: 2px;
-
-            display: block;
-            width: 16px;
-            height: 16px;
-            margin: auto;
-
-            background-image: url('/images/icons/gear.svg');
-            background-repeat: no-repeat;
-            background-position: center;
-        }
-
-        &:hover, &:focus {
-            i.gear-icon {
-                filter: hue-rotate(1deg) saturate(85) brightness(.66);
-            }
+        svg {
+            cursor: pointer;
+            color: #424242;
         }
     }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/app/primitives/ui-grid/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/ui-grid/index.scss b/modules/web-console/frontend/app/primitives/ui-grid/index.scss
index 89e5c49..7908d06 100644
--- a/modules/web-console/frontend/app/primitives/ui-grid/index.scss
+++ b/modules/web-console/frontend/app/primitives/ui-grid/index.scss
@@ -404,9 +404,9 @@
             content: '';
     
             display: block;
-            width: 16px;
-            height: 16px;
-            margin: 8px 5px;
+            width: 12px;
+            height: 12px;
+            margin: 10px 5px;
 
             background-image: url('/images/icons/cross.svg');
             background-repeat: no-repeat;

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/gulpfile.babel.js/webpack/common.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/gulpfile.babel.js/webpack/common.js b/modules/web-console/frontend/gulpfile.babel.js/webpack/common.js
index 3d9616f..75b0ef4 100644
--- a/modules/web-console/frontend/gulpfile.babel.js/webpack/common.js
+++ b/modules/web-console/frontend/gulpfile.babel.js/webpack/common.js
@@ -30,6 +30,7 @@ import {srcDir, destDir, rootDir, igniteModulesDir} from '../paths';
 
 const viewsDir = path.resolve('views');
 const imagesDir = path.resolve('public/images');
+const iconsDir = path.resolve('public/images/icons');
 
 const NODE_ENV = process.env.NODE_ENV || 'production';
 const development = NODE_ENV === 'development';
@@ -149,9 +150,15 @@ export default {
             },
             {
                 test: /\.(ttf|eot|svg|woff(2)?)(\?v=[\d.]+)?(\?[a-z0-9#-]+)?$/,
+                exclude: [iconsDir],
                 loader: 'file?name=assets/fonts/[name].[ext]'
             },
             {
+                test: /.*\.svg$/,
+                include: [iconsDir],
+                use: ['svg-sprite-loader']
+            },
+            {
                 test: /\.(jpe?g|png|gif)$/i,
                 loader: 'file?name=assets/images/[name]_[hash].[ext]'
             },
@@ -175,7 +182,8 @@ export default {
             options: {
                 pug: {
                     basedir: rootDir
-                }
+                },
+                target: 'web'
             }
         }),
         new webpack.ProvidePlugin({

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/package.json b/modules/web-console/frontend/package.json
index 43cf0c9..31a34f2 100644
--- a/modules/web-console/frontend/package.json
+++ b/modules/web-console/frontend/package.json
@@ -117,6 +117,7 @@
     "resolve-url-loader": "2.0.2",
     "sass-loader": "6.0.3",
     "style-loader": "0.16.1",
+    "svg-sprite-loader": "2.1.0",
     "url": "0.11.0",
     "url-loader": "0.5.8",
     "webpack": "2.3.3",

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/public/images/icons/clock.svg
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/images/icons/clock.svg b/modules/web-console/frontend/public/images/icons/clock.svg
new file mode 100644
index 0000000..63414d3
--- /dev/null
+++ b/modules/web-console/frontend/public/images/icons/clock.svg
@@ -0,0 +1 @@
+<svg id='clock-icon' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path
fill="currentColor" d="M6.8 10.1L5.1 8.4l-.8.9 2.5 2.5L11.6 7l-.8-.8-4 3.9zM8 14.5c-3.1 0-5.6-2.5-5.6-5.6
0-3.1 2.5-5.6 5.6-5.6s5.6 2.5 5.6 5.6c0 3.1-2.5 5.6-5.6 5.6zM8 1.7C4 1.7.8 4.9.8 8.9S4 16.1
8 16.1s7.2-3.2 7.2-7.2S12 1.7 8 1.7zm-3.3-.5L3.7 0 0 3.1l1 1.2 3.7-3.1zM16 3.1L12.3 0l-1 1.2L15
4.3l1-1.2z"/></svg>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/public/images/icons/cross.svg
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/images/icons/cross.svg b/modules/web-console/frontend/public/images/icons/cross.svg
index 1a10375..5fa950d 100644
--- a/modules/web-console/frontend/public/images/icons/cross.svg
+++ b/modules/web-console/frontend/public/images/icons/cross.svg
@@ -1 +1 @@
-<svg id="cross-icon" width="12" height="12" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg"><path
fill="#757575" d="M10.791 0L6 4.791 1.209 0 0 1.209 4.791 6 0 10.791 1.209 12 6 7.209 10.791
12 12 10.791 7.209 6 12 1.209z" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg id="cross-icon" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg"><path
fill="currentColor" d="M10.791 0L6 4.791 1.209 0 0 1.209 4.791 6 0 10.791 1.209 12 6 7.209
10.791 12 12 10.791 7.209 6 12 1.209z" fill-rule="evenodd"/></svg>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/public/images/icons/csv.svg
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/images/icons/csv.svg b/modules/web-console/frontend/public/images/icons/csv.svg
new file mode 100644
index 0000000..b817b7b
--- /dev/null
+++ b/modules/web-console/frontend/public/images/icons/csv.svg
@@ -0,0 +1 @@
+<svg id="csv-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path
fill="currentColor" d="M10.4 61.6v380.8l280.1 49.8V11.8L10.4 61.6zm161 270.5l-23.5-61.7-23.1
58.5H92.7l37.5-81.6-34.8-80h33l21.3 55.2 25.3-59.9 31.7-1.6-39.6 85.5 41.2 88.3-36.9-2.7zM489.3
61.1H300v27.8h71.2V139H300v15.1h71.2v50.1H300v15.1h71.2v50.1H300v15.1h71.2v50.2H300v15.4h71.2v50.1H300v32.2h189.3c5.4
0 9.7-4.5 9.7-10V71.2c0-5.6-4.4-10.1-9.7-10.1zm-23.1 339.2h-80.3v-50.1h80.3v50.1zm0-65.5h-80.3v-50.2h80.3v50.2zm0-65.2h-80.3v-50.1h80.3v50.1zm0-65.3h-80.3v-50.2h80.3v50.2zm0-65.2h-80.3V88.9h80.3v50.2z"/></svg>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/public/images/icons/export.svg
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/images/icons/export.svg b/modules/web-console/frontend/public/images/icons/export.svg
deleted file mode 100644
index 359c3df..0000000
--- a/modules/web-console/frontend/public/images/icons/export.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="export-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path
fill="#ee2b27" d="M10.4 61.6v380.8l280.1 49.8V11.8L10.4 61.6zm161 270.5l-23.5-61.7-23.1 58.5H92.7l37.5-81.6-34.8-80h33l21.3
55.2 25.3-59.9 31.7-1.6-39.6 85.5 41.2 88.3-36.9-2.7zM489.3 61.1H300v27.8h71.2V139H300v15.1h71.2v50.1H300v15.1h71.2v50.1H300v15.1h71.2v50.2H300v15.4h71.2v50.1H300v32.2h189.3c5.4
0 9.7-4.5 9.7-10V71.2c0-5.6-4.4-10.1-9.7-10.1zm-23.1 339.2h-80.3v-50.1h80.3v50.1zm0-65.5h-80.3v-50.2h80.3v50.2zm0-65.2h-80.3v-50.1h80.3v50.1zm0-65.3h-80.3v-50.2h80.3v50.2zm0-65.2h-80.3V88.9h80.3v50.2z"/></svg>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/public/images/icons/gear.svg
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/images/icons/gear.svg b/modules/web-console/frontend/public/images/icons/gear.svg
index a9a7269..83527c2 100644
--- a/modules/web-console/frontend/public/images/icons/gear.svg
+++ b/modules/web-console/frontend/public/images/icons/gear.svg
@@ -1 +1 @@
-<svg id="gear-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.st0{fill:#424242}</style><path
class="st0" d="M14.1 8.8c0-.3.1-.5.1-.8 0-.3 0-.5-.1-.8l1.7-1.3c.2-.1.2-.3.1-.5l-1.6-2.8c-.1-.2-.3-.2-.5-.2l-2
.8c-.4-.3-.9-.6-1.4-.8L10.1.3C10 .1 9.8 0 9.6 0H6.4c-.3 0-.4.1-.5.3l-.3 2.2c-.5.2-1 .5-1.4.8l-2-.8c-.2-.1-.4-.1-.5.1L.1
5.4c-.1.2-.1.4.1.5l1.7 1.3c0 .3-.1.5-.1.8 0 .3 0 .5.1.8L.2 10.1c-.2.1-.2.3-.1.5l1.6 2.8c.1.2.3.2.5.2l2-.8c.4.3.9.6
1.4.8l.3 2.1c.1.2.2.3.5.3h3.3c.2 0 .4-.1.4-.3l.3-2.1c.5-.2 1-.5 1.4-.8l2 .8c.2.1.4 0 .5-.2l1.6-2.8c.1-.2.1-.4-.1-.5l-1.7-1.3zM8
11c-1.7 0-3-1.3-3-3s1.3-3 3-3 3 1.3 3 3-1.3 3-3 3z"/></svg>
\ No newline at end of file
+<svg id="gear-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g fill="currentColor"><path
d="M14.1 8.8c0-.3.1-.5.1-.8 0-.3 0-.5-.1-.8l1.7-1.3c.2-.1.2-.3.1-.5l-1.6-2.8c-.1-.2-.3-.2-.5-.2l-2
.8c-.4-.3-.9-.6-1.4-.8L10.1.3C10 .1 9.8 0 9.6 0H6.4c-.3 0-.4.1-.5.3l-.3 2.2c-.5.2-1 .5-1.4.8l-2-.8c-.2-.1-.4-.1-.5.1L.1
5.4c-.1.2-.1.4.1.5l1.7 1.3c0 .3-.1.5-.1.8 0 .3 0 .5.1.8L.2 10.1c-.2.1-.2.3-.1.5l1.6 2.8c.1.2.3.2.5.2l2-.8c.4.3.9.6
1.4.8l.3 2.1c.1.2.2.3.5.3h3.3c.2 0 .4-.1.4-.3l.3-2.1c.5-.2 1-.5 1.4-.8l2 .8c.2.1.4 0 .5-.2l1.6-2.8c.1-.2.1-.4-.1-.5l-1.7-1.3zM8
11c-1.7 0-3-1.3-3-3s1.3-3 3-3 3 1.3 3 3-1.3 3-3 3z"/></g></svg>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/public/images/icons/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/images/icons/index.js b/modules/web-console/frontend/public/images/icons/index.js
new file mode 100644
index 0000000..c3acc9a
--- /dev/null
+++ b/modules/web-console/frontend/public/images/icons/index.js
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export csv from './csv.svg';
+export cross from './cross.svg';
+export gear from './gear.svg';
+export clock from './clock.svg';
+export manual from './manual.svg';

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/public/images/icons/manual.svg
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/images/icons/manual.svg b/modules/web-console/frontend/public/images/icons/manual.svg
new file mode 100644
index 0000000..434bde4
--- /dev/null
+++ b/modules/web-console/frontend/public/images/icons/manual.svg
@@ -0,0 +1 @@
+<svg id='manual-icon' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path
fill="currentColor" d="M10.7 8.3c.6 0 1.1-.5 1.1-1.1S11.3 6 10.7 6c-.7 0-1.2.5-1.2 1.1s.5
1.2 1.2 1.2zm-5.4 0c.6 0 1.1-.5 1.1-1.1S6 6 5.3 6s-1.1.5-1.1 1.1.5 1.2 1.1 1.2zM8 13.2c1.8
0 3.3-1.1 3.9-2.7H4.1c.6 1.6 2.1 2.7 3.9 2.7zm0 1.3c-3.1 0-5.6-2.5-5.6-5.6 0-3.1 2.5-5.6 5.6-5.6s5.6
2.5 5.6 5.6c0 3.1-2.5 5.6-5.6 5.6zM8 1.7C4 1.7.8 4.9.8 8.9S4 16.1 8 16.1s7.2-3.2 7.2-7.2S12
1.7 8 1.7z"/></svg>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/0eb95078/modules/web-console/frontend/views/index.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/index.pug b/modules/web-console/frontend/views/index.pug
index c68790d..f8f13dd 100644
--- a/modules/web-console/frontend/views/index.pug
+++ b/modules/web-console/frontend/views/index.pug
@@ -21,6 +21,7 @@ html(ng-app='ignite-console' id='app' ng-strict-di)
 
         meta(http-equiv='content-type' content='text/html; charset=UTF8')
         meta(http-equiv='content-language' content='en')
+        meta(http-equiv='X-UA-Compatible' content='IE=Edge')
 
         title(ng-bind='$meta.title')
 


Mime
View raw message