diff --git a/gulpfile.js b/gulpfile.js index 3401661..5d65eed 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -58,6 +58,7 @@ gulp.task('minify-css', ['minify-404-css', 'minify-auth-css'], function () { var imgSrc = [ 'src/assets/img/*', 'src/assets/pictures/*', + 'src/app/lookAndFeel/thumbs/*', 'src/app/pages/dashboard/widgets/timeline/img/*', 'src/app/pages/profile/img/*', 'src/app/pages/icons/widgets/kameleon-img/*', diff --git a/src/app/components/contentTop/_contentTop.scss b/src/app/components/contentTop/_contentTop.scss index f87f06e..267c520 100644 --- a/src/app/components/contentTop/_contentTop.scss +++ b/src/app/components/contentTop/_contentTop.scss @@ -24,4 +24,13 @@ h1.al-title { font-size: 18px; font-weight: 100; } +} + +.al-look { + float: right; + margin-right: 10px; + padding-top: 10px; + > a { + font-size: 19px; + } } \ No newline at end of file diff --git a/src/app/components/contentTop/contentTop.html b/src/app/components/contentTop/contentTop.html index 10304c7..70d02ed 100644 --- a/src/app/components/contentTop/contentTop.html +++ b/src/app/components/contentTop/contentTop.html @@ -6,4 +6,8 @@ Home
  • {{ activePageTitle }}
    • +
    + +
    +
    \ No newline at end of file diff --git a/src/app/lookAndFeel/lookAndFeel.constants.js b/src/app/lookAndFeel/lookAndFeel.constants.js new file mode 100644 index 0000000..7fc1832 --- /dev/null +++ b/src/app/lookAndFeel/lookAndFeel.constants.js @@ -0,0 +1,49 @@ +/** + * @author v.lugovsky + * created on 18.11.2015 + */ +(function() { + 'use strict'; + + var ADMIN_STYLES = [ + { + name: 'Default', + bodyClass: '', + thumbnailUrl: 'img/01_default.jpg' + }, + { + name: 'Transparent', + bodyClass: 'badmin-transparent', + thumbnailUrl: 'img/02_transparent.jpg' + }, + { + name: 'Blue', + bodyClass: 'badmin-blue', + thumbnailUrl: 'img/03_blue.jpg' + }, + { + name: 'Peachy', + bodyClass: 'badmin-peachy', + thumbnailUrl: 'img/04_peachy.jpg' + }, + { + name: 'Material', + bodyClass: 'badmin-material', + thumbnailUrl: 'img/05_material.jpg' + }, + { + name: 'Transblue', + bodyClass: 'badmin-transblue', + thumbnailUrl: 'img/06_transblue.jpg' + }, + { + name: 'Grey', + bodyClass: 'badmin-grey', + thumbnailUrl: 'img/07_grey.jpg' + } + ]; + + blurAdminApp + .constant('lookAndFeelEnum', ADMIN_STYLES); + +})(); diff --git a/src/app/lookAndFeel/lookAndFeelOptions.service.js b/src/app/lookAndFeel/lookAndFeelOptions.service.js new file mode 100644 index 0000000..e8ce622 --- /dev/null +++ b/src/app/lookAndFeel/lookAndFeelOptions.service.js @@ -0,0 +1,20 @@ +/** + * @author v.lugovsky + * created on 18.11.2015 + */ +(function() { + 'use strict'; + + blurAdminApp + .factory('lookAndFeelOptions', lookAndFeelOptions); + + lookAndFeelOptions.$inject = ['lookAndFeelEnum']; + function lookAndFeelOptions(lookAndFeelEnum) { + + var model = { + adminStyles: lookAndFeelEnum + }; + return model; + } + +})(); diff --git a/src/app/lookAndFeel/lookAndFeelPanel.directive.js b/src/app/lookAndFeel/lookAndFeelPanel.directive.js new file mode 100644 index 0000000..722745d --- /dev/null +++ b/src/app/lookAndFeel/lookAndFeelPanel.directive.js @@ -0,0 +1,21 @@ +/** + * @author v.lugovsky + * created on 18.11.2015 + */ +(function() { + 'use strict'; + + blurAdminApp + .directive('lookAndFeelPanel', lookAndFeelPanel); + + lookAndFeelPanel.$inject = ['lookAndFeelEnum']; + function lookAndFeelPanel(lookAndFeelEnum) { + return { + templateUrl: 'app/lookAndFeel/lookAndFeelPanel.html', + link: function(scope, el) { + scope.lookAndFeels = lookAndFeelEnum; + } + }; + } + +})(); diff --git a/src/app/lookAndFeel/lookAndFeelPanel.html b/src/app/lookAndFeel/lookAndFeelPanel.html new file mode 100644 index 0000000..271b7d4 --- /dev/null +++ b/src/app/lookAndFeel/lookAndFeelPanel.html @@ -0,0 +1,10 @@ +
    +
    +
    +
    + +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/src/app/lookAndFeel/lookAndFeelPanel.scss b/src/app/lookAndFeel/lookAndFeelPanel.scss new file mode 100644 index 0000000..e00fa69 --- /dev/null +++ b/src/app/lookAndFeel/lookAndFeelPanel.scss @@ -0,0 +1,14 @@ +.look-and-feel-panel { + width: 300px; + .look-and-feel-option { + padding: 10px; + + &:hover { + cursor: pointer; + background-color: $primary; + } + } + .skin-thumbnail { + width: 100%; + } +} \ No newline at end of file diff --git a/src/app/lookAndFeel/thumbs/01_default.jpg b/src/app/lookAndFeel/thumbs/01_default.jpg new file mode 100644 index 0000000..67bb1a8 Binary files /dev/null and b/src/app/lookAndFeel/thumbs/01_default.jpg differ diff --git a/src/app/lookAndFeel/thumbs/02_transparent.jpg b/src/app/lookAndFeel/thumbs/02_transparent.jpg new file mode 100644 index 0000000..bf253ad Binary files /dev/null and b/src/app/lookAndFeel/thumbs/02_transparent.jpg differ diff --git a/src/app/lookAndFeel/thumbs/03_blue.jpg b/src/app/lookAndFeel/thumbs/03_blue.jpg new file mode 100644 index 0000000..1a16f0e Binary files /dev/null and b/src/app/lookAndFeel/thumbs/03_blue.jpg differ diff --git a/src/app/lookAndFeel/thumbs/04_peachy.jpg b/src/app/lookAndFeel/thumbs/04_peachy.jpg new file mode 100644 index 0000000..004f409 Binary files /dev/null and b/src/app/lookAndFeel/thumbs/04_peachy.jpg differ diff --git a/src/app/lookAndFeel/thumbs/05_material.jpg b/src/app/lookAndFeel/thumbs/05_material.jpg new file mode 100644 index 0000000..cb9d6f4 Binary files /dev/null and b/src/app/lookAndFeel/thumbs/05_material.jpg differ diff --git a/src/app/lookAndFeel/thumbs/06_transblue.jpg b/src/app/lookAndFeel/thumbs/06_transblue.jpg new file mode 100644 index 0000000..355c260 Binary files /dev/null and b/src/app/lookAndFeel/thumbs/06_transblue.jpg differ diff --git a/src/app/lookAndFeel/thumbs/07_grey.jpg b/src/app/lookAndFeel/thumbs/07_grey.jpg new file mode 100644 index 0000000..7655371 Binary files /dev/null and b/src/app/lookAndFeel/thumbs/07_grey.jpg differ diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 10a7eaa..db09e43 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -7,6 +7,7 @@ "table.scss", "layout.scss", "icons.scss", +"../../app/lookAndFeel/lookAndFeelPanel.scss", "../../app/components/widgets/widgets.scss", "../../app/pages/buttons/buttonsPage.scss", "../../app/pages/icons/iconsPage.scss",