From ef7fb43d5993d8330aff6663d8eda135b528f012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Kintzi?= Date: Wed, 27 Aug 2014 12:15:25 +0200 Subject: [PATCH 01/13] Allow to configure fonts path --- src/less/dashboard/main.less | 12 ++++++------ src/less/dashboard/variables.less | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/less/dashboard/main.less b/src/less/dashboard/main.less index 7b3effea..aa016b1d 100644 --- a/src/less/dashboard/main.less +++ b/src/less/dashboard/main.less @@ -1,18 +1,18 @@ /* Fonts */ @font-face { font-family: 'Montserrat'; - src: url('../../fonts/montserrat-regular-webfont.eot'); - src: url('../../fonts/montserrat-regular-webfont.eot?#iefix') format('embedded-opentype'), - url('../../fonts/montserrat-regular-webfont.woff') format('woff'), - url('../../fonts/montserrat-regular-webfont.ttf') format('truetype'), - url('../../fonts/montserrat-regular-webfont.svg#montserratregular') format('svg'); + src: url('@{fontPath}/montserrat-regular-webfont.eot'); + src: url('@{fontPath}/montserrat-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('@{fontPath}/montserrat-regular-webfont.woff') format('woff'), + url('@{fontPath}/montserrat-regular-webfont.ttf') format('truetype'), + url('@{fontPath}/montserrat-regular-webfont.svg#montserratregular') format('svg'); font-weight: normal; font-style: normal; } @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'Montserrat'; - src: url('../../fonts/montserrat-regular-webfont.svg') format('svg'); + src: url('@{fontPath}/montserrat-regular-webfont.svg') format('svg'); } select { font-family: Arial, Helvetica, sans-serif; diff --git a/src/less/dashboard/variables.less b/src/less/dashboard/variables.less index 51992939..8fd52cb4 100644 --- a/src/less/dashboard/variables.less +++ b/src/less/dashboard/variables.less @@ -8,3 +8,7 @@ @sidebarHeaderColor: darken(@sidebarBaseColor, 2%); /* Sidebar title text colour */ @sidebarTitleColor: lighten(@sidebarBaseColor, 30%); /*#627cb7*/ + + + /* Font path: */ + @fontPath: '../../fonts'; From 7cc649ec851895ca7d10dd640bec15b8e376c423 Mon Sep 17 00:00:00 2001 From: bertyhell Date: Wed, 20 Aug 2014 12:08:24 +0200 Subject: [PATCH 02/13] fixed minor typo node_modules instead of node_mopdules --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ac9976ca..ccd14175 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,8 @@ The project uses: Clone the repo, run `npm install` to install all dependencies. After that you can either: -- Run `node_mopdules/.bin/gulp build` to build the project. -- Run `node_mopdules/.bin/gulp` to start a local webserver with **AWESOME** automatic compilation and [Livereload](http://livereload.com/) (We use [gulp-connect](https://github.com/avevlad/gulp-connect)). +- Run `node_modules/.bin/gulp build` to build the project. +- Run `node_modules/.bin/gulp` to start a local webserver with **AWESOME** automatic compilation and [Livereload](http://livereload.com/) (We use [gulp-connect](https://github.com/avevlad/gulp-connect)). ### Stylesheets @@ -116,4 +116,4 @@ Usage: Hello Universe -``` \ No newline at end of file +``` From c60810cc3ffb4bf873920bf4f62bb60b7102e0d4 Mon Sep 17 00:00:00 2001 From: Elliot Hesp Date: Sun, 31 Aug 2014 19:59:22 +0100 Subject: [PATCH 03/13] Updated Readme & Remove unused sidebar links --- README.md | 75 +++++++++++++++++++++++++++++--------------------- src/index.html | 10 ------- 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index ccd14175..84e56a8e 100644 --- a/README.md +++ b/README.md @@ -1,51 +1,47 @@ ## AngularJS + Bootstrap Responsive Dashboard -This dashboard front-end was created as I was lacking a simple responsive but slick looking dashboard for another project of mine. Other available dashboards were bloated with external plugins and required a lot of hackery/work out of the box - plus the fact many were powered by jQuery. The design takes inspiration from other dashboards around, but the code to create the layout is my own. +This AngularJS driven dashboard was created as there is a lack of free, open-source, readable and bloat free admin templates. Many premium templates require a lot of hackery out of the box - this template is intended to have only the extra features we think are needed to get up and running as quick as possible. -Compatibility/Tested: -* Chrome, Firefox, IE 11+ -* Works best on screen sizes greater than ~335px +> [Live Demo!](http://ehesp.github.io/Responsive-Dashboard) -[Responsive Screenshots](http://ami.responsivedesign.is/?url=http://ehesp.github.io/Responsive-Dashboard/) +[*Want the dashboard without AngularJS and build functionality?*](https://github.com/Ehesp/Responsive-Dashboard/tree/barebones) -Live Example: -* http://ehesp.github.io/Responsive-Dashboard/ - -> jQuery version available on the [jQuery branch](https://github.com/Ehesp/Responsive-Dashboard/tree/jquery)! - -### Usage - -Simply clone, or download and unzip this repository and access the dist folder via your browser. There is only one page on show (`index.html`), and the relevant sections have been commented. - -### Development - -Requirements: +### Requirements * [Node](http://nodejs.org/) * [NPM](http://npmjs.org/) -The project uses: +### Usage + +This project uses the following tools: * [Gulp](http://gulpjs.com/) * [Bower](http://bower.io/) * [AngularJS](https://angularjs.org/) #### Getting Started -Clone the repo, run `npm install` to install all dependencies. -After that you can either: -- Run `node_modules/.bin/gulp build` to build the project. -- Run `node_modules/.bin/gulp` to start a local webserver with **AWESOME** automatic compilation and [Livereload](http://livereload.com/) (We use [gulp-connect](https://github.com/avevlad/gulp-connect)). +1. Clone the repository and run `npm install` to install all dependencies. This will also run the `bower install` automatically after completion. +2. There are now two `gulp` commands to choose from: +- `node_modules/.bin/gulp build` to build the project. +- `node_modules/.bin/gulp` to start a local webserver with **AWESOME** automatic compilation and [Livereload](http://livereload.com/) (We use [gulp-connect](https://github.com/avevlad/gulp-connect)). +3. The files will now be built into the `dist` directory. -### Stylesheets +### Styling -#### Theme +Currently, only the sidebar colours can be easily be changed. [LESS](http://lesscss.org/) is used for styling so we take advantage of variables - checkout `src/less/dashboard/variables.less` and change the sidebar base colour, the others will be converted for you. -Responsive Dashboard uses [LESS](http://lesscss.org/) for styling so we take advantage of variables to theme the dashboard. Take a look at `src/less/dashboard/variables.less` and customize with your own colors. +#### Hamburg Menu -#### Bootstrap + Font Awesome +By default the responsive dashboard menu on a small sized screen sticks to the left side of the screen. If you wish the menu to have 'native app' menu functionality, where the sidebar overlaps the content from the left and side, simply add the `hamburg` class to the body: -The grid layout and components are powered by [Bootstrap](http://getbootstrap.com/), also Font Awesome icons are ready to use. +```HTML + +``` -##### Widgets +### Bootstrap & Font Awesome + +The grid layout and components are powered by [Bootstrap](http://getbootstrap.com/), also [Font Awesome](http://fontawesome.io/) icons are ready to use. + +#### Widgets A widget is essentially a white container box with some styling, that will expand 100% of it's parent container. To separate these out, I suggest putting them inside a bootstrap grid item, e.g: @@ -60,7 +56,7 @@ Any content can be inside a `widget-body`, which will be padded by default. Thre > If no size is set, the content will expand vertically based on content size. -###### Widget Body +##### Widget Body **Padding** @@ -106,14 +102,29 @@ Usage of the directive: `` or `
` If you want to change it, simply replace the template and CSS! -#### Widget component +##### Widget component -Usage: +Instead of hardcoding the widget HTML directly, AngularJS widget component functionality is ready to use: ```HTML Hello Universe - + ``` + +### FAQ + +#### What is the dashboard compatible with? + +The dashboard uses CSS3 for animations along with other style enhancements meaning browsers supporting this (Chrome, Firefox, IE11+) are compatible. +As for smaller screen sizes, the dashboard works best on screen sizes greater than ~335px. + +#### Any screenshots? + +Checkout [am-i-responsive](http://ami.responsivedesign.is/?url=http://ehesp.github.io/Responsive-Dashboard), this doesn't have the Hamburg menu enabled though. + +#### I don't want to use AngularJS or NPM/Bower/Gulp! + +No worries, theres a barebones branch available with the basic HTML and CSS! \ No newline at end of file diff --git a/src/index.html b/src/index.html index 75669835..fcaee4ba 100644 --- a/src/index.html +++ b/src/index.html @@ -73,16 +73,6 @@
  • Tables
    • -
  • - Servers -
    • -
  • - Settings -
    • -
  • QUICK LINKS
    • -
  • - Forums -
    • From adde73a77cda6d4bd618f6f64220645dcb86f826 Mon Sep 17 00:00:00 2001 From: Mathew Goldsborough Date: Mon, 1 Sep 2014 07:45:24 -0400 Subject: [PATCH 04/13] Added widget js files to gulp build block. Fixes #66 --- src/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/index.html b/src/index.html index fcaee4ba..93634dee 100644 --- a/src/index.html +++ b/src/index.html @@ -49,6 +49,8 @@ + + From bcc3830801ee479d8dfb82e88f07a20d1e801e3c Mon Sep 17 00:00:00 2001 From: Mathew Goldsborough Date: Mon, 1 Sep 2014 08:31:59 -0400 Subject: [PATCH 05/13] Added widget directives to index.html. --- README.md | 15 +++ src/index.html | 142 +++++++++------------ src/js/dashboard/directives/widget-body.js | 5 +- 3 files changed, 78 insertions(+), 84 deletions(-) diff --git a/README.md b/README.md index 84e56a8e..46bb4f0b 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,20 @@ If you want to change it, simply replace the template and CSS! Instead of hardcoding the widget HTML directly, AngularJS widget component functionality is ready to use: +```HTML + + + Widget Link + + + +

    Hello world from a widget!

    +     +     +``` + +Loading widget + ```HTML @@ -114,6 +128,7 @@ Instead of hardcoding the widget HTML directly, AngularJS widget component funct ``` + ### FAQ #### What is the dashboard compatible with? diff --git a/src/index.html b/src/index.html index 93634dee..928630ff 100644 --- a/src/index.html +++ b/src/index.html @@ -49,6 +49,7 @@ + @@ -180,71 +181,58 @@
    -
    -
    + +
    -
    -
    80
    -
    Users
    -
    -
    -
    -
    +
    80
    +
    Users
    + +
    -
    -
    + +
    -
    -
    16
    -
    Servers
    -
    -
    -
    -
    +
    16
    +
    Servers
    + +
    -
    -
    + +
    -
    -
    225
    -
    Documents
    -
    -
    -
    -
    +
    225
    +
    Documents
    + +
    -
    -
    + +
    -
    -
    62
    -
    Tickets
    -
    -
    -
    -
    +
    62
    +
    Tickets
    + +
    -
    -
    - Servers + + Manage -
    -
    + +
    @@ -262,17 +250,15 @@
    -
    -
    + +
    -
    -
    - Users + + -
    -
    -
    + +
    @@ -285,19 +271,17 @@
    -
    -
    + +
    -
    -
    - Extras + + -
    -
    -
    + +
    This is a standard message which will also work the ".no-padding" class, I can also be an error message! @@ -324,20 +308,16 @@
    -
    -
    + +
    -
    -
    - Loading Directive + + SpinKit -
    -
    - - -
    -
    + + +
    @@ -346,12 +326,11 @@ diff --git a/src/js/dashboard/directives/widget-body.js b/src/js/dashboard/directives/widget-body.js index 90fef1ed..373cbf8a 100644 --- a/src/js/dashboard/directives/widget-body.js +++ b/src/js/dashboard/directives/widget-body.js @@ -6,10 +6,11 @@ function rdWidgetBody () { var directive = { requires: '^rdWidget', scope: { - loading: '@?' + loading: '@?', + classes: '@?' }, transclude: true, - template: '
    ', + template: '
    ', restrict: 'E' }; return directive; From d49ddaa34de06f3728c11b1d946079630145eb8c Mon Sep 17 00:00:00 2001 From: Mathew Goldsborough Date: Mon, 1 Sep 2014 08:39:07 -0400 Subject: [PATCH 06/13] Added repository to pacakge.json to fix npm warning. --- package.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package.json b/package.json index a7be2666..a387cbe0 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,10 @@ "name": "Responsive-Dashboard", "version": "0.0.2", "author": "Elliot Hesp", + "repository": { + "type": "git", + "url": "git://github.com/Ehesp/Responsive-Dashboard" + }, "contributors": [ "Leonel Samayoa (http://gobliip.com)", "Ricardo Pascua " @@ -12,6 +16,7 @@ "devDependencies": { "bower": "^1.3.9", "gulp": "~3.8.0", + "gulp-angular-templates": "^0.0.1", "gulp-connect": "^2.0.6", "gulp-less": "~1.3.3", "gulp-usemin": "^0.3.7", From ded84e14f465209ec131536d0daa52d68560337d Mon Sep 17 00:00:00 2001 From: Mathew Goldsborough Date: Mon, 1 Sep 2014 10:17:26 -0400 Subject: [PATCH 07/13] Gulp optimizations to combine and minify js/css files. --- gulpfile.js | 122 +++++++++---- package.json | 5 +- src/index.html | 280 +----------------------------- src/less/dashboard/main.less | 2 + src/less/dashboard/sidebar.less | 2 + src/less/dashboard/variables.less | 2 +- src/less/dashboard/widgets.less | 2 +- src/templates/dashboard.html | 169 ++++++++++++++++++ src/templates/tables.html | 56 ++++++ 9 files changed, 325 insertions(+), 315 deletions(-) create mode 100644 src/templates/dashboard.html create mode 100644 src/templates/tables.html diff --git a/gulpfile.js b/gulpfile.js index 1f93c0ae..fa50e133 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,58 +1,117 @@ var gulp = require('gulp'), less = require('gulp-less'), - usemin = require('gulp-usemin'), wrap = require('gulp-wrap'), + watch = require('gulp-watch'), + concat = require('gulp-concat'), + uglify = require('gulp-uglify'), connect = require('gulp-connect'), - watch = require('gulp-watch'); + cssmin = require('gulp-minify-css'), + templates = require('gulp-angular-templates'); + +var vendors = [ + 'src/bower_components/angular/angular.js', + 'src/bower_components/angular-cookies/angular-cookies.js', + 'src/bower_components/angular-bootstrap/ui-bootstrap.js', + 'src/bower_components/angular-bootstrap/ui-bootstrap-tpls.js', + 'src/bower_components/angular-ui-router/release/angular-ui-router.js', +]; + +var styles = [ + 'src/bower_components/bootstrap/dist/css/bootstrap.css', + 'src/bower_components/font-awesome/css/font-awesome.css', + 'src/less/dashboard/variables.less', + 'src/less/dashboard/mixins.less', + 'src/less/dashboard/main.less', + 'src/less/dashboard/loading.less', + 'src/less/dashboard/content.less', + 'src/less/dashboard/header.less', + 'src/less/dashboard/sidebar.less', + 'src/less/dashboard/widgets.less', + 'src/less/dashboard/hamburg.less', +]; + +var fonts = [ + 'src/fonts/**.*', + 'src/bower_components/bootstrap/dist/fonts/*.{ttf,woff,eof,svg}', + 'src/bower_components/font-awesome/fonts/*.{ttf,woff,eof,svg}' +]; var paths = { - js: 'src/js/**/*.*', - fonts: 'src/fonts/**.*', + js: ['src/js/**/*.*', 'dist/js/templates.js'], + files: ['src/index.html'], images: 'src/img/**/*.*', - styles: 'src/less/**/*.less', - index: 'src/index.html', - bower_fonts: 'src/bower_components/**/*.{ttf,woff,eof,svg}', - bower_components: 'src/bower_components/**/*.*', + templates: 'src/templates/**/*.html', + fonts: fonts, + styles: styles, + vendors: vendors }; +// The name of the Angular module which will be injected into the templates. +var moduleName = 'Dashboard'; -gulp.task('usemin', function() { - return gulp.src(paths.index) - .pipe(usemin({ - less: ['concat', less()], - js: ['concat', wrap('(function(){ \n<%= contents %>\n})();')], - })) - .pipe(gulp.dest('dist/')); +// Minify and copy all 3rd party libs to vendors.min.js +gulp.task('copy-vendors', function() { + return gulp.src(paths.vendors) + .pipe(uglify()) + .pipe(concat('vendors.min.js')) + .pipe(gulp.dest('dist/js')); }); -/** - * Copy assets - */ -gulp.task('copy-assets', ['copy-images', 'copy-fonts', 'copy-bower_fonts']); +// Minify and copy all dashboard script files to dashboard.min.js +gulp.task('copy-scripts', function() { + return gulp.src(paths.js) + .pipe(uglify()) + .pipe(concat('dashboard.min.js')) + .pipe(gulp.dest('dist/js')); +}); +// Minify and copy all angular templates to templates.min.js +gulp.task('copy-templates', function() { + return gulp.src(paths.templates) + .pipe(templates({module: moduleName})) + .pipe(uglify()) + .pipe(concat('templates.min.js')) + .pipe(gulp.dest('dist/js')); +}); + +// Copy all static/HTML files to output directory +gulp.task('copy-files', function(){ + return gulp.src(paths.files) + .pipe(gulp.dest('dist')); +}); + +// Copy all images to output directory gulp.task('copy-images', function(){ return gulp.src(paths.images) .pipe(gulp.dest('dist/img')); }); +// Copy all fonts to output directory gulp.task('copy-fonts', function(){ return gulp.src(paths.fonts) .pipe(gulp.dest('dist/fonts')); }); -gulp.task('copy-bower_fonts', function(){ - return gulp.src(paths.bower_fonts) - .pipe(gulp.dest('dist/lib')); +// Compile less styles into dashboard.css +gulp.task('compile-less', function(){ + return gulp.src(paths.styles) + .pipe(less()) + .pipe(cssmin()) + .pipe(concat('dashboard.min.css')) + .pipe(gulp.dest('dist/css')); }); /** * Watch src */ gulp.task('watch', function () { - gulp.watch([paths.styles, paths.index, paths.js], ['usemin']); - gulp.watch([paths.images], ['copy-images']); - gulp.watch([paths.fonts], ['copy-fonts']); - gulp.watch([paths.bower_fonts], ['copy-bower_fonts']); + gulp.watch(paths.vendors, ['copy-vendors']); + gulp.watch(paths.js, ['copy-scripts']); + gulp.watch(paths.templates, ['copy-templates']); + gulp.watch(paths.files, ['copy-files']); + gulp.watch(paths.images, ['copy-images']); + gulp.watch(paths.fonts, ['copy-fonts']); + gulp.watch(paths.styles, ['compile-less']); }); gulp.task('webserver', function() { @@ -68,14 +127,5 @@ gulp.task('livereload', function() { .pipe(connect.reload()); }); -/** - * Compile less - */ -gulp.task('compile-less', function(){ - return gulp.src(paths.styles) - .pipe(less()) - .pipe(gulp.dest('dist/css')); -}); - -gulp.task('build', ['usemin', 'copy-assets']); +gulp.task('build', ['copy-vendors', 'copy-scripts', 'copy-templates', 'copy-files', 'copy-images', 'copy-fonts', 'compile-less']); gulp.task('default', ['build', 'webserver', 'livereload', 'watch']); diff --git a/package.json b/package.json index a7be2666..1dc2d685 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,12 @@ "devDependencies": { "bower": "^1.3.9", "gulp": "~3.8.0", + "gulp-angular-templates": "^0.0.1", + "gulp-concat": "^2.3.4", "gulp-connect": "^2.0.6", "gulp-less": "~1.3.3", - "gulp-usemin": "^0.3.7", + "gulp-minify-css": "^0.3.7", + "gulp-uglify": "^1.0.0", "gulp-watch": "^0.6.9", "gulp-wrap": "^0.3.0" } diff --git a/src/index.html b/src/index.html index fcaee4ba..679169ca 100644 --- a/src/index.html +++ b/src/index.html @@ -6,52 +6,7 @@ Dashboard - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
    @@ -169,235 +124,8 @@
    - - - + + + diff --git a/src/less/dashboard/main.less b/src/less/dashboard/main.less index aa016b1d..5d08a999 100644 --- a/src/less/dashboard/main.less +++ b/src/less/dashboard/main.less @@ -1,3 +1,5 @@ +@import "variables.less"; + /* Fonts */ @font-face { font-family: 'Montserrat'; diff --git a/src/less/dashboard/sidebar.less b/src/less/dashboard/sidebar.less index 0c9be998..b6593188 100644 --- a/src/less/dashboard/sidebar.less +++ b/src/less/dashboard/sidebar.less @@ -1,3 +1,5 @@ +@import "variables.less"; + /** * Sidebar */ diff --git a/src/less/dashboard/variables.less b/src/less/dashboard/variables.less index 8fd52cb4..5c5677b9 100644 --- a/src/less/dashboard/variables.less +++ b/src/less/dashboard/variables.less @@ -11,4 +11,4 @@ /* Font path: */ - @fontPath: '../../fonts'; + @fontPath: '../fonts'; diff --git a/src/less/dashboard/widgets.less b/src/less/dashboard/widgets.less index 38e66195..88f81ffa 100644 --- a/src/less/dashboard/widgets.less +++ b/src/less/dashboard/widgets.less @@ -2,7 +2,7 @@ * Widgets */ .widget { - .box-shadow(0 1px 1px rgba(0, 0, 0, 0.05)); + box-shadow: 1px 1px rgba(0, 0, 0, 0.05); background: #ffffff; border: 1px solid transparent; border-radius: 2px; diff --git a/src/templates/dashboard.html b/src/templates/dashboard.html new file mode 100644 index 00000000..95b715a9 --- /dev/null +++ b/src/templates/dashboard.html @@ -0,0 +1,169 @@ +
    +
    + {{alert.msg}} +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +
    80
    +
    Users
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    16
    +
    Servers
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    225
    +
    Documents
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    62
    +
    Tickets
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + Servers + Manage +
    +
    +
    + + + + + + + + + + + + + + +
    RDVMPC001238.103.133.37
    RDVMPC00268.66.63.170
    RDVMPC00376.117.212.33
    RDPHPC00191.88.224.5
    RDESX001197.188.15.93
    RDESX002168.85.154.251
    RDESX003209.25.191.61
    RDESX004252.37.192.235
    RDTerminal01139.71.18.207
    RDTerminal02136.80.122.212
    RDDomainCont01196.80.245.33
    +
    +
    +
    +
    +
    +
    +
    + Users + +
    +
    +
    +
    + + + + + + + + + +
    IDUsernameRoleAccount
    1Joe BloggsSuper AdminAZ23045
    2Timothy HernandezAdminAU24783
    3Joe BickhamUserAM23781
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + Extras + +
    +
    +
    + +
    + This is a standard message which will also work the ".no-padding" class, I can also be an error message! +
    + +
    + +
    + UI Bootstrap is included, so you can use tooltips and all of the other native Bootstrap JS components! +
    + +
    + +
    +
    + +
    + + +
    +
    +
    I'm an input mask!
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + Loading Directive + SpinKit +
    +
    + + +
    +
    +
    +
    + \ No newline at end of file diff --git a/src/templates/tables.html b/src/templates/tables.html new file mode 100644 index 00000000..d12ebff4 --- /dev/null +++ b/src/templates/tables.html @@ -0,0 +1,56 @@ +
    +
    +
    +
    + Servers + Manage +
    +
    +
    + + + + + + + + + + + + + + +
    RDVMPC001238.103.133.37
    RDVMPC00268.66.63.170
    RDVMPC00376.117.212.33
    RDPHPC00191.88.224.5
    RDESX001197.188.15.93
    RDESX002168.85.154.251
    RDESX003209.25.191.61
    RDESX004252.37.192.235
    RDTerminal01139.71.18.207
    RDTerminal02136.80.122.212
    RDDomainCont01196.80.245.33
    +
    +
    +
    +
    +
    +
    +
    + Striped Servers + Manage +
    +
    +
    + + + + + + + + + + + + + + +
    RDVMPC001238.103.133.37
    RDVMPC00268.66.63.170
    RDVMPC00376.117.212.33
    RDPHPC00191.88.224.5
    RDESX001197.188.15.93
    RDESX002168.85.154.251
    RDESX003209.25.191.61
    RDESX004252.37.192.235
    RDTerminal01139.71.18.207
    RDTerminal02136.80.122.212
    RDDomainCont01196.80.245.33
    +
    +
    +
    +
    +
    \ No newline at end of file From a12f64197325e1cd8528e05f1748e540d28a3a7f Mon Sep 17 00:00:00 2001 From: Mathew Goldsborough Date: Mon, 1 Sep 2014 10:37:04 -0400 Subject: [PATCH 08/13] Gulp task to prepend generated js files with ```use strict``` --- gulpfile.js | 3 +++ package.json | 1 + src/js/dashboard/routes.js | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index fa50e133..8e431ea9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,6 +3,7 @@ var gulp = require('gulp'), wrap = require('gulp-wrap'), watch = require('gulp-watch'), concat = require('gulp-concat'), + insert = require('gulp-insert'), uglify = require('gulp-uglify'), connect = require('gulp-connect'), cssmin = require('gulp-minify-css'), @@ -62,6 +63,7 @@ gulp.task('copy-scripts', function() { return gulp.src(paths.js) .pipe(uglify()) .pipe(concat('dashboard.min.js')) + .pipe(insert.prepend('\'use strict\';')) .pipe(gulp.dest('dist/js')); }); @@ -71,6 +73,7 @@ gulp.task('copy-templates', function() { .pipe(templates({module: moduleName})) .pipe(uglify()) .pipe(concat('templates.min.js')) + .pipe(insert.prepend('\'use strict\';')) .pipe(gulp.dest('dist/js')); }); diff --git a/package.json b/package.json index 1dc2d685..9be9a11a 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "gulp-angular-templates": "^0.0.1", "gulp-concat": "^2.3.4", "gulp-connect": "^2.0.6", + "gulp-insert": "^0.4.0", "gulp-less": "~1.3.3", "gulp-minify-css": "^0.3.7", "gulp-uglify": "^1.0.0", diff --git a/src/js/dashboard/routes.js b/src/js/dashboard/routes.js index 109200ed..e7b4af33 100644 --- a/src/js/dashboard/routes.js +++ b/src/js/dashboard/routes.js @@ -1,5 +1,3 @@ -'use strict'; - /** * Route configuration for the Dashboard module. */ From 82ce8d7296898201e466e2d107c7d1ef24df4896 Mon Sep 17 00:00:00 2001 From: Mathew Goldsborough Date: Mon, 1 Sep 2014 10:49:51 -0400 Subject: [PATCH 09/13] Added to contributors --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index a7be2666..30c45c92 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "author": "Elliot Hesp", "contributors": [ "Leonel Samayoa (http://gobliip.com)", - "Ricardo Pascua " + "Ricardo Pascua ", + "Mathew Goldsborough " ], "scripts": { "postinstall": "node node_modules/bower/bin/bower install" From 4f4c5b418663c6dcb12e262e3f2b1b0c08a91188 Mon Sep 17 00:00:00 2001 From: Mohamed Elkholy Date: Fri, 3 Oct 2014 19:15:08 +0200 Subject: [PATCH 10/13] Added css animation to sidebar-title and sidebar-footer --- src/less/dashboard/sidebar.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/less/dashboard/sidebar.less b/src/less/dashboard/sidebar.less index b6593188..6eb389e7 100644 --- a/src/less/dashboard/sidebar.less +++ b/src/less/dashboard/sidebar.less @@ -53,6 +53,7 @@ ul.sidebar { height: 35px; line-height: 40px; text-transform: uppercase; + transition: all .6s ease 0s; } .sidebar-list { height: 40px; @@ -82,7 +83,8 @@ ul.sidebar { ul.sidebar { bottom: 0; .sidebar-title { - display: none; + height: 0px; + text-indent: -100px; } .sidebar-title.separator { display: block; @@ -110,6 +112,7 @@ ul.sidebar { padding: 0; margin: 0; text-align: center; + transition: all .6s ease 0s; div { a { color: #b2bfdc; From ffa0dfca7a330bc4e305947da374b051c7dcbc3b Mon Sep 17 00:00:00 2001 From: Ricardo Pascua Jr Date: Sat, 4 Oct 2014 21:53:33 +0800 Subject: [PATCH 11/13] ignore idea folder --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 8a20151d..85c61e5c 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,6 @@ Icon # Bower components /src/bower_components + +# IDEA +/.idea From 3b6b856dbcce1e91241ab055dfe921ef0b825ee9 Mon Sep 17 00:00:00 2001 From: Ricardo Pascua Jr Date: Sat, 4 Oct 2014 21:58:45 +0800 Subject: [PATCH 12/13] fix merge conflict --- src/index.html | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/index.html b/src/index.html index 3590ece3..9524c0d9 100644 --- a/src/index.html +++ b/src/index.html @@ -125,11 +125,10 @@
    -<<<<<<< HEAD -======= + ->>>>>>> develop From c49810b67783d69ab6f269db13d2acca856ad296 Mon Sep 17 00:00:00 2001 From: Ricardo Pascua Jr Date: Sat, 4 Oct 2014 21:58:59 +0800 Subject: [PATCH 13/13] optimize less --- src/less/dashboard/header.less | 5 ++--- src/less/dashboard/widgets.less | 11 +++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/less/dashboard/header.less b/src/less/dashboard/header.less index 8b1e4ed1..6055ff7b 100644 --- a/src/less/dashboard/header.less +++ b/src/less/dashboard/header.less @@ -72,9 +72,8 @@ right: 23px; display: inline-block; border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; + border-bottom: 7px solid rgba(0, 0, 0, 0.2); border-left: 7px solid transparent; - border-bottom-color: rgba(0, 0, 0, 0.2); content: ''; } ul.dropdown-menu:after { @@ -89,4 +88,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/less/dashboard/widgets.less b/src/less/dashboard/widgets.less index 88f81ffa..2e4956f6 100644 --- a/src/less/dashboard/widgets.less +++ b/src/less/dashboard/widgets.less @@ -2,12 +2,11 @@ * Widgets */ .widget { - box-shadow: 1px 1px rgba(0, 0, 0, 0.05); - background: #ffffff; - border: 1px solid transparent; - border-radius: 2px; - border-color: #e9e9e9; - .widget-header, .widget-footer { + box-shadow: 1px 1px rgba(0, 0, 0, 0.05); + background: #ffffff; + border-radius: 2px; + border: 1px solid #e9e9e9; + .widget-header, .widget-footer { .pagination { margin: 0; }