diff --git a/app/settings.py b/app/settings.py index 2876662..c965d1d 100644 --- a/app/settings.py +++ b/app/settings.py @@ -109,7 +109,7 @@ PIPELINE_JS = { 'vendor/angular-bootstrap/ui-bootstrap-tpls.js', 'vendor/jquery/dist/jquery.min.js', 'vendor/jquery.inputmask/dist/inputmask/inputmask.js', - 'vendor/jquery.inputmask/dist/inputmask/jquery.inputmask.js', + 'vendor/jquery.inputmask/dist/inputmask/jquery.inputmask.js' ), 'output_filename': 'js/vendor.js', } @@ -121,7 +121,8 @@ PIPELINE_CSS = { 'main': { 'source_filenames': ( 'less/main.less', - 'trademark/less/main.less' + 'trademark/less/main.less', + 'vendor/font-awesome/less/font-awesome.less', ), 'output_filename': 'css/main.css', } diff --git a/zsite/static/bower.json b/zsite/static/bower.json index 4dbb316..b56f0ad 100644 --- a/zsite/static/bower.json +++ b/zsite/static/bower.json @@ -1,11 +1,11 @@ { "name": "zuykov", "version": "0.1.0", - "devDependencies": { + "dependencies": { "angular": "1.3.6", "bootstrap": "3.3.5", "angular-bootstrap": "~0.10.0", - "jquery.inputmask": "*" - }, - "dependencies": {} + "jquery.inputmask": "*", + "font-awesome": "^4.7.0" + } } diff --git a/zsite/static/less/main.less b/zsite/static/less/main.less index 3e5b92e..e92753c 100644 --- a/zsite/static/less/main.less +++ b/zsite/static/less/main.less @@ -30,6 +30,7 @@ @import 'nice.less'; +@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.7.0/fonts"; // for referencing Bootstrap CDN font files directly .container { width: 100%; diff --git a/zsite/static/less/nice.less b/zsite/static/less/nice.less index 9a48246..06eb745 100644 --- a/zsite/static/less/nice.less +++ b/zsite/static/less/nice.less @@ -32,7 +32,7 @@ text-decoration: none; } - + } } } @@ -48,7 +48,7 @@ } } - + } .nice-selected { @@ -69,3 +69,67 @@ } } } + +.nice-detail { + .trademark-search-block { + h3 { + margin-top: 20px; + } + } +} +.nice-landing { + .trademark-search-block { + h3 { + margin-top: 0; + } + } + .nice-classes-list { + padding-left: 20px; + + li { + width: 49%; + vertical-align: top; + padding-right: 20px; + + h4 { + margin-left: -30px; + } + i { + width: 25px; + vertical-align: middle; + text-align: right; + } + } + + .nice-products-list { + margin-top: -5px; + + font-size: 11px; + li { + line-height: 12px; + padding-bottom: 4px; + } + } + } + + .nice-products-alphabet { + .nice-products-alphabet-letter { + width: 33%; + vertical-align: top; + } + .nice-products-list { + font-size: 11px; + + .product-a-lot { + padding-bottom: 5px; + } + + .product-one { + display: block; + padding-top: 5px; + } + } + } + + +}