mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minified and concatenated all js and css files

Browse Source
remotes/origin/1203
pavel 11 years ago
parent f5cdb64893
commit f0ac8a34c7
13 changed files with 2228 additions and 112 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      .gitignore
  2. 12
      templates/client/blank.html
  3. 35
      templates/client/gulpfile.js
  4. 2172
      templates/client/static_client/css/app.css
  5. 40
      templates/client/static_client/css/main.css
  6. 4
      templates/client/static_client/css/min/app.min.css
  7. 1
      templates/client/static_client/css/min/main.min.css
  8. 2
      templates/client/static_client/js/_modules/page.profile.calendar.js
  9. 33
      templates/client/static_client/js/app.js
  10. 35
      templates/client/static_client/js/main.js
  11. 2
      templates/client/static_client/js/min/_modules/block.common.min.js
  12. 1
      templates/client/static_client/js/min/_modules/page.profile.calendar.min.js
  13. 2
      templates/client/static_client/js/min/app.min.js

1
.gitignore vendored
Unescape View File

@ -8,5 +8,6 @@
media/
media
Thumbs.db
npm-debug.log
/proj/local.py

12
templates/client/blank.html
Unescape View File

@ -23,16 +23,7 @@ This template include basic anf main styles and js files,
<link rel="icon" href="{% static 'client/img/favicon.ico' %}" type="image/x-icon" />
<link rel="shortcut icon" href="{% static 'client/img/favicon.ico' %}" type="image/x-icon" />
<link rel="stylesheet" href="{% static 'client/css/normalize.min.css' %}">
<link rel="stylesheet" href="{% static 'client/css/idangerous.swiper.css' %}">
<link rel="stylesheet" href="{% static 'client/css/jquery.mCustomScrollbar.min.css' %}">
<link rel="stylesheet" href="{% static 'client/css/jquery-ui-1.10.3.custom.css' %}">
<link rel="stylesheet" href="{% static 'client/css/jquery.fancybox.css' %}">
<link rel="stylesheet" href="{% static 'client/css/phototag.css?nocache13' %}">
<link rel="stylesheet" href="{% static 'client/css/regions.css' %}">
<!--todo: подключить минифицированную версию-->
<!--<link rel="stylesheet" href="{% static 'client/css/main.min.css' %}">-->
<link rel="stylesheet" href="{% static 'client/css/app.css' %}">
<link rel="stylesheet" href="{% static 'client/css/main.css' %}">
<script src="{% static 'client/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js' %}"></script>
@ -142,6 +133,7 @@ This template include basic anf main styles and js files,
<!-- scripts -->
<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false"></script>
<!--vendor scripts concatenated-->
<script type="text/javascript" src="{% static 'client/js/min/app.min.js' %}"></script>
<div id="wait-ajax" class="wait-ajax" style="display:none;"><img src="{% static 'client/img/ajax-loader.gif' %}" alt=""/></div>

35
templates/client/gulpfile.js
Unescape View File

