Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
dioslaska committed Jul 20, 2015
2 parents 9500932 + e57d6d4 commit 0864257
Show file tree
Hide file tree
Showing 30 changed files with 226 additions and 122 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mobiscroll",
"version": "2.16.0",
"version": "2.16.1",
"main": [
"js/mobiscroll.core.js",
"js/mobiscroll.frame.js",
Expand Down
11 changes: 8 additions & 3 deletions css/mobiscroll.frame.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
}

.dwwr {
min-width: 170px;
min-width: 200px;
zoom: 1;
overflow: hidden;
text-align: center;
Expand All @@ -63,6 +63,7 @@

.dw-persp {
z-index: 99998;
pointer-events: auto;
}

.dwo {
Expand Down Expand Up @@ -186,6 +187,10 @@
width: 100%;
text-align: center;
}

.dwbc .dwb-d {
opacity: .3;
}
/* Button wrapper */

.dwbw {
Expand All @@ -211,7 +216,7 @@
/* Default theme */

.mbsc-mobiscroll .dwwr {
min-width: 220px;
min-width: 16em;
background: #f7f7f7;
color: #454545;
font-size: 16px;
Expand Down Expand Up @@ -261,4 +266,4 @@

.mbsc-mobiscroll .dw-bubble-top .dw-arr {
border-color: #f7f7f7 transparent transparent transparent;
}
}
70 changes: 43 additions & 27 deletions css/mobiscroll.frame.ios-classic.css
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
/* iOS Skin */
.mbsc-ios-classic .dw {
min-width: 134px;
border: 1px solid #2d3034;
}

.mbsc-ios-classic .dwo {
background: none;
}

.mbsc-ios-classic .dwwr {
position: relative;
min-width: 170px;
padding: 0 6px;
margin-top: 40px;
background: -webkit-gradient(linear,left top,left bottom,from(#9f9fa6),color-stop(0.5, #484a55),color-stop(0.5, #272836),to(#282a39));
background: -webkit-linear-gradient(#9f9fa6,#484a55 50%,#272836 50%,#282a39);
background: -moz-linear-gradient(#9f9fa6,#484a55 50%,#272836 50%,#282a39);
background: linear-gradient(#9f9fa6,#484a55 50%,#272836 50%,#282a39);
background: -webkit-gradient(linear, left top, left bottom, from(#9f9fa6), color-stop(0.5, #484a55), color-stop(0.5, #272836), to(#282a39));
background: -webkit-linear-gradient(#9f9fa6, #484a55 50%, #272836 50%, #282a39);
background: -moz-linear-gradient(#9f9fa6, #484a55 50%, #272836 50%, #282a39);
background: linear-gradient(#9f9fa6, #484a55 50%, #272836 50%, #282a39);
background-color: #9f9fa6;
background-repeat: no-repeat;
color: #fff;
overflow: visible;
}

.mbsc-ios-classic.dw-nobtn .dwwr {
margin-top: 0;
}

.mbsc-ios-classic .dwv {
width: 0;
height: 0;
Expand All @@ -31,6 +35,7 @@
overflow: hidden;
}
/* Buttons */

.mbsc-ios-classic .dwbc {
display: block;
position: absolute;
Expand All @@ -40,18 +45,19 @@
height: 28px;
padding: 5px 0;
background: #454545;
background: -webkit-gradient(linear,left top,left bottom,from(rgba(69,69,69,0.7)),color-stop(0.5, rgba(37,37,37,0.7)),color-stop(0.5, rgba(16,16,16,0.7)),to(rgba(0,0,0,0.7)));
background: -webkit-linear-gradient(rgba(69,69,69,0.7),rgba(37,37,37,0.7) 50%,rgba(16,16,16,0.7) 50%,rgba(0,0,0,0.7));
background: -moz-linear-gradient(rgba(69,69,69,0.7),rgba(37,37,37,0.7) 50%,rgba(16,16,16,0.7) 50%,rgba(0,0,0,0.7));
background: linear-gradient(rgba(69,69,69,0.7),rgba(37,37,37,0.7) 50%,rgba(16,16,16,0.7) 50%,rgba(0,0,0,0.7));
background: -webkit-gradient(linear, left top, left bottom, from(rgba(69, 69, 69, 0.7)), color-stop(0.5, rgba(37, 37, 37, 0.7)), color-stop(0.5, rgba(16, 16, 16, 0.7)), to(rgba(0, 0, 0, 0.7)));
background: -webkit-linear-gradient(rgba(69, 69, 69, 0.7), rgba(37, 37, 37, 0.7) 50%, rgba(16, 16, 16, 0.7) 50%, rgba(0, 0, 0, 0.7));
background: -moz-linear-gradient(rgba(69, 69, 69, 0.7), rgba(37, 37, 37, 0.7) 50%, rgba(16, 16, 16, 0.7) 50%, rgba(0, 0, 0, 0.7));
background: linear-gradient(rgba(69, 69, 69, 0.7), rgba(37, 37, 37, 0.7) 50%, rgba(16, 16, 16, 0.7) 50%, rgba(0, 0, 0, 0.7));
border-bottom: 1px solid #888;
border-bottom: 1px solid rgba(255,255,255,0.5);
border-bottom: 1px solid rgba(255, 255, 255, 0.5);
border-top: 1px solid #888;
border-top: 1px solid rgba(255,255,255,0.5);
border-top: 1px solid rgba(255, 255, 255, 0.5);
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
}

.mbsc-ios-classic .dwb {
margin: 0 5px;
padding: 0 10px;
Expand All @@ -63,48 +69,55 @@
color: #fff;
border: 1px solid #1f1f1f;
background: #1a1a1a;
background: -webkit-gradient(linear,left top,left bottom,from(#7b7b7b),color-stop(0.5, #1a1a1a),color-stop(0.5, #000));
background: -webkit-linear-gradient(#7b7b7b,#1a1a1a 50%,#000 50%);
background: -moz-linear-gradient(#7b7b7b,#1a1a1a 50%,#000 50%);
background: linear-gradient(#7b7b7b,#1a1a1a 50%,#000 50%);
-webkit-box-shadow: 0 1px 0 rgba(255,255,255,0.3);
background: -webkit-gradient(linear, left top, left bottom, from(#7b7b7b), color-stop(0.5, #1a1a1a), color-stop(0.5, #000));
background: -webkit-linear-gradient(#7b7b7b, #1a1a1a 50%, #000 50%);
background: -moz-linear-gradient(#7b7b7b, #1a1a1a 50%, #000 50%);
background: linear-gradient(#7b7b7b, #1a1a1a 50%, #000 50%);
-webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.3);
border-radius: 5px;
box-shadow: 0 1px 0 rgba(255,255,255,0.3);
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.3);
}

.mbsc-ios-classic .dwb-s .dwb {
border: 1px solid #194aab;
background: #194aab;
background: -webkit-gradient(linear,left top,left bottom,from(#82aaff),color-stop(0.5,#3162c4),color-stop(0.5,#194aab));
background: -webkit-linear-gradient(#82aaff,#3162c4 50%,#194aab 50%);
background: -moz-linear-gradient(#82aaff,#3162c4 50%,#194aab 50%);
background: linear-gradient(#82aaff,#3162c4 50%,#194aab 50%);
background: -webkit-gradient(linear, left top, left bottom, from(#82aaff), color-stop(0.5, #3162c4), color-stop(0.5, #194aab));
background: -webkit-linear-gradient(#82aaff, #3162c4 50%, #194aab 50%);
background: -moz-linear-gradient(#82aaff, #3162c4 50%, #194aab 50%);
background: linear-gradient(#82aaff, #3162c4 50%, #194aab 50%);
}

.mbsc-ios-classic .dwb-a {
opacity: .8;
filter: alpha(opacity=80);
}

.mbsc-ios-classic .dwbw {
display: block;
float: right;
}

.mbsc-ios-classic .dwb-c {
float: left;
}
/* Bubble positioning */

.mbsc-ios-classic.dw-bubble .dw {
padding: 6px;
background: #afafaf;
background: -webkit-gradient(linear,left top,left bottom,from(#afafaf),color-stop(0.3, #1b2530));
background: -webkit-gradient(linear, left top, left bottom, from(#afafaf), color-stop(0.3, #1b2530));
background: -webkit-linear-gradient(#afafaf, #1b2530 30%);
background: -moz-linear-gradient(#afafaf, #1b2530 30%);
background: linear-gradient(#afafaf, #1b2530 30%);
-webkit-box-shadow: 0 0 25px rgba(0,0,0,0.7);
-webkit-box-shadow: 0 0 25px rgba(0, 0, 0, 0.7);
border-radius: 5px;
box-shadow: 0 0 25px rgba(0,0,0,0.7);
box-shadow: 0 0 25px rgba(0, 0, 0, 0.7);
}

.mbsc-ios-classic .dw-bubble-bottom .dw-arr {
border-color: transparent transparent #2d3034 transparent;
}

.mbsc-ios-classic .dw-bubble-bottom .dw-arr:after {
content: '';
position: absolute;
Expand All @@ -113,17 +126,20 @@
border: 17px solid #afafaf;
border-color: transparent transparent #afafaf transparent;
}

.mbsc-ios-classic .dw-bubble-top .dw-arr {
border-color: #1b2530 transparent transparent transparent;
}
/* Widget */

.mbsc-ios-classic.mbsc-wdg .dwwr {
padding: 6px;
}

.mbsc-ios-classic.mbsc-wdg .dwcc {
background: #fff;
color: #000;
-webkit-box-shadow: 0 1px 1px rgba(255,255,255,.3), 0 1px 5px rgba(0, 0, 0, 0.90) inset, 0 -1px 1px rgba(0, 0, 0, 0.90) inset;
box-shadow: 0 1px 1px rgba(255,255,255,.3), 0 1px 5px rgba(0, 0, 0, 0.90) inset, 0 -1px 1px rgba(0, 0, 0, 0.90) inset;
-webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, .3), 0 1px 5px rgba(0, 0, 0, 0.90) inset, 0 -1px 1px rgba(0, 0, 0, 0.90) inset;
box-shadow: 0 1px 1px rgba(255, 255, 255, .3), 0 1px 5px rgba(0, 0, 0, 0.90) inset, 0 -1px 1px rgba(0, 0, 0, 0.90) inset;
border-radius: .5em;
}
}
3 changes: 3 additions & 0 deletions css/mobiscroll.wp-light.css
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@
.mbsc-wp-light .dw-cal-day-fg {
border-color: rgb(166,166,166);
}
.mbsc-wp-light .dw-cal-day-inv .dw-cal-day-fg {
color: rgba(0,0,0,.3);
}
.mbsc-wp-light .dw-sel .dw-cal-day-fg {
border-color: rgb(28,161,227);
}
Expand Down
4 changes: 2 additions & 2 deletions js/i18n/mobiscroll.i18n.cs.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
setText: 'Zadej',
cancelText: 'Storno',
clearText: 'Vymazat',
selectedText: 'Označený',
selectedText: 'označený',
// Datetime component
dateFormat: 'dd/mm/yy',
dateOrder: 'ddmmy',
Expand Down Expand Up @@ -53,4 +53,4 @@
offText: 'O',
onText: 'I'
};
})(jQuery);
})(jQuery);
4 changes: 2 additions & 2 deletions js/i18n/mobiscroll.i18n.de.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
setText: 'OK',
cancelText: 'Abbrechen',
clearText: 'Löschen',
selectedText: 'Ausgewählt',
selectedText: 'ausgewählt',
// Datetime component
dateFormat: 'dd.mm.yy',
dateOrder: 'ddmmyy',
Expand Down Expand Up @@ -54,4 +54,4 @@
offText: 'Aus',
onText: 'Ein'
};
})(jQuery);
})(jQuery);
5 changes: 3 additions & 2 deletions js/i18n/mobiscroll.i18n.es.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
setText: 'Aceptar',
cancelText: 'Cancelar',
clearText: 'Claro',
selectedText: 'Seleccionado',
selectedText: 'seleccionado',
selectedPluralText: 'seleccionados',
// Datetime component
dateFormat: 'dd/mm/yy',
dateOrder: 'ddmmyy',
Expand Down Expand Up @@ -52,4 +53,4 @@
offText: 'No',
onText: 'Sí'
};
})(jQuery);
})(jQuery);
5 changes: 3 additions & 2 deletions js/i18n/mobiscroll.i18n.fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
setText: 'Terminer',
cancelText: 'Annuler',
clearText: 'Effacer',
selectedText: 'Sélectionné',
selectedText: 'sélectionné',
selectedPluralText: 'sélectionnés',
// Datetime component
dateFormat: 'dd/mm/yy',
dateOrder: 'ddmmyy',
Expand Down Expand Up @@ -53,4 +54,4 @@
offText: 'Non',
onText: 'Oui'
};
})(jQuery);
})(jQuery);
4 changes: 2 additions & 2 deletions js/i18n/mobiscroll.i18n.hu.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
setText: 'OK',
cancelText: 'Mégse',
clearText: 'Törlés',
selectedText: 'Kiválasztva',
selectedText: 'kiválasztva',
// Datetime component
dateFormat: 'yy.mm.dd.',
dateOrder: 'yymmdd',
Expand Down Expand Up @@ -61,4 +61,4 @@
offText: 'Ki',
onText: 'Be'
};
})(jQuery);
})(jQuery);
5 changes: 3 additions & 2 deletions js/i18n/mobiscroll.i18n.it.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
setText: 'OK',
cancelText: 'Annulla',
clearText: 'Chiarire',
selectedText: 'Selezionato',
selectedText: 'selezionato',
selectedPluralText: 'selezionati',
// Datetime component
dateFormat: 'dd-mm-yyyy',
dateOrder: 'ddmmyy',
Expand Down Expand Up @@ -53,4 +54,4 @@
offText: 'Via',
onText: 'Su'
};
})(jQuery);
})(jQuery);
57 changes: 57 additions & 0 deletions js/i18n/mobiscroll.i18n.lt.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
// Lietuvių
(function ($) {
$.mobiscroll.i18n.lt = {
// Core
setText: 'OK',
cancelText: 'Atšaukti',
clearText: 'Išvalyti',
selectedText: 'pasirinktas',
// Datetime component
dateFormat: 'yy.mm.dd',
dateOrder: 'yymmdd',
dayNames: ['Sekmadienis', 'Pirmadienis', 'Antradienis', 'Trečiadienis', 'Ketvirtadienis', 'Penktadienis', 'Šeštadienis'],
dayNamesShort: ['S', 'Pr', 'A', 'T', 'K', 'Pn', 'Š'],
dayNamesMin: ['S', 'Pr', 'A', 'T', 'K', 'Pn', 'Š'],
dayText: 'Diena',
hourText: 'Valanda',
minuteText: 'Minutes',
monthNames: ['Sausis', 'Vasaris', 'Kovas', 'Balandis', 'Gegužė', 'Birželis', 'Liepa', 'Rugpjūtis', 'Rugsėjis', 'Spalis', 'Lapkritis', 'Gruodis'],
monthNamesShort: ['Sau', 'Vas', 'Kov', 'Bal', 'Geg', 'Bir', 'Lie', 'Rugp', 'Rugs', 'Spa', 'Lap', 'Gruo'],
monthText: 'Mėnuo',
secText: 'Sekundes',
amText: 'am',
pmText: 'pm',
timeFormat: 'HH:ii',
timeWheels: 'HHii',
yearText: 'Metai',
nowText: 'Dabar',
// Calendar component
firstDay: 1,
dateText: 'Data',
timeText: 'Laikas',
calendarText: 'Kalendorius',
closeText: 'Uždaryti',
// Daterange component
fromText: 'Nuo',
toText: 'Iki',
// Measurement components
wholeText: 'Visas',
fractionText: 'Frakcija',
unitText: 'Vienetas',
// Time / Timespan component
labels: ['Metai', 'Mėnesiai', 'Dienos', 'Valandos', 'Minutes', 'Sekundes', ''],
labelsShort: ['m', 'mėn.', 'd', 'h', 'min', 's', ''],
// Timer component
startText: 'Pradėti',
stopText: 'Sustabdyti',
resetText: 'Išnaujo',
lapText: 'Ratas',
hideText: 'Slėpti',
// Listview
backText: 'Atgal',
undoText: 'Atšaukti veiksmą',
// Form
offText: 'Išj.',
onText: 'Įj.'
};
})(jQuery);
4 changes: 2 additions & 2 deletions js/i18n/mobiscroll.i18n.nl.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
setText: 'Instellen',
cancelText: 'Annuleren',
clearText: 'Duidelijk',
selectedText: 'Gekozen',
selectedText: 'gekozen',
// Datetime component
dateFormat: 'dd/mm/yy',
dateOrder: 'ddmmyy',
Expand Down Expand Up @@ -53,4 +53,4 @@
offText: 'Uit',
onText: 'Aan'
};
})(jQuery);
})(jQuery);
Loading

0 comments on commit 0864257

Please sign in to comment.