Skip to content

Commit

Permalink
Merge pull request #86 from Kibibit/add-material-icons
Browse files Browse the repository at this point in the history 
add material icons
  • Loading branch information
@thatkookooguy
thatkookooguy committed Mar 23, 2016
2 parents 7f3c5ec + 1599a5b commit 8ea4b52
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 68 deletions.
112 changes: 56 additions & 56 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
{
"name": "kibibit-code-editor",
"version": "0.0.0",
"description": "code editor on the cloud",
"main": "server.js",
"scripts": {
"postinstall": "node ./node_modules/bower/lib/bin/bower install && node ./node_modules/gulp/bin/gulp styles",
"start": "node server.js",
"test": "gulp test"
},
"repository": {
"type": "git",
"url": "git://github.com/Kibibit/kibibit-code-editor.git"
},
"author": "neilkalman@gmail.com",
"license": "BSD-2-Clause",
"engines": {
"node": "4.2.3",
"npm": "3.3.12"
},
"dependencies": {
"bcrypt-nodejs": "0.0.3",
"body-parser": "^1.14.2",
"colors": "~1.1.2",
"directory-tree": "~0.1.1",
"express": "~4.13.3",
"scribe-js": "~2.0.4",
"serve-favicon": "~2.3.0",
"user-home": "^2.0.0"
},
"devDependencies": {
"bower": "^1.7.2",
"gulp": "~3.9.0",
"gulp-cached": "^1.1.0",
"gulp-concat": "~2.6.0",
"gulp-cssnano": "^2.1.0",
"gulp-depcheck": "^1.1.0",
"gulp-develop-server": "~0.5.0",
"gulp-help": "^1.6.1",
"gulp-jsbeautifier": "~1.0.1",
"gulp-jscs": "~3.0.2",
"gulp-livereload": "~3.8.1",
"gulp-rename": "~1.2.2",
"gulp-sass": "~2.1.1",
"gulp-shell": "~0.5.1",
"gulp-sourcemaps": "~1.6.0",
"gulp-util": "~3.0.7",
"jasmine-core": "~2.4.1",
"jscs": "~2.9.0",
"jscs-angular": "~1.2.1",
"karma": "~0.13.16",
"karma-jasmine": "~0.3.6",
"karma-phantomjs-launcher": "~1.0.0",
"phantomjs-prebuilt": "^2.1.3",
"yargs": "~3.32.0"
}
}
"name": "kibibit-code-editor",
"version": "0.0.0",
"description": "code editor on the cloud",
"main": "server.js",
"scripts": {
"postinstall": "node ./node_modules/bower/lib/bin/bower install && node ./node_modules/gulp/bin/gulp styles",
"start": "node server.js",
"test": "gulp test"
},
"repository": {
"type": "git",
"url": "git://github.com/Kibibit/kibibit-code-editor.git"
},
"author": "neilkalman@gmail.com",
"license": "BSD-2-Clause",
"engines": {
"node": "4.2.3",
"npm": "3.8.2"
},
"dependencies": {
"bcrypt-nodejs": "0.0.3",
"body-parser": "^1.14.2",
"colors": "~1.1.2",
"directory-tree": "~0.1.1",
"express": "~4.13.3",
"scribe-js": "~2.0.4",
"serve-favicon": "~2.3.0",
"user-home": "^2.0.0"
},
"devDependencies": {
"bower": "^1.7.2",
"gulp": "~3.9.0",
"gulp-cached": "^1.1.0",
"gulp-concat": "~2.6.0",
"gulp-cssnano": "^2.1.0",
"gulp-depcheck": "^1.1.0",
"gulp-develop-server": "~0.5.0",
"gulp-help": "^1.6.1",
"gulp-jsbeautifier": "~1.0.1",
"gulp-jscs": "~3.0.2",
"gulp-livereload": "~3.8.1",
"gulp-rename": "~1.2.2",
"gulp-sass": "~2.1.1",
"gulp-shell": "~0.5.1",
"gulp-sourcemaps": "~1.6.0",
"gulp-util": "~3.0.7",
"jasmine-core": "~2.4.1",
"jscs": "~2.9.0",
"jscs-angular": "~1.2.1",
"karma": "~0.13.16",
"karma-jasmine": "~0.3.6",
"karma-phantomjs-launcher": "~1.0.0",
"phantomjs-prebuilt": "^2.1.3",
"yargs": "~3.32.0"
}
}
32 changes: 20 additions & 12 deletions public/app/components/menuBar/menuBarTemplate.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ <h2 class="md-toolbar-tools">{{main.currentFolder}}</h2>
File
</button>
<md-menu-content>
<md-menu-item>
<md-menu-item class="md-indent">
<md-icon class="material-icons">insert_drive_file</md-icon>
<md-menu>
<md-button ng-click="$mdOpenMenu()">New</md-button>
<md-menu-content>
Expand All @@ -33,26 +34,30 @@ <h2 class="md-toolbar-tools">{{main.currentFolder}}</h2>
</md-menu-content>
</md-menu>
</md-menu-item>
<md-menu-item>
<md-menu-item class="md-indent">
<md-icon class="material-icons">gradient</md-icon>
<md-button ng-click="main.openProject()">
Open Project...
<span class="md-alt-text"> {{ 'M-O' | keyboardShortcut }}</span>
</md-button>
</md-menu-item>
<md-menu-item>
<md-menu-item class="md-indent">
<md-icon class="material-icons">save</md-icon>
<md-button disabled="disabled" ng-click="menuBarCtrl.sampleAction('Rename', $event)">
Rename
Save
</md-button>
</md-menu-item>
<md-menu-divider></md-menu-divider>
<md-menu-item>
<md-menu-item class="md-indent">
<md-icon class="material-icons">print</md-icon>
<md-button ng-click="menuBarCtrl.sampleAction('Print', $event)">
Print
<span class="md-alt-text">{{ 'M-P' | keyboardShortcut }}</span>
</md-button>
</md-menu-item>
<md-menu-divider></md-menu-divider>
<md-menu-item>
<md-menu-item class="md-indent">
<md-icon class="material-icons">share</md-icon>
<md-button ng-click="menuBarCtrl.sampleAction('share', $event)">
Share...
</md-button>
Expand All @@ -65,43 +70,44 @@ <h2 class="md-toolbar-tools">{{main.currentFolder}}</h2>
</button>
<md-menu-content>
<md-menu-item class="md-indent">
<md-icon md-svg-icon="undo"></md-icon>
<md-icon class="material-icons">undo</md-icon>
<md-button ng-click="menuBarCtrl.sampleAction('undo', $event)">
Undo
<span class="md-alt-text">{{ 'M-Z' | keyboardShortcut }}</span>
</md-button>
</md-menu-item>
<md-menu-item class="md-indent">
<md-icon md-svg-icon="redo"></md-icon>
<md-icon class="material-icons">redo</md-icon>
<md-button ng-click="menuBarCtrl.sampleAction('redo', $event)">
Redo
<span class="md-alt-text">{{ 'M-Y' | keyboardShortcut }}</span>
</md-button>
</md-menu-item>
<md-menu-divider></md-menu-divider>
<md-menu-item class="md-indent">
<md-icon md-svg-icon="content-cut"></md-icon>
<md-icon class="material-icons">content_cut</md-icon>
<md-button ng-click="menuBarCtrl.sampleAction('cut', $event)">
Cut
<span class="md-alt-text">{{ 'M-X' | keyboardShortcut }}</span>
</md-button>
</md-menu-item>
<md-menu-item class="md-indent">
<md-icon md-svg-icon="content-copy"></md-icon>
<md-icon class="material-icons">content_copy</md-icon>
<md-button ng-click="menuBarCtrl.sampleAction('copy', $event)">
Copy
<span class="md-alt-text">{{ 'M-C' | keyboardShortcut }}</span>
</md-button>
</md-menu-item>
<md-menu-item class="md-indent">
<md-icon md-svg-icon="content-paste"></md-icon>
<md-icon class="material-icons">content_paste</md-icon>
<md-button ng-click="menuBarCtrl.sampleAction('paste', $event)">
Paste
<span class="md-alt-text">{{ 'M-P' | keyboardShortcut }}</span>
</md-button>
</md-menu-item>
<md-menu-divider></md-menu-divider>
<md-menu-item class="md-indent">
<md-icon class="material-icons">find_in_page</md-icon>
<md-button ng-click="menuBarCtrl.sampleAction('Find and replace', $event)">
Find and replace...
<span class="md-alt-text">{{ 'M-S-H' | keyboardShortcut }}</span>
Expand Down Expand Up @@ -132,6 +138,7 @@ <h2 class="md-toolbar-tools">{{main.currentFolder}}</h2>
<md-menu-divider></md-menu-divider>
<md-menu-item type="checkbox" ng-model="menuBarCtrl.settings.compactControls">Compact controls</md-menu-item>
<md-menu-item class="md-indent">
<md-icon class="material-icons">fullscreen</md-icon>
<md-button ng-click="main.goFullscreen()">
Fullscreen
<span class="md-alt-text"> {{ 'F12' | keyboardShortcut }}</span>
Expand Down Expand Up @@ -191,7 +198,8 @@ <h2 class="md-toolbar-tools">{{main.currentFolder}}</h2>
Testing
</button>
<md-menu-content>
<md-menu-item>
<md-menu-item class="md-indent">
<md-icon class="material-icons">web_asset</md-icon>
<md-button ng-click="main.showAModal()">
Modal Example
<span class="md-alt-text"> {{ 'M-B' | keyboardShortcut }}</span>
Expand Down
1 change: 1 addition & 0 deletions public/app/views/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<!-- FOR ANGULAR ROUTING -->
<base href="/">
<!-- CSS Libraries -->
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" type="text/css" href="//maxcdn.bootstrapcdn.com/bootswatch/3.3.1/paper/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="assets/lib/bower_components/angular-material/angular-material.css">
<link rel="stylesheet" type="text/css" href="assets/lib/bower_components/angular-resizable/angular-resizable.min.css">
Expand Down

0 comments on commit 8ea4b52

Please sign in to comment.