@ -1,9 +1,11 @@
var gulp = require('gulp'),
uglify = require('gulp-uglify'),
concat = require('gulp-concat'),
rename = require("gulp-rename");
rename = require("gulp-rename"),
autoprefixer = require('gulp-autoprefixer'),
cssmin = require('gulp-cssmin');
gulp.task('make-app', function () {
gulp.task('make-app-js', function () {
gulp.src([
'static_client/js/plugins.js',
'static_client/js/plugins/select2.min.js',
@ -25,6 +27,35 @@ gulp.task('make-app', function () {
.pipe(rename('app.min.js'))
.pipe(gulp.dest('static_client/js/min/'))
});
gulp.task('make-app-css', function () {
gulp.src([
'static_client/css/normalize.min.css',
'static_client/css/idangerous.swiper.css',
'static_client/css/jquery.mCustomScrollbar.min.css',
'static_client/css/jquery-ui-1.10.3.custom.css',
'static_client/css/jquery.mousewheel.min.js',
'static_client/css/jquery.fancybox.css',
'static_client/css/phototag.css',
'static_client/css/regions.css'
])
.pipe(concat('app.css'))
.pipe(gulp.dest('static_client/css/'))
.pipe(cssmin())
.pipe(rename('app.min.css'))
.pipe(gulp.dest('static_client/css/min/'))
});
gulp.task('main-css', function () {
gulp.src('static_client/css/main.css')
.pipe(autoprefixer({
browsers:['> 1%', 'Opera > 11', 'Explorer >= 8', 'Firefox >20', 'Chrome > 20']
}))
.pipe(gulp.dest('static_client/css/'))
.pipe(cssmin())
.pipe(rename('main.min.css'))
.pipe(gulp.dest('static_client/css/min/'))
});
gulp.task('minify-modules', function () {
gulp.src('static_client/js/_modules/*.js')

2172
templates/client/static_client/css/app.css
View File

File diff suppressed because it is too large Load Diff

40
templates/client/static_client/css/main.css
Unescape View File

@ -3249,7 +3249,6 @@ textarea,
/*line-height: 40px;*/
border-radius: 3px;
box-shadow: inset 0 2px 2px -2px #aaa;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
@ -9294,14 +9293,12 @@ a.order-button:hover .ob-text,
width: 100%;
position: relative;
padding-right: 20px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.calendar-container .scroll-content {
padding: 25px 0 5px;
width: 100%;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
@ -11766,8 +11763,6 @@ hr + .rq-note {
padding: 4px 1px 4px 4px;
background-color: #ffffff;
border-radius: 4px;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, .4);
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, .4);
-ms-box-shadow: 0 1px 3px rgba(0, 0, 0, .4);
-o-box-shadow: 0 1px 3px rgba(0, 0, 0, .4);
box-shadow: 0 1px 3px rgba(0, 0, 0, .4);
@ -12091,8 +12086,6 @@ hr + .rq-note {
border: 0;
background-color: transparent;
padding: 0;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
.events-filter .csb-selected-items{
@ -12100,12 +12093,12 @@ hr + .rq-note {
}
.events-filter .csb-selected{
background: #ffffff; /* Old browsers */
background: -moz-linear-gradient(top, #ffffff 67%, #f5f5f5 100%); /* FF3.6+ */
background: #ffffff; /* Old browsers */ /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(67%,#ffffff), color-stop(100%,#f5f5f5)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #ffffff 67%,#f5f5f5 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #ffffff 67%,#f5f5f5 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #ffffff 67%,#f5f5f5 100%); /* IE10+ */
background: -o-linear-gradient(top, #ffffff 67%,#f5f5f5 100%); /* Opera 11.10+ */ /* IE10+ */
background: -webkit-linear-gradient(top, #ffffff 67%, #f5f5f5 100%);
background: -o-linear-gradient(top, #ffffff 67%, #f5f5f5 100%);
background: linear-gradient(to bottom, #ffffff 67%,#f5f5f5 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f5f5f5',GradientType=0 ); /* IE6-9 */
padding-bottom: 0;
@ -12157,11 +12150,7 @@ hr + .rq-note {
border-radius: 4px;
background: #FF6600;
padding-right: 2%;
-webkit-border-top-right-radius: 0;
-moz-border-radius-topright: 0;
border-top-right-radius: 0;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, .4);
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, .4);
-ms-box-shadow: 0 1px 3px rgba(0, 0, 0, .4);
-o-box-shadow: 0 1px 3px rgba(0, 0, 0, .4);
box-shadow: 0 1px 3px rgba(0, 0, 0, .4);
@ -12197,20 +12186,16 @@ hr + .rq-note {
text-shadow: 0 1px 0 rgba(0, 0, 0, .3);
border-color: #ff6600;
box-shadow: inset 0 1px 0 rgba(0, 0, 0, .1);
-webkit-border-bottom-left-radius: 0;
-moz-border-radius-bottomleft: 0;
border-bottom-left-radius: 0;
-webkit-border-bottom-right-radius: 0;
-moz-border-radius-bottomright: 0;
border-bottom-right-radius: 0;
}
.button.apply-filter{
background: #ffffff; /* Old browsers */
background: -moz-linear-gradient(top, #ffffff 67%, #f5f5f5 100%); /* FF3.6+ */
background: #ffffff; /* Old browsers */ /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(67%,#ffffff), color-stop(100%,#f5f5f5)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #ffffff 67%,#f5f5f5 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #ffffff 67%,#f5f5f5 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #ffffff 67%,#f5f5f5 100%); /* IE10+ */
background: -o-linear-gradient(top, #ffffff 67%,#f5f5f5 100%); /* Opera 11.10+ */ /* IE10+ */
background: -webkit-linear-gradient(top, #ffffff 67%, #f5f5f5 100%);
background: -o-linear-gradient(top, #ffffff 67%, #f5f5f5 100%);
background: linear-gradient(to bottom, #ffffff 67%,#f5f5f5 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f5f5f5',GradientType=0 ); /* IE6-9 */
color: #ff6600;
@ -12234,8 +12219,6 @@ hr + .rq-note {
}
.button.apply-filter.icon-check:hover{
-webkit-box-shadow: inset 0px 0px 2px 0px rgba(0, 0, 0, 0.3);
-moz-box-shadow: inset 0px 0px 2px 0px rgba(0, 0, 0, 0.3);
box-shadow: inset 0px 0px 2px 0px rgba(0, 0, 0, 0.3);
text-shadow: none;
}
@ -12403,7 +12386,9 @@ hr + .rq-note {
border: 1px solid #6EA01E;
}
.note-wrap:hover .note-button{
transition: none;
-webkit-transition: none;
-o-transition: none;
transition: none;
}
.note-wrap:hover .note-button{
border-color: #87c525;
@ -12480,7 +12465,6 @@ hr + .rq-note {
.service-page .error-field{
position: relative;
/*padding:0 5px;*/
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
@ -12579,7 +12563,6 @@ hr + .rq-note {
transition: all .3s;
padding-left: 4px;
padding-top: 3px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
@ -12603,7 +12586,6 @@ hr + .rq-note {
height: 34px;
border-radius: 17px;
background: #FCFCFB;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding-left: 9px;

4
templates/client/static_client/css/min/app.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
templates/client/static_client/css/min/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
templates/client/static_client/js/_modules/page.profile.calendar.js
Unescape View File

@ -62,7 +62,6 @@ if (EXPO.profile.calendar){
$sectBody
.stop()
.animate({
height: 0,
opacity: 0
}, 300, function () {
$sect.removeClass('eps-opened');
@ -73,7 +72,6 @@ if (EXPO.profile.calendar){
$sectBody
.stop()
.animate({
height: 'auto',
opacity: 1
}, 300, function () {
$sect.addClass('eps-opened');

33
templates/client/static_client/js/app.js
Unescape View File

@ -2090,40 +2090,7 @@ function placeInput(width){
return false;
});
$('a.eps-open').on('click', function () {
var $switch = $(this);
var $sect = $switch.closest('.ep-sect');
var $sectBody = $sect.children('div.ep-sect-body');
if ($sect.hasClass('eps-opened')) {
$sectBody
.stop()
.animate({
height: 'hide',
opacity: 'hide'
}, 300, function () {
$sect.removeClass('eps-opened');
});
} else {
$sectBody
.stop()
.animate({
height: 'show',
opacity: 'show'
}, 300, function () {
$sect.addClass('eps-opened');
});
}
return false;
});
/* Custom scroll для календаря*/
//$('div.calendar-container').each(function () {
// var $scrollContainer = $(this);
// var calScrollOptions = $.extend(customScrollOptions, { horizontalScroll: true });
// $scrollContainer.mCustomScrollbar(calScrollOptions);
//});
/* Временная функция для указания файла */
$('input[type="file"]').each(function () {

35
templates/client/static_client/js/main.js
Unescape View File

@ -1023,40 +1023,7 @@ function placeInput(width){
return false;
});
//$('a.eps-open').on('click', function () {
// var $switch = $(this);
// var $sect = $switch.closest('.ep-sect');
// var $sectBody = $sect.children('div.ep-sect-body');
//
// if ($sect.hasClass('eps-opened')) {
// $sectBody
// .stop()
// .animate({
// height: 'hide',
// opacity: 'hide'
// }, 300, function () {
// $sect.removeClass('eps-opened');
// });
// } else {
// $sectBody
// .stop()
// .animate({
// height: 'show',
// opacity: 'show'
// }, 300, function () {
// $sect.addClass('eps-opened');
// });
// }
//
// return false;
//});
/* Custom scroll для календаря*/
//$('div.calendar-container').each(function () {
// var $scrollContainer = $(this);
// var calScrollOptions = $.extend(customScrollOptions, { horizontalScroll: true });
// $scrollContainer.mCustomScrollbar(calScrollOptions);
//});
/* Временная функция для указания файла */
$('input[type="file"]').each(function () {

2
templates/client/static_client/js/min/_modules/block.common.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
templates/client/static_client/js/min/_modules/page.profile.calendar.min.js vendored
Unescape View File

@ -0,0 +1 @@
var EXPO=EXPO||{};EXPO.profile=EXPO.profile||{},EXPO.profile.calendar?console.warn("WARNING: EXPO.profile.calendar is already defined!"):EXPO.profile.calendar=function(){var o=(EXPO.common,{});return o.opt={},$(function(){}),o.init=function(o){$.extend(this.opt,o);var t=$("#"+this.opt.scrollBoxId),l=$("#"+this.opt.calenadrId),e=l.find("td."+this.opt.currentDayClass).index()*this.opt.cellWidth,s=$("#"+this.opt.scrollLeftId),i=$("#"+this.opt.scrollRightId),n=$("."+this.opt.calendarToggleClass);scrollStep=this.opt.cellWidth*this.opt.cellsToScroll,$(window).load(function(){t.mCustomScrollbar({axis:"y",horizontalScroll:!0,advanced:{autoScrollOnFocus:!1,updateOnContentResize:!1,updateOnBrowserResize:!1}}),t.mCustomScrollbar("scrollTo",e)}),s.on("click",function(){t.mCustomScrollbar("scrollTo","+="+scrollStep)}),i.on("click",function(){t.mCustomScrollbar("scrollTo","-="+scrollStep)}),n.on("click",function(){var o=$(this),t=o.closest(".ep-sect"),l=t.children("div.ep-sect-body");return t.hasClass("eps-opened")?(i.hide(),s.hide(),l.stop().animate({height:0,opacity:0},300,function(){t.removeClass("eps-opened")})):(i.show(),s.show(),l.stop().animate({height:"auto",opacity:1},300,function(){t.addClass("eps-opened")})),!1})},o}();

2
templates/client/static_client/js/min/app.min.js vendored
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save