Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

适配iOS7 #177

Closed
wants to merge 12 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ module.exports = function(grunt) {
options: {
cwd: './examples/widget/',
files: '**/*.html',
output: './examples/demos.js'
output: './examples/assets/demos.js'
}
},

Expand Down
9 changes: 9 additions & 0 deletions assets/widget/add2desktop/add2desktop.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@
font-weight: bold;
}

.ui-add2desktop-icon-iOS7 {
margin:0 2px;
display: inline-block;
height: 24px;
width:18px;
background: url(ui-add2desktop-iOS7.png) no-repeat;
-webkit-background-size:18px 24px;
}

.ui-add2desktop-icon-new {
margin:0 2px;
display: inline-block;
Expand Down
Binary file added assets/widget/add2desktop/ui-add2desktop-iOS7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
130 changes: 130 additions & 0 deletions assets/widget/calendar/calendar.iOS7.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
.ui-calendar {
width: 100%;
line-height: 25px;
font-size: 14px;
}

.ui-calendar-header {
color: #545454;
text-align: center;
padding: 3px 0;
}

.ui-calendar-header a {
color: #545454;
text-decoration: none;
display: inline-block;
padding: 5px;
margin: 0 5px;
text-align: center;
border-radius: 3px;
line-height: 1.0;
}
.ui-calendar-header a.ui-state-hover {
background-color: #ccc;
}
.ui-calendar-header .ui-calendar-title {
text-align: center;
display: inline-block;
}

.ui-calendar-calendar {
width: 100%;
border-collapse: collapse;
}

.ui-calendar-calendar th, .ui-calendar-calendar td {
text-align: center;
color: #000;
font-weight: normal;
}
.ui-calendar-calendar td {
border-top: 1px solid #CCCCCC;
width: 14.3%;
padding: 3px 0;
}
.ui-calendar-calendar thead tr {
border: 1px solid #fff;
}

.ui-calendar-calendar thead th {
background-color: #F8F8F8;
}

.ui-calendar-calendar a {
text-decoration: none;
color:#000;
display: block;
}

.ui-calendar-gap {
display: none;
}
.ui-calendar-calendar tr.ui-calendar-gap td {
line-height: 5px;
font-size: 0;
border: none;
background: transparent;
}

.ui-calendar-calendar td.ui-calendar-unSelectable {
color: #e1e1e1;
}

.ui-calendar-calendar td.ui-calendar-today a {
color: #FB0000;
}
.ui-calendar-calendar td.ui-calendar-current-day {
font-weight: bold;
}
.ui-calendar-calendar td.ui-calendar-current-day a {
background-color: #0079FF;
color: #FFF;
border-radius: 12px;
display: inline-block;
width: 24px;
}

.ui-calendar-calendar td.ui-state-hover {
background: #ccc;
}

.ui-slideup .header {
line-height: 43px;
height: 43px;
opacity: 0.9;
background-color: #F8F8F8;
overflow: hidden;
}
.ui-slideup .ok-btn, .ui-slideup .no-btn {
position: absolute;
top: 7px;
height: 25px;
line-height: 25px;
padding: 0 10px;
font-size: 12px;
font-weight: bold;
background-color: #0079FF;
color: #FFF;
display: block;
border-radius: 5px;
}
.ui-slideup .ok-btn {
right: 7px;
float: right;

}
.ui-slideup .no-btn {
left: 7px;
float: left;
background-color: #FFF;
border: 1px solid #0079FF;
color: #0079FF;
}
.ui-slideup .ok-btn.ui-state-hover, .ui-slideup .no-btn.ui-state-hover{
opacity: 0.4;
}
.ui-slideup .frame {
background: #FFF;
}

83 changes: 83 additions & 0 deletions assets/widget/dialog/dialog.iOS7.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
.ui-dialog{
background: #f5f5f5;
-webkit-border-radius: 7px;
}

.ui-dialog .ui-dialog-title {
height: 50px;
line-height: 50px;
font-size: 16px;
text-align: center;
font-weight: 700;
-webkit-border-radius: 3px 3px 0 0;
}

.ui-dialog .ui-dialog-close{
cursor: pointer;
border-width: 0;
display: inline-block;
padding: 7px 9px;
margin: 2px;
line-height: 1;
-webkit-border-radius: 3px;
}

.ui-dialog .ui-dialog-close .ui-icon {
background-image: url("../../icons-36-white.png");
}

.ui-dialog .ui-dialog-close-hover {
background-color: rgba(255, 255, 255, 0.4);
}

.ui-dialog .ui-dialog-content{
padding: 10px;
position: relative;
}

.ui-dialog-btns {
table-layout: fixed;
display: table;
border-collapse: collapse;
margin: 19px 0 0 0;
width: 100%;
}
.ui-dialog-btns .ui-btn {
padding: 0;
font-size: 18px;
width: 100%;
display: table-cell;
float: none;
text-align: center;
height: 44px;
line-height: 44px;
color: #0079FF;
border: 1px solid #B1B1B1;
background-color: #f7f7f7;
border-bottom: 0 none;
cursor: pointer;
}

.ui-dialog-btns .ui-btn:first-child {
-webkit-border-bottom-left-radius: 3px;
border-left: 0 none;
}

.ui-dialog-btns .ui-btn:last-child {
-webkit-border-bottom-right-radius: 3px;
border-right: 0 none;
}

.ui-dialog-btns .ui-btn.ui-state-hover {
background-color: #e2e2e2;
}

/*css for pad*/
@media all and (min-device-width:768px) and (max-device-width: 1024px){
.ui-dialog{
min-width: 500px;
}
.ui-dialog .ui-dialog-title{
min-height: 1.1em;
}
}
6 changes: 2 additions & 4 deletions assets/widget/navigator/navigator.default.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@
display: inline-block;/*重要,靠他让宽度由子节点撑开*/
}
.ui-scroller .ui-navigator-list {
display: block;
display: table;
white-space:nowrap;/*内容不换行*/
display: inline-block;
width: auto;
}
.ui-scroller .ui-navigator-list:after {
Expand All @@ -51,6 +50,5 @@
overflow: hidden;
}
.ui-scroller .ui-navigator-list li {
display: inline-block;
float: left;
display: table-cell;
}
38 changes: 1 addition & 37 deletions assets/widget/progressbar/progressbar.css
Original file line number Diff line number Diff line change
@@ -1,73 +1,39 @@

