Pārlūkot izejas kodu

Add material design icons

Johannes Zellner 11 gadi atpakaļ
vecāks
revīzija
b96c37faa8
6 mainītis faili ar 87 papildinājumiem un 5 dzēšanām
  1. 2 1
      gulpfile.js
  2. 1 0
      package.json
  3. 0 3
      src/index.html
  4. 2 0
      src/js/Application.js
  5. 17 0
      src/js/Settings.js
  6. 65 1
      src/scss/index.scss

+ 2 - 1
gulpfile.js

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

+ 1 - 0
package.json

@@ -16,6 +16,7 @@
     "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"

+ 0 - 3
src/index.html

@@ -6,13 +6,10 @@
 
     <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"/>
     <link rel="stylesheet" href="3rdparty/roboto.min.css"/>
-    <!-- <link rel="stylesheet" href="3rdparty/mdi/css/materialdesignicons.min.css" media="all" type="text/css"/> -->
 
     <link rel="stylesheet" href="index.min.css"/>
 

+ 2 - 0
src/js/Application.js

@@ -3,6 +3,7 @@ var React = require('react'),
     classNames = require('classnames'),
     Core = require('./core.js').Core,
     ThingModal = require('./ThingModal.js'),
+    Settings = require('./Settings.js'),
     ThingList = require('./ThingList.js'),
     SearchBox = require('./SearchBox.js');
 
@@ -38,6 +39,7 @@ var Application = React.createClass({
     return (
       <div>
         <ThingModal ref="modalAdd" onAdded={this.refresh} onUpdated={this.refresh}/>
+        <Settings />
         <div className="container">
           <div className="row">
             <div className="col-md-4"></div>

+ 17 - 0
src/js/Settings.js

@@ -0,0 +1,17 @@
+var React = require('react'),
+    ReactDOM = require('react-dom'),
+    classNames = require('classnames');
+
+var Settings = React.createClass({
+  render: function () {
+    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>
+        </div>
+      </div>
+    );
+  }
+});
+
+module.exports = Settings;

+ 65 - 1
src/scss/index.scss

@@ -58,4 +58,68 @@
     100% {
         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); }