Подключён font-awesome

master
Alexander Kondratyev 9 years ago
parent be02fdf1f8
commit 0ca4296ccb
  1. 5
      app/settings.py
  2. 8
      zsite/static/bower.json
  3. 1
      zsite/static/less/main.less
  4. 68
      zsite/static/less/nice.less

@ -109,7 +109,7 @@ PIPELINE_JS = {
'vendor/angular-bootstrap/ui-bootstrap-tpls.js', 'vendor/angular-bootstrap/ui-bootstrap-tpls.js',
'vendor/jquery/dist/jquery.min.js', 'vendor/jquery/dist/jquery.min.js',
'vendor/jquery.inputmask/dist/inputmask/inputmask.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', 'output_filename': 'js/vendor.js',
} }
@ -121,7 +121,8 @@ PIPELINE_CSS = {
'main': { 'main': {
'source_filenames': ( 'source_filenames': (
'less/main.less', 'less/main.less',
'trademark/less/main.less' 'trademark/less/main.less',
'vendor/font-awesome/less/font-awesome.less',
), ),
'output_filename': 'css/main.css', 'output_filename': 'css/main.css',
} }

@ -1,11 +1,11 @@
{ {
"name": "zuykov", "name": "zuykov",
"version": "0.1.0", "version": "0.1.0",
"devDependencies": { "dependencies": {
"angular": "1.3.6", "angular": "1.3.6",
"bootstrap": "3.3.5", "bootstrap": "3.3.5",
"angular-bootstrap": "~0.10.0", "angular-bootstrap": "~0.10.0",
"jquery.inputmask": "*" "jquery.inputmask": "*",
}, "font-awesome": "^4.7.0"
"dependencies": {} }
} }

@ -30,6 +30,7 @@
@import 'nice.less'; @import 'nice.less';
@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.7.0/fonts"; // for referencing Bootstrap CDN font files directly
.container { .container {
width: 100%; width: 100%;

@ -32,7 +32,7 @@
text-decoration: none; text-decoration: none;
} }
} }
} }
} }
@ -48,7 +48,7 @@
} }
} }
} }
.nice-selected { .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;
}
}
}
}

Loading…
Cancel
Save