.ui-progressbar-bg {
background: #5e5e5e;
border-radius: 5px;
position: relative;
-webkit-user-select:none;
}
.ui-progressbar-filled {
position: absolute;
border-radius: 5px;
background: #2a94d9;
-webkit-transform: translate3d(0, 0, 0);
-webkit-transition-duration: 0ms;
-webkit-user-select:none;
pointer-events:none;
}
.ui-progressbar-button {
position: absolute;
height: 30px;
width:30px;
border-radius: 15px;
-webkit-transform: translate3d(0, 0, 0);
-webkit-transition-duration: 0ms;
-webkit-user-select:none;
}
.ui-progressbar-button div {
height: 18px;
width: 18px;
background: #efefef;
border-radius: 9px;
margin: 6px;
box-shadow:0 0 8px rgba(255, 255, 255, 0.4);
}
.ui-progressbar-button div b {
position: relative;
display: block;
width:8px;
height: 8px;
left:5px;
top:5px;
border-radius: 4px;
background: #64aef7;
}
.ui-progressbar-button-pressed div b{
background: #036bd1;
}

/* 横向样式 */
.ui-progressbar-h .ui-progressbar-bg {
height: 5px;
border: 1px solid #111;
border-bottom: 1px solid #3d3d3d;
}
.ui-progressbar-h .ui-progressbar-filled {
width:0;
height: 100%;
}
.ui-progressbar-h .ui-progressbar-button {
top:-12px;
margin-left: -15px;
}


/* 竖向样式 */

.ui-progressbar-v .ui-progressbar-bg {
height:100%;
width: 5px;
border: 1px solid #111;
margin-top: -1px;
border-left: 1px solid #3d3d3d;
}
.ui-progressbar-v .ui-progressbar-filled {
top: 100%;
Expand All @@ -76,6 +42,4 @@
}
.ui-progressbar-v .ui-progressbar-button {
top: 100%;
margin-top: -15px;
margin-left:-13px;
}
Loading