Update CSS minification

This commit is contained in:
champsupertramp
2016-05-18 18:17:36 +08:00
parent 79ba64f206
commit 61b11ea4b7
6 changed files with 154 additions and 106 deletions
+19 -19
View File
@@ -4,7 +4,7 @@
/** /**
* Note: the root picker element should *NOT* be styled more than whats here. * Note: the root picker element should *NOT* be styled more than whats here.
*/ */
.picker { .um .picker {
font-size: 16px; font-size: 16px;
text-align: left; text-align: left;
line-height: 1.2; line-height: 1.2;
@@ -20,19 +20,19 @@
/** /**
* The picker input element. * The picker input element.
*/ */
.picker__input { .um .picker__input {
cursor: default; cursor: default;
} }
/** /**
* When the picker is opened, the input element is “activated”. * When the picker is opened, the input element is “activated”.
*/ */
.picker__input.picker__input--active { .um .picker__input.picker__input--active {
border-color: #0089ec; border-color: #0089ec;
} }
/** /**
* The holder is the only “scrollable” top-level container element. * The holder is the only “scrollable” top-level container element.
*/ */
.picker__holder { .um .picker__holder {
width: 100%; width: 100%;
overflow-y: auto; overflow-y: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
@@ -48,8 +48,8 @@
/** /**
* Make the holder and frame fullscreen. * Make the holder and frame fullscreen.
*/ */
.picker__holder, .um .picker__holder,
.picker__frame { .um .picker__frame {
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; right: 0;
@@ -58,7 +58,7 @@
/** /**
* The holder should overlay the entire screen. * The holder should overlay the entire screen.
*/ */
.picker__holder { .um .picker__holder {
position: fixed; position: fixed;
-webkit-transition: background 0.15s ease-out, top 0s 0.15s; -webkit-transition: background 0.15s ease-out, top 0s 0.15s;
-moz-transition: background 0.15s ease-out, top 0s 0.15s; -moz-transition: background 0.15s ease-out, top 0s 0.15s;
@@ -67,7 +67,7 @@
/** /**
* The frame that bounds the box contents of the picker. * The frame that bounds the box contents of the picker.
*/ */
.picker__frame { .um .picker__frame {
position: absolute; position: absolute;
margin: 0 auto; margin: 0 auto;
min-width: 256px; min-width: 256px;
@@ -82,7 +82,7 @@
transition: all 0.15s ease-out; transition: all 0.15s ease-out;
} }
@media (min-height: 33.875em) { @media (min-height: 33.875em) {
.picker__frame { .um .picker__frame {
overflow: visible; overflow: visible;
top: auto; top: auto;
bottom: -100%; bottom: -100%;
@@ -90,37 +90,37 @@
} }
} }
@media (min-height: 40.125em) { @media (min-height: 40.125em) {
.picker__frame { .um .picker__frame {
margin-bottom: 15% !important; margin-bottom: 15% !important;
} }
} }
/** /**
* The wrapper sets the stage to vertically align the box contents. * The wrapper sets the stage to vertically align the box contents.
*/ */
.picker__wrap { .um .picker__wrap {
display: table; display: table;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
@media (min-height: 33.875em) { @media (min-height: 33.875em) {
.picker__wrap { .um .picker__wrap {
display: block; display: block;
} }
} }
/** /**
* The box contains all the picker contents. * The box contains all the picker contents.
*/ */
.picker__box { .um .picker__box {
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
} }
@media (min-height: 26.5em) { @media (min-height: 26.5em) {
.picker__box { .um .picker__box {
} }
} }
@media (min-height: 33.875em) { @media (min-height: 33.875em) {
.picker__box { .um .picker__box {
display: block; display: block;
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
@@ -128,7 +128,7 @@
} }
} }
@media (min-height: 40.125em) { @media (min-height: 40.125em) {
.picker__box { .um .picker__box {
border-bottom-width: 1px; border-bottom-width: 1px;
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
@@ -139,7 +139,7 @@
/** /**
* When the picker opens... * When the picker opens...
*/ */
.picker--opened .picker__holder { .um .picker--opened .picker__holder {
top: 0; top: 0;
background: transparent; background: transparent;
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#1E000000,endColorstr=#1E000000)"; -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#1E000000,endColorstr=#1E000000)";
@@ -149,7 +149,7 @@
-moz-transition: background 0.15s ease-out; -moz-transition: background 0.15s ease-out;
transition: background 0.15s ease-out; transition: background 0.15s ease-out;
} }
.picker--opened .picker__frame { .um .picker--opened .picker__frame {
top: 0; top: 0;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
filter: alpha(opacity=100); filter: alpha(opacity=100);
@@ -157,7 +157,7 @@
opacity: 1; opacity: 1;
} }
@media (min-height: 33.875em) { @media (min-height: 33.875em) {
.picker--opened .picker__frame { .um .picker--opened .picker__frame {
top: auto; top: auto;
bottom: 0; bottom: 0;
} }
+58 -58
View File
@@ -4,13 +4,13 @@
/** /**
* The picker box. * The picker box.
*/ */
.picker__box { .um .picker__box {
} }
/** /**
* The header containing the month and year stuff. * The header containing the month and year stuff.
*/ */
.picker__header { .um .picker__header {
text-align: center; text-align: center;
position: relative; position: relative;
margin-top: .75em; margin-top: .75em;
@@ -21,20 +21,20 @@
/** /**
* The month and year labels. * The month and year labels.
*/ */
.picker__month, .um .picker__month,
.picker__year { .um .picker__year {
display: inline-block; display: inline-block;
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
} }
.picker__year { .um .picker__year {
} }
/** /**
* The month and year selectors. * The month and year selectors.
*/ */
.picker__select--month, .um .picker__select--month,
.picker__select--year { .um .picker__select--year {
margin-left: .25em; margin-left: .25em;
margin-right: .25em; margin-right: .25em;
font-size: 16px; font-size: 16px;
@@ -44,26 +44,26 @@
border: 0 !important; border: 0 !important;
} }
@media (min-width: 24.5em) { @media (min-width: 24.5em) {
.picker__select--month, .um .picker__select--month,
.picker__select--year { .um .picker__select--year {
margin-top: -0.5em; margin-top: -0.5em;
} }
} }
.picker__select--month { .um .picker__select--month {
width: 35%; width: 35%;
} }
.picker__select--year { .um .picker__select--year {
width: 22.5%; width: 22.5%;
} }
.picker__select--month:focus, .um .picker__select--month:focus,
.picker__select--year:focus { .um .picker__select--year:focus {
} }
/** /**
* The month navigation buttons. * The month navigation buttons.
*/ */
.picker__nav--prev, .um .picker__nav--prev,
.picker__nav--next { .um .picker__nav--next {
position: absolute; position: absolute;
padding: .5em 1.25em; padding: .5em 1.25em;
width: 1em; width: 1em;
@@ -73,31 +73,31 @@
color: #fff; color: #fff;
} }
@media (min-width: 24.5em) { @media (min-width: 24.5em) {
.picker__nav--prev, .um .picker__nav--prev,
.picker__nav--next { .um .picker__nav--next {
} }
} }
.picker__nav--prev { .um .picker__nav--prev {
left: 0; left: 0;
padding-right: 1.25em; padding-right: 1.25em;
} }
@media (min-width: 24.5em) { @media (min-width: 24.5em) {
.picker__nav--prev { .um .picker__nav--prev {
padding-right: 1.5em; padding-right: 1.5em;
} }
} }
.picker__nav--next { .um .picker__nav--next {
right: 0; right: 0;
padding-left: 1.25em; padding-left: 1.25em;
} }
@media (min-width: 24.5em) { @media (min-width: 24.5em) {
.picker__nav--next { .um .picker__nav--next {
padding-left: 1.5em; padding-left: 1.5em;
} }
} }
.picker__nav--prev:before, .um .picker__nav--prev:before,
.picker__nav--next:before { .um .picker__nav--next:before {
content: " "; content: " ";
border-top: .5em solid transparent; border-top: .5em solid transparent;
border-bottom: .5em solid transparent; border-bottom: .5em solid transparent;
@@ -109,21 +109,21 @@
display: block; display: block;
margin: 0 auto; margin: 0 auto;
} }
.picker__nav--next:before { .um .picker__nav--next:before {
border-right: 0; border-right: 0;
border-left: 0.5em solid #fff; border-left: 0.5em solid #fff;
} }
.picker__nav--prev:hover, .um .picker__nav--prev:hover,
.picker__nav--next:hover { .um .picker__nav--next:hover {
cursor: pointer; cursor: pointer;
color: #fff; color: #fff;
} }
.picker__nav--disabled, .um .picker__nav--disabled,
.picker__nav--disabled:hover, .um .picker__nav--disabled:hover,
.picker__nav--disabled:before, .um .picker__nav--disabled:before,
.picker__nav--disabled:before:hover { .um .picker__nav--disabled:before:hover {
cursor: default; cursor: default;
background: none; background: none;
} }
@@ -131,7 +131,7 @@
/** /**
* The calendar table of dates * The calendar table of dates
*/ */
.picker__table { .um .picker__table {
text-align: center; text-align: center;
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; border-spacing: 0;
@@ -143,16 +143,16 @@
margin-bottom: 0; margin-bottom: 0;
} }
@media (min-height: 33.875em) { @media (min-height: 33.875em) {
.picker__table { .um .picker__table {
} }
} }
.picker__table th { .um .picker__table th {
} }
.picker__table td { .um .picker__table td {
margin: 0; margin: 0;
padding: 0px 10px; padding: 0px 10px;
text-align: center; text-align: center;
@@ -161,7 +161,7 @@
/** /**
* The weekday labels * The weekday labels
*/ */
.picker__weekday { .um .picker__weekday {
width: 14.285714286%; width: 14.285714286%;
color: #fff; color: #fff;
text-align: center; text-align: center;
@@ -169,65 +169,65 @@
/* Increase the spacing a tad */ /* Increase the spacing a tad */
} }
@media (min-height: 33.875em) { @media (min-height: 33.875em) {
.picker__weekday { .um .picker__weekday {
} }
} }
/** /**
* The days on the calendar * The days on the calendar
*/ */
.picker__day { .um .picker__day {
padding: 10px 0; padding: 10px 0;
line-height: 1em !important; line-height: 1em !important;
} }
.picker__day--today { .um .picker__day--today {
position: relative; position: relative;
} }
.picker__day--outfocus { .um .picker__day--outfocus {
opacity: 0.75; opacity: 0.75;
} }
.picker__day--infocus:hover, .um .picker__day--infocus:hover,
.picker__day--outfocus:hover { .um .picker__day--outfocus:hover {
border-radius: 2px; border-radius: 2px;
cursor: pointer; cursor: pointer;
} }
.picker__day--highlighted { .um .picker__day--highlighted {
} }
.picker__day--highlighted:hover, .um .picker__day--highlighted:hover,
.picker--focused .picker__day--highlighted { .um .picker--focused .picker__day--highlighted {
border-radius: 2px; border-radius: 2px;
} }
.picker__day--selected, .um .picker__day--selected,
.picker__day--selected:hover, .um .picker__day--selected:hover,
.picker--focused .picker__day--selected { .um .picker--focused .picker__day--selected {
} }
.picker__day--disabled, .um .picker__day--disabled,
.picker__day--disabled:hover { .um .picker__day--disabled:hover {
cursor: default; cursor: default;
background: transparent !important; background: transparent !important;
opacity: 0.3; opacity: 0.3;
} }
.picker__day--highlighted.picker__day--disabled, .um .picker__day--highlighted.picker__day--disabled,
.picker__day--highlighted.picker__day--disabled:hover { .um .picker__day--highlighted.picker__day--disabled:hover {
} }
/** /**
* The footer containing the "today" and "clear" buttons. * The footer containing the "today" and "clear" buttons.
*/ */
.picker__footer { .um .picker__footer {
text-align: center; text-align: center;
height: 50px !important; height: 50px !important;
line-height: 50px !important; line-height: 50px !important;
margin-top: 5px; margin-top: 5px;
border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px;
} }
.picker__button--today, .um .picker__button--today,
.picker__button--clear { .um .picker__button--clear {
margin: 0 !important; margin: 0 !important;
width: 50%; width: 50%;
display: inline-block; display: inline-block;
@@ -237,9 +237,9 @@
outline: 0 !important; outline: 0 !important;
box-sizing: border-box !important; box-sizing: border-box !important;
} }
.picker__button--today:hover, .um .picker__button--today:hover,
.picker__button--clear:hover, .um .picker__button--clear:hover,
.picker__button--today:focus, .um .picker__button--today:focus,
.picker__button--clear:focus { .um .picker__button--clear:focus {
cursor: pointer; cursor: pointer;
} }
+19 -19
View File
@@ -4,7 +4,7 @@
/** /**
* The list of times. * The list of times.
*/ */
.picker__list { .um .picker__list {
list-style: none; list-style: none;
list-style: none !important; list-style: none !important;
padding: 5px !important; padding: 5px !important;
@@ -14,7 +14,7 @@
/** /**
* The times on the clock. * The times on the clock.
*/ */
.picker__list-item { .um .picker__list-item {
position: relative; position: relative;
border-radius: 2px; border-radius: 2px;
display: inline-block; display: inline-block;
@@ -26,38 +26,38 @@
} }
@media (min-height: 46.75em) { @media (min-height: 46.75em) {
.picker__list-item { .um .picker__list-item {
} }
} }
/* Hovered time */ /* Hovered time */
.picker__list-item:hover { .um .picker__list-item:hover {
cursor: pointer; cursor: pointer;
z-index: 10; z-index: 10;
} }
/* Highlighted and hovered/focused time */ /* Highlighted and hovered/focused time */
.picker__list-item--highlighted { .um .picker__list-item--highlighted {
z-index: 10; z-index: 10;
} }
.picker__list-item--highlighted:hover, .um .picker__list-item--highlighted:hover,
.picker--focused .picker__list-item--highlighted { .um .picker--focused .picker__list-item--highlighted {
cursor: pointer; cursor: pointer;
font-weight: bold; font-weight: bold;
} }
/* Selected and hovered/focused time */ /* Selected and hovered/focused time */
.picker__list-item--selected, .um .picker__list-item--selected,
.picker__list-item--selected:hover, .um .picker__list-item--selected:hover,
.picker--focused .picker__list-item--selected { .um .picker--focused .picker__list-item--selected {
z-index: 10; z-index: 10;
} }
/* Disabled time */ /* Disabled time */
.picker__list-item--disabled, .um .picker__list-item--disabled,
.picker__list-item--disabled:hover, .um .picker__list-item--disabled:hover,
.picker--focused .picker__list-item--disabled { .um .picker--focused .picker__list-item--disabled {
color: #a9e792; color: #a9e792;
cursor: default; cursor: default;
background: transparent; background: transparent;
@@ -67,7 +67,7 @@
/** /**
* The clear button * The clear button
*/ */
.picker--time .picker__button--clear { .um .picker--time .picker__button--clear {
width: 100%; width: 100%;
display: inline-block; display: inline-block;
background: none; background: none;
@@ -78,8 +78,8 @@
border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px;
color: #fff !important; color: #fff !important;
} }
.picker--time .picker__button--clear:hover, .um .picker--time .picker__button--clear:hover,
.picker--time .picker__button--clear:focus { .um .picker--time .picker__button--clear:focus {
cursor: pointer; cursor: pointer;
} }
@@ -89,20 +89,20 @@
/** /**
* The frame the bounds the time picker. * The frame the bounds the time picker.
*/ */
.picker--time .picker__frame { .um .picker--time .picker__frame {
min-width: 256px; min-width: 256px;
max-width: 400px; max-width: 400px;
} }
/** /**
* The picker box. * The picker box.
*/ */
.picker--time .picker__box { .um .picker--time .picker__box {
font-size: 15px; font-size: 15px;
padding: 0; padding: 0;
border-radius: 2px !important; border-radius: 2px !important;
} }
@media (min-height: 40.125em) { @media (min-height: 40.125em) {
.picker--time .picker__frame { .um .picker--time .picker__frame {
margin-bottom: 10% !important; margin-bottom: 10% !important;
} }
} }
+5 -5
View File
@@ -5,25 +5,25 @@
* Switch the direction - only really necessary if * Switch the direction - only really necessary if
* it hasnt already been applied higher up in the DOM. * it hasnt already been applied higher up in the DOM.
*/ */
.picker { .um .picker {
direction: rtl; direction: rtl;
} }
/** /**
* Flip around the “next” and “previous” buttons. * Flip around the “next” and “previous” buttons.
*/ */
.picker__nav--next { .um .picker__nav--next {
right: auto; right: auto;
left: -1em; left: -1em;
} }
.picker__nav--prev { .um .picker__nav--prev {
left: auto; left: auto;
right: -1em; right: -1em;
} }
.picker__nav--next:before { .um .picker__nav--next:before {
border-left: 0; border-left: 0;
border-right: 0.75em solid #000000; border-right: 0.75em solid #000000;
} }
.picker__nav--prev:before { .um .picker__nav--prev:before {
border-right: 0; border-right: 0;
border-left: 0.75em solid #000000; border-left: 0.75em solid #000000;
} }
+21 -2
View File
File diff suppressed because one or more lines are too long
+31 -2
View File
@@ -2,8 +2,9 @@
Ultimate Member dependencies Ultimate Member dependencies
*/ */
var gulp = require('gulp'); var gulp = require('gulp');
var uglify = require('gulp-uglify'); var uglify = require('gulp-uglify');
var concat = require('gulp-concat'); var concat = require('gulp-concat');
var minifyCSS = require('gulp-minify-css');
gulp.task('scripts', function() { gulp.task('scripts', function() {
@@ -37,7 +38,35 @@ gulp.task('scripts', function() {
}); });
gulp.task('css', function() {
gulp.src([
'assets/css/um-fonticons-ii.css',
'assets/css/um-fonticons-fa.css',
'assets/css/um-select.css',
'assets/css/um-modal.css',
'assets/css/um-styles.css',
'assets/css/um-members.css',
'assets/css/um-profile.css',
'assets/css/um-account.css',
'assets/css/um-misc.css',
'assets/css/um-fileupload.css',
'assets/css/pickadate/default.css',
'assets/css/pickadate/default.date.css',
'assets/css/pickadate/default.time.css',
'assets/css/um-raty.css',
'assets/css/um-scrollbar.css',
'assets/css/um-crop.css',
'assets/css/um-tipsy.css',
'assets/css/um-responsive.css',
])
.pipe(minifyCSS())
.pipe(concat("um.min.css"))
.pipe(gulp.dest("assets/css"));
});
// The default task (called when you run `gulp`) // The default task (called when you run `gulp`)
gulp.task('default', function() { gulp.task('default', function() {
gulp.start('scripts'); gulp.start('scripts');
gulp.start('css');
}); });