Merge pull request #12 from Wtower/v0-2-0

Version 0.2.0
Wtower · Dec 14, 2016 · 0ce5a7a · 0ce5a7a
2 parents 4e2f0ea + 34ed9aa
commit 0ce5a7a
Show file tree

Hide file tree

Showing 21 changed files with 1,044 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,15 @@
+# Node.js
 node_modules
-coverage
-.idea/
 npm-debug.log
+
+# Coverage
+coverage/
+
+# IDE
+.idea/
+
+# Gulp build intermediate files
+build/css/gentelella.*.css
+build/partials.js
+# .min files do not count in github language
+# https://github.com/github/linguist/blob/master/lib/linguist/vendor.yml#L56
diff --git a/README.md b/README.md
@@ -97,14 +97,17 @@ Use:
 
     npm install -S ng-gentelella
 
-Then include the `node_modules/ng-gentelella/gentelella` js files in your html or build system (eg gulp).
+### Static files
 
-Also make the above folder public or have a build system copy its html files in order for the templates to
-be available for Angular. Expose them as `/static/gentelella`:
+Built files are conveniently provided under the `build/` directory. These include all gentelella and ng-gentelella
+css and js files.
 
-```
-app.use('/static/ng-gentelella', express.static(path.join(__dirname, 'node_modules', 'ng-gentelella', 'gentelella')));
-```
+Otherwise, include the `node_modules/ng-gentelella/gentelella` js files in your html or build system (eg gulp).
+It is recommended that you include the templates path `node_modules/*ng-gentelella/gentelella/**/*.html` using 
+[some html2js module]
+(http://stackoverflow.com/questions/21103724/angular-directive-templateurl-relative-to-js-file/41140644#41140644).
+Alternatively you can expose the template files as `/ng-gentelella` with
+`app.use('/ng-gentelella', express.static(path.join(__dirname, 'node_modules', 'ng-gentelella')));`.
 
 ### Develop
 

diff --git a/build/css/style.min.css b/build/css/style.min.css
diff --git a/build/js/index.min.js b/build/js/index.min.js
diff --git a/gentelella/form-field-checkbox/form-field-checkbox.component.js b/gentelella/form-field-checkbox/form-field-checkbox.component.js
@@ -7,7 +7,7 @@
 angular
   .module('formFieldCheckbox')
   .component('formFieldCheckbox', {
-    templateUrl: 'static/ng-gentelella/form-field-checkbox/form-field-checkbox.template.html',
+    templateUrl: 'ng-gentelella/gentelella/form-field-checkbox/form-field-checkbox.template.html',
     bindings: {
       fieldId: '@',
       fieldLabel: '@',

diff --git a/gentelella/form-field-image/form-field-image.component.js b/gentelella/form-field-image/form-field-image.component.js
@@ -7,7 +7,7 @@
 angular
   .module('formFieldImage')
   .component('formFieldImage', {
-    templateUrl: 'static/ng-gentelella/form-field-image/form-field-image.template.html',
+    templateUrl: 'ng-gentelella/gentelella/form-field-image/form-field-image.template.html',
     bindings: {
       fieldId: '@',
       fieldLabel: '@',

diff --git a/gentelella/form-field-select/form-field-select.component.js b/gentelella/form-field-select/form-field-select.component.js
@@ -8,7 +8,7 @@
 angular
   .module('formFieldSelect')
   .component('formFieldSelect', {
-    templateUrl: 'static/ng-gentelella/form-field-select/form-field-select.template.html',
+    templateUrl: 'ng-gentelella/gentelella/form-field-select/form-field-select.template.html',
     bindings: {
       fieldId: '@',
       fieldLabel: '@',

diff --git a/gentelella/form-field-text/form-field-text.component.js b/gentelella/form-field-text/form-field-text.component.js
@@ -7,7 +7,7 @@
 angular
   .module('formFieldText')
   .component('formFieldText', {
-    templateUrl: 'static/ng-gentelella/form-field-text/form-field-text.template.html',
+    templateUrl: 'ng-gentelella/gentelella/form-field-text/form-field-text.template.html',
     bindings: {
       fieldId: '@',
       fieldType: '@',

diff --git a/gentelella/ga-dashboard-counter/ga-dashboard-counter.component.js b/gentelella/ga-dashboard-counter/ga-dashboard-counter.component.js
@@ -5,7 +5,7 @@
 angular
   .module('gaDashboardCounter')
   .component('gaDashboardCounter', {
-    templateUrl: 'static/ng-gentelella/ga-dashboard-counter/ga-dashboard-counter.template.html',
+    templateUrl: 'ng-gentelella/gentelella/ga-dashboard-counter/ga-dashboard-counter.template.html',
     bindings: {
       counterIcon: '@',
       counterVar: '<',

diff --git a/gentelella/ga-dashboard-graph-flot/ga-dashboard-graph-flot.component.js b/gentelella/ga-dashboard-graph-flot/ga-dashboard-graph-flot.component.js
@@ -5,7 +5,7 @@
 angular
   .module('gaDashboardGraphFlot')
   .component('gaDashboardGraphFlot', {
-    templateUrl: 'static/ng-gentelella/ga-dashboard-graph-flot/ga-dashboard-graph-flot.template.html',
+    templateUrl: 'ng-gentelella/gentelella/ga-dashboard-graph-flot/ga-dashboard-graph-flot.template.html',
     bindings: {
       graphTitle: '@',
       graphSubTitle: '@',

diff --git a/gentelella/ga-paginate/ga-paginate.component.js b/gentelella/ga-paginate/ga-paginate.component.js
@@ -5,7 +5,7 @@
 angular
   .module('gaPaginate')
   .component('gaPaginate', {
-    templateUrl: 'static/ng-gentelella/ga-paginate/ga-paginate.template.html',
+    templateUrl: 'ng-gentelella/gentelella/ga-paginate/ga-paginate.template.html',
     bindings: {
       paginateList: '<',
       paginateLimit: '=',

diff --git a/gentelella/ga-panel-actions/ga-panel-actions.component.js b/gentelella/ga-panel-actions/ga-panel-actions.component.js
@@ -7,7 +7,7 @@
 angular
   .module('gaPanelActions')
   .component('gaPanelActions', {
-    templateUrl: 'static/ng-gentelella/ga-panel-actions/ga-panel-actions.template.html',
+    templateUrl: 'ng-gentelella/gentelella/ga-panel-actions/ga-panel-actions.template.html',
     bindings: {
       actionForm: '<',
       actionCloseUrl: '@',

diff --git a/gentelella/ga-panel-table-form-body/ga-panel-table-form-body.component.js b/gentelella/ga-panel-table-form-body/ga-panel-table-form-body.component.js
@@ -7,7 +7,7 @@
 angular
   .module('gaPanelTableFormBody')
   .component('gaPanelTableFormBody', {
-    templateUrl: 'static/ng-gentelella/ga-panel-table-form-body/ga-panel-table-form-body.template.html',
+    templateUrl: 'ng-gentelella/gentelella/ga-panel-table-form-body/ga-panel-table-form-body.template.html',
     bindings: {
       bodyId: '@',
       bodyValue: '='

diff --git a/gentelella/ga-panel-table-form/ga-panel-table-form.component.js b/gentelella/ga-panel-table-form/ga-panel-table-form.component.js
@@ -7,7 +7,7 @@
 angular
   .module('gaPanelTableForm')
   .component('gaPanelTableForm', {
-    templateUrl: 'static/ng-gentelella/ga-panel-table-form/ga-panel-table-form.template.html',
+    templateUrl: 'ng-gentelella/gentelella/ga-panel-table-form/ga-panel-table-form.template.html',
     bindings: {
       panelTitle: '@',
       panelSubTitle: '@',

diff --git a/gentelella/ga-panel/ga-panel.component.js b/gentelella/ga-panel/ga-panel.component.js
@@ -7,7 +7,7 @@
 angular
   .module('gaPanel')
   .component('gaPanel', {
-    templateUrl: 'static/ng-gentelella/ga-panel/ga-panel.template.html',
+    templateUrl: 'ng-gentelella/gentelella/ga-panel/ga-panel.template.html',
     bindings: {
       panelTitle: '@',
       panelSubTitle: '@',

diff --git a/gentelella/ga-progress/ga-progress.component.js b/gentelella/ga-progress/ga-progress.component.js
@@ -5,7 +5,7 @@
 angular
   .module('gaProgress')
   .component('gaProgress', {
-    templateUrl: 'static/ng-gentelella/ga-progress/ga-progress.template.html',
+    templateUrl: 'ng-gentelella/gentelella/ga-progress/ga-progress.template.html',
     bindings: {
       progressSize: '@',
       progressValue: '<'

diff --git a/gentelella/gentelella.generic.sass b/gentelella/gentelella.generic.sass
@@ -3,6 +3,34 @@
 // Gentelella adapted theme
 //
 
+.login_content form div p a
+  margin: 0
+
+.profile_img i
+  font-size: 44px
+  padding-left: 7px
+
+.user-profile i
+  margin-right: 4px
+
+.dropdown-usermenu button
+  color: #5A738E
+  background: transparent
+  text-align: left
+  font-size: 12px
+  padding: 12px 20px
+  border: none
+
+  &:hover
+    color: #262626
+    background: #f5f5f5
+
+  i
+    font-size: 15px
+
+ul.nav.child_menu
+  display: block
+
 .label-link
   padding: 7px 0 !important