Skip to content

Commit

Permalink
Merge branch 'release-1.3.x' into gh-pages
Browse files Browse the repository at this point in the history
* release-1.3.x:
  release v1.3.0
  Changed shop_demo theme to laxar_demo
  Updated grunt-laxar dependency to v0.5.2 (LaxarJS/grunt-laxar/issues/24)
  (LaxarJS#10) darkly_scss: Fixed selector precedence, changelog
  (LaxarJS#10) Added SCSS based version of darkly theme. Updated grunt-laxar dependency, and enabled various optimizations.
  (LaxarJS#9) documentation: Fixed links in README.md
  (LaxarJS#8) theming: added darkly theme
  (LaxarJS#7) Extracted most styles into laxar_demo.theme
  Updated links to laxar documents
  Updated links to laxar documents
  ArticleBrowserWidget Tutorial: fixed example
  (LaxarJS#4) Changelog
  (LaxarJS#4) Removed duplicate data-ax-widget-area
  Hello World Tutorial: Fixed source code example
  Added forgotten files
  (LaxarJS#3) Changelog
  (LaxarJS#3) Styling: Added support for retina images
  (LaxarJS#2) Changelog
  (LaxarJS#2) Styling: Fixed add button is not usable for small viewports. Some further improvements.

Conflicts:
	CHANGELOG.md
	application/layouts/application/default.theme/application.html
	application/layouts/application/default.theme/css/application.css
	application/layouts/application/laxar_demo.theme/scss/_base.scss
	bower.json
	includes/widgets/shop_demo/shopping_cart_widget/default.theme/css/shopping_cart_widget.css
  • Loading branch information
x1B committed Nov 12, 2014
2 parents 190adb7 + 493dd4f commit dade0e8
Show file tree
Hide file tree
Showing 68 changed files with 21,215 additions and 413 deletions.
25 changes: 11 additions & 14 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,24 @@

## Last Changes

## v1.2.3

- [#4] (https://github.com/LaxarJS/shop_demo/issues/4): Bug: Removed duplicate data-ax-widget-area
## v1.3.0


## v1.2.2

- [#3] (https://github.com/LaxarJS/shop_demo/issues/3): Styling: Added support for retina images


## v1.2.1

- [#2](https://github.com/LaxarJS/shop_demo/issues/2): Styling: Fixed add button is not usable for small viewports. Some further improvements.
- [#10] (https://github.com/LaxarJS/shop_demo/issues/10): Theming: added darkly SCSS theme
- [#9] (https://github.com/LaxarJS/shop_demo/issues/9): Documentation: Fixed links in README.md
- [#8] (https://github.com/LaxarJS/shop_demo/issues/8): Theming: added darkly theme
- [#7] (https://github.com/LaxarJS/shop_demo/issues/7): Styling: extracted laxar demo theme.
- [#4] (https://github.com/LaxarJS/shop_demo/issues/4): Bug: Removed duplicate data-ax-widget-area
- [#3] (https://github.com/LaxarJS/shop_demo/issues/3): Styling: Added support for retina images
- [#2] (https://github.com/LaxarJS/shop_demo/issues/2): Styling: Fixed add button is not usable for small viewports. Some further improvements."


## v1.2.0

- [#1](https://github.com/LaxarJS/shop_demo/issues/1): Refactored styling
- [#1](https://github.com/LaxarJS/shop_demo/issues/1): Refactored styling


## v1.1.0

- Added HeadlineWidget to header of pages
- Revised tutorials
- Added HeadlineWidget to header of pages
- Revised tutorials
70 changes: 48 additions & 22 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,51 +53,77 @@ module.exports = function( grunt ) {
src: [ 'application/flow/*.json' ]
}
},
css_merger: { default: {} },
css_merger: {
default: {
src: [ 'application/flow/*.json' ]
}
},
widget_json_merger: { default: {} },
directory_tree: {
layouts: {
dest: 'var/listing/application_layouts.json',
src: [
'application/layouts/**/*.css',
'application/layouts/**/*.html'
]
'application/layouts/**/*.+(css|html)'
],
options: {
embedContents: [
'application/layouts/**/*.+(css|html)'
]
}
},
themes: {
dest: 'var/listing/includes_themes.json',
pages: {
dest: 'var/listing/application_pages.json',
src: [
'includes/themes/**/*.css',
'includes/themes/**/*.html'
]
'application/pages/**/*.json'
],
options: {
embedContents: [
'**/*.*'
]
}
},
uikit_themes: {
dest: 'var/listing/laxar_uikit_themes.json',
themes: {
dest: 'var/listing/includes_themes.json',
src: [
'bower_components/laxar_uikit/themes/**/*.css',
'bower_components/laxar_uikit/themes/**/*.html'
]
'includes/themes/**/*.+(css|html)'
],
options: {
embedContents: [
'includes/themes/**/controls/**/*.+(css|html)'
]
}
},
uikit_controls: {
dest: 'var/listing/laxar_uikit_controls.json',
uikit: {
dest: 'var/listing/laxar_uikit.json',
src: [
'bower_components/laxar_uikit/controls/**/*.css',
'bower_components/laxar_uikit/controls/**/*.html'
]
'includes/lib/laxar_uikit/themes/**/*.css',
'includes/lib/laxar_uikit/controls/**/*.+(css|html)'
],
embedContents: [ 'includes/lib/laxar_uikit/controls/**/*.html' ]
},
widgets: {
dest: 'var/listing/includes_widgets.json',
src: [
'includes/widgets/*/*/*.+(css|html|json)',
'includes/widgets/*/*/!(bower_components|node_modules)/**/*.+(css|html|json)'
]
'!includes/widgets/*/*/+(package|bower).json',
'includes/widgets/*/*/!(bower_components|node_modules|spec)/**/*.+(css|html|json)'
],
options: {
embedContents: [
'includes/widgets/*/*/widget.json',
'includes/widgets/*/*/*.theme/*.html',
'includes/widgets/*/*/*.theme/css/*.css'
]
}
}
},
requirejs: {
default: {
options: {
mainConfigFile: 'require_config.js',
name: '../init',
out: 'var/build/optimized_init.js'
out: 'var/build/optimized_init.js',
optimize: 'uglify2'
}
}
},
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ It consists of a small set of LaxarJS widgets implemented in AngularJS. Storage

* [Show the live demo](http://laxarjs.github.io/shop_demo/)

* [Read the tutorial](docs/tutorials/getting_started.md)
* [Read the tutorial](https://github.com/LaxarJS/shop_demo/blob/master/docs/tutorials/01_getting_started.md#getting-started)

* [LaxarJS Homepage](http://laxarjs.org)

Expand Down Expand Up @@ -43,5 +43,4 @@ Instead of using `grunt start`, you can use any web server on your machine by ha

Try modifying the widgets under `includes/widgets/shop_demo` to get a feel for how a LaxarJS application works.

Read the [tutorial](docs/tutorials/getting_started.md) to get further information about the LaxarJS techniques.

Read the [tutorial](https://github.com/LaxarJS/shop_demo/blob/master/docs/tutorials/01_getting_started.md#getting-started) to get further information about the LaxarJS techniques.
27 changes: 18 additions & 9 deletions application/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,30 @@ window.laxar = {
name: 'LaxarJS ShopDemo',
description: 'A DemoApp to learn how LaxarJS works.',

theme: 'default',
portal: {
theme: 'laxar_demo',
useMergedCss: window.laxarMode === 'RELEASE'
},

locales: {
'default': 'en_US',
'alternative': 'de_DE'
'default': 'en_US'
},

logThreshold: 'DEVELOP',

// relative to laxar-path-root
fileListings: {
'bower_components/laxar_uikit/themes': 'var/listing/laxar_uikit_themes.json',
'bower_components/laxar_uikit/controls': 'var/listing/laxar_uikit_controls.json',
'includes/themes': 'var/listing/includes_themes.json',
'includes/widgets': 'var/listing/includes_widgets.json',
'application/layouts': 'var/listing/application_layouts.json'

file_resource_provider: {
// relative to laxar-path-root
fileListings: {
'application/pages': 'var/listing/application_pages.json',
'application/layouts': 'var/listing/application_layouts.json',
'includes/lib/laxar_uikit': 'var/listing/laxar_uikit.json',
'includes/themes': 'var/listing/includes_themes.json',
'includes/widgets': 'var/listing/includes_widgets.json'
},

useEmbedded: window.laxarMode === 'RELEASE'
}

};
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</div>
<footer class="app-footer row">
<div class="col col-lg-12 col-md-12">
<span class="app-laxarjs"><a href="http://laxarjs.org/" title="Go back to LaxarJS.org"><b>LaxarJS</b></a></span>, code licensed under the <a href="http://laxarjs.org/license" title="Show the MIT license"><b>MIT License</b></a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/" title="Show the creative commons"><b>CC BY 3.0</b></a>.<span class="app-github"><i class="fa fa-github"></i> View on <a href="https://github.com/LaxarJS/shop_demo" title="Show the source code"><b>GitHub</b></a></span><span class="app-version">ShopDemo <sup>1.2.3</sup></span>
<span class="app-laxarjs"><a href="http://laxarjs.org/" title="Go back to LaxarJS.org"><b>LaxarJS</b></a></span>, code licensed under the <a href="http://laxarjs.org/license" title="Show the MIT license"><b>MIT License</b></a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/" title="Show the creative commons"><b>CC BY 3.0</b></a>.<span class="app-github"><i class="fa fa-github"></i> View on <a href="https://github.com/LaxarJS/shop_demo" title="Show the source code"><b>GitHub</b></a></span><span class="app-version">ShopDemo <sup>1.3.0</sup></span>
</div>
</footer>
</div>
Expand Down

0 comments on commit dade0e8

Please sign in to comment.