ソースを参照

Use icons from the cdn

Johannes Zellner 11 年 前
親
コミット
b6c905391b
5 ファイル変更、4 行追加、68 行削除
  1. 1 2
      gulpfile.js
  2. 0 1
      package.json
  3. 2 0
      src/index.html
  4. 1 1
      src/js/Settings.js
  5. 0 64
      src/scss/index.scss

+ 1 - 2
gulpfile.js

@@ -39,8 +39,7 @@ gulp.task('3rdparty', function () {
         'node_modules/bootstrap/dist/css/*.min.css*',
         'node_modules/bootstrap/dist/js/*.min.js*',
         'node_modules/bootstrap-material-design/dist/css/*.min.css*',
-        'node_modules/bootstrap-material-design/dist/js/*.min.js*',
-        'node_modules/material-design-icons/iconfont/MaterialIcons-Regular.?(ttf|woff|woff2)'
+        'node_modules/bootstrap-material-design/dist/js/*.min.js*'
     ]).pipe(gulp.dest('dist/3rdparty/'));
 });
 

+ 0 - 1
package.json

@@ -16,7 +16,6 @@
     "classnames": "^2.2.1",
     "del": "^2.2.0",
     "marked": "^0.3.5",
-    "material-design-icons": "^2.1.1",
     "react": "^0.14.3",
     "react-dom": "^0.14.3",
     "superagent": "^1.5.0"

+ 2 - 0
src/index.html

@@ -6,6 +6,8 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
+    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"/>
+
     <link rel="stylesheet" href="3rdparty/bootstrap.min.css"/>
     <link rel="stylesheet" href="3rdparty/material.min.css"/>
     <link rel="stylesheet" href="3rdparty/ripples.min.css"/>

+ 1 - 1
src/js/Settings.js

@@ -7,7 +7,7 @@ var Settings = React.createClass({
     return (
       <div className="settings">
         <div className="settings-action">
-          <button className="btn btn-default btn-fab" data-toggle="modal" data-target="#modalSettings"><i className="material-icons">more_vert</i></button>
+          <button className="btn btn-default btn-fab" data-toggle="modal" data-target="#modalSettings"><i className="material-icons">settings</i></button>
         </div>
       </div>
     );

+ 0 - 64
src/scss/index.scss

@@ -59,67 +59,3 @@
         transform:rotate(360deg)
     }
 }
-
-@font-face {
-  font-family: 'Material Icons';
-  font-style: normal;
-  font-weight: 400;
-  src: url(https://example.com/MaterialIcons-Regular.eot); /* For IE6-8 */
-  src: local('Material Icons'),
-       local('MaterialIcons-Regular'),
-       url(/3rdparty/MaterialIcons-Regular.woff2) format('woff2'),
-       url(/3rdparty/MaterialIcons-Regular.woff) format('woff'),
-       url(/3rdparty/MaterialIcons-Regular.ttf) format('truetype');
-}
-
-.material-icons {
-  font-family: 'Material Icons';
-  font-weight: normal;
-  font-style: normal;
-  font-size: 24px;  /* Preferred icon size */
-  display: inline-block;
-  width: 1em;
-  height: 1em;
-  line-height: 1;
-  text-transform: none;
-  letter-spacing: normal;
-  word-wrap: normal;
-  white-space: nowrap;
-  direction: ltr;
-
-  /* Support for all WebKit browsers. */
-  -webkit-font-smoothing: antialiased;
-  /* Support for Safari and Chrome. */
-  text-rendering: optimizeLegibility;
-
-  /* Support for Firefox. */
-  -moz-osx-font-smoothing: grayscale;
-
-  /* Support for IE. */
-  font-feature-settings: 'liga';
-}
-
-// Rules for sizing the icon.
-.material-icons.md-18 { font-size: 18px; }
-.material-icons.md-24 { font-size: 24px; }
-.material-icons.md-36 { font-size: 36px; }
-.material-icons.md-48 { font-size: 48px; }
-
-// Rules for using icons as black on a light background.
-.material-icons.md-dark { color: rgba(0, 0, 0, 0.54); }
-.material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); }
-
-// Rules for using icons as white on a dark background.
-.material-icons.md-light { color: rgba(255, 255, 255, 1); }
-.material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); }
-
-.material-icons.md-18 { font-size: 18px; }
-.material-icons.md-24 { font-size: 24px; }
-.material-icons.md-36 { font-size: 36px; }
-.material-icons.md-48 { font-size: 48px; }
-
-.material-icons.md-dark { color: rgba(0, 0, 0, 0.54); }
-.material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); }
-
-.material-icons.md-light { color: rgba(255, 255, 255, 1); }
-.material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); }