ソースを参照

added new icons

Dustin Utecht 6 年 前
コミット
d3f0f064b8

+ 2 - 1
src/extensions/export/bootstrap-table-export.js

@@ -43,7 +43,8 @@ $.extend($.fn.bootstrapTable.columnDefaults, {
 $.extend($.fn.bootstrapTable.defaults.icons, {
 $.extend($.fn.bootstrapTable.defaults.icons, {
   export: {
   export: {
     bootstrap3: 'glyphicon-export icon-share',
     bootstrap3: 'glyphicon-export icon-share',
-    materialize: 'file_download'
+    materialize: 'file_download',
+    'bootstrap-table': 'icon-download'
   }[$.fn.bootstrapTable.theme] || 'fa-download'
   }[$.fn.bootstrapTable.theme] || 'fa-download'
 })
 })
 
 

+ 7 - 6
src/themes/bootstrap-table/bootstrap-table.json

@@ -57,7 +57,7 @@
         },
         },
         {
         {
           "id": 13,
           "id": 13,
-          "order": 0
+          "order": 15
         },
         },
         {
         {
           "id": 14,
           "id": 14,
@@ -89,7 +89,7 @@
         },
         },
         {
         {
           "id": 21,
           "id": 21,
-          "order": 0
+          "order": 14
         },
         },
         {
         {
           "id": 22,
           "id": 22,
@@ -837,7 +837,7 @@
         },
         },
         {
         {
           "id": 201,
           "id": 201,
-          "order": 0
+          "order": 12
         },
         },
         {
         {
           "id": 202,
           "id": 202,
@@ -15225,7 +15225,9 @@
       "classSelector": ".icon",
       "classSelector": ".icon",
       "showMetrics": false,
       "showMetrics": false,
       "showMetadata": false,
       "showMetadata": false,
-      "showVersion": false
+      "showVersion": false,
+      "cssVars": true,
+      "cssVarsFormat": "scss"
     },
     },
     "imagePref": {
     "imagePref": {
       "prefix": "icon-",
       "prefix": "icon-",
@@ -15240,6 +15242,5 @@
     "showCodes": true,
     "showCodes": true,
     "gridSize": 16
     "gridSize": 16
   },
   },
-  "uid": -1,
-  "time": 1560123380980
+  "uid": -1
 }
 }

+ 24 - 5
src/themes/bootstrap-table/font.scss

@@ -1,12 +1,13 @@
 @font-face {
 @font-face {
   font-family: 'bootstrap-table';
   font-family: 'bootstrap-table';
-  src:  url('fonts/bootstrap-table.eot?azu32x');
-  src:  url('fonts/bootstrap-table.eot?azu32x#iefix') format('embedded-opentype'),
-  url('fonts/bootstrap-table.ttf?azu32x') format('truetype'),
-  url('fonts/bootstrap-table.woff?azu32x') format('woff'),
-  url('fonts/bootstrap-table.svg?azu32x#bootstrap-table') format('svg');
+  src:  url('fonts/bootstrap-table.eot?t9ga3r');
+  src:  url('fonts/bootstrap-table.eot?t9ga3r#iefix') format('embedded-opentype'),
+  url('fonts/bootstrap-table.ttf?t9ga3r') format('truetype'),
+  url('fonts/bootstrap-table.woff?t9ga3r') format('woff'),
+  url('fonts/bootstrap-table.svg?t9ga3r#bootstrap-table') format('svg');
   font-weight: normal;
   font-weight: normal;
   font-style: normal;
   font-style: normal;
+  font-display: block;
 }
 }
 
 
 .icon {
 .icon {
@@ -24,24 +25,42 @@
   -moz-osx-font-smoothing: grayscale;
   -moz-osx-font-smoothing: grayscale;
 }
 }
 
 
+.icon-arrow-down-circle:before {
+  content: "\e907";
+}
+.icon-arrow-up-circle:before {
+  content: "\e908";
+}
 .icon-chevron-left:before {
 .icon-chevron-left:before {
   content: "\e900";
   content: "\e900";
 }
 }
 .icon-chevron-right:before {
 .icon-chevron-right:before {
   content: "\e901";
   content: "\e901";
 }
 }
+.icon-download:before {
+  content: "\e90c";
+}
 .icon-list:before {
 .icon-list:before {
   content: "\e902";
   content: "\e902";
 }
 }
 .icon-maximize:before {
 .icon-maximize:before {
   content: "\1f5ce";
   content: "\1f5ce";
 }
 }
+.icon-minus:before {
+  content: "\e90b";
+}
 .icon-move:before {
 .icon-move:before {
   content: "\e903";
   content: "\e903";
 }
 }
+.icon-plus:before {
+  content: "\e90a";
+}
 .icon-refresh-cw:before {
 .icon-refresh-cw:before {
   content: "\e904";
   content: "\e904";
 }
 }
+.icon-search:before {
+  content: "\e909";
+}
 .icon-toggle-right:before {
 .icon-toggle-right:before {
   content: "\e905";
   content: "\e905";
 }
 }

BIN
src/themes/bootstrap-table/fonts/bootstrap-table.eot


ファイルの差分が大きいため隠しています
+ 6 - 0
src/themes/bootstrap-table/fonts/bootstrap-table.svg


BIN
src/themes/bootstrap-table/fonts/bootstrap-table.ttf


BIN
src/themes/bootstrap-table/fonts/bootstrap-table.woff