Skip to content

Commit

Permalink
5.0.0-beta.3 release
Browse files Browse the repository at this point in the history
  • Loading branch information
nolimits4web committed Aug 6, 2019
1 parent edb7938 commit bd3d33a
Show file tree
Hide file tree
Showing 170 changed files with 3,267 additions and 3,170 deletions.
4 changes: 2 additions & 2 deletions kitchen-sink/core/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta name="theme-color" content="#2196f3">
<meta http-equiv="Content-Security-Policy" content="default-src * 'self' 'unsafe-inline' 'unsafe-eval' data: gap:">
<title>Framework7</title>
<link rel="stylesheet" href="../../build/core/css/framework7.bundle.css">
<link rel="stylesheet" href="../../packages/core/css/framework7.bundle.min.css">
<link rel="stylesheet" href="css/app.css">
<link rel="apple-touch-icon" href="img/f7-icon-square.png">
<link rel="icon" href="img/f7-icon.png">
Expand Down Expand Up @@ -683,7 +683,7 @@
</div>
</div>
</div>
<script src="../../build/core/js/framework7.bundle.js"></script>
<script src="../../packages/core/js/framework7.bundle.min.js"></script>
<script src="js/routes.js"></script>
<script src="js/app.js"></script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion packages/core/components/actions.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/core/components/actions.rtl.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/core/components/actions/actions-aurora.less
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.aurora {
.actions-button-media {
margin-left: 15px;
margin-left: 16px;
+ .actions-button-text {
text-align: left;
margin-left: 15px;
margin-left: 16px;
}
}
}
4 changes: 2 additions & 2 deletions packages/core/components/actions/actions-ios.less
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.ios {
.actions-button-media {
margin-left: 15px;
margin-left: 16px;
+ .actions-button-text {
text-align: left;
margin-left: 15px;
margin-left: 16px;
}
}
}
23 changes: 19 additions & 4 deletions packages/core/components/actions/actions-vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,16 @@
--f7-actions-label-text-color: rgba(0,0,0,0.54);
--f7-actions-label-font-size: 16px;
--f7-actions-label-justify-content: flex-start;
--f7-actions-group-border-color: #d2d2d6;
--f7-actions-group-border-color: rgba(0,0,0,0.12);
--f7-actions-group-margin: 0px;
--f7-actions-grid-button-icon-size: 48px;
.theme-dark, &.theme-dark {
--f7-actions-bg-color: #202020;
--f7-actions-button-text-color: #fff;
--f7-actions-button-pressed-bg-color: #2e2e2e;
--f7-actions-label-text-color:rgba(255,255,255,0.55);
--f7-actions-group-border-color: rgba(255,255,255,0.15);
}
});
.aurora-vars({
--f7-actions-bg-color: #fff;
Expand All @@ -63,18 +70,26 @@
--f7-actions-button-text-color: var(--f7-theme-color);
*/
--f7-actions-button-pressed-bg-color: #e5e5e5;
--f7-actions-button-padding: 0 15px;
--f7-actions-button-padding: 0 16px;
--f7-actions-button-text-align: center;
--f7-actions-button-height: 32px;
--f7-actions-button-height-landscape: 32px;
--f7-actions-button-font-size: 14px;
--f7-actions-button-icon-size: 18px;
--f7-actions-button-justify-content: space-between;
--f7-actions-label-padding: 10px 15px;
--f7-actions-label-padding: 10px 16px;
--f7-actions-label-text-color: rgba(0,0,0,0.5);
--f7-actions-label-font-size: 12px;
--f7-actions-label-justify-content: center;
--f7-actions-group-border-color: rgba(0,0,0,0.1);
--f7-actions-group-margin: 15px;
--f7-actions-group-margin: 16px;
--f7-actions-grid-button-icon-size: 32px;
.theme-dark, &.theme-dark {
--f7-actions-bg-color: #202020;
--f7-actions-button-text-color: #fff;
--f7-actions-button-border-color: rgba(255, 255, 255, 0.15);
--f7-actions-button-pressed-bg-color: #2e2e2e;
--f7-actions-label-text-color:rgba(255,255,255,0.55);
--f7-actions-group-border-color: rgba(255,255,255,0.15);
}
});
6 changes: 3 additions & 3 deletions packages/core/components/actions/actions.less
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
overflow: hidden;
text-align: var(--f7-actions-button-text-align);
background: var(--f7-actions-bg-color);
.translucent(var(--f7-actions-bg-color-rgb));
.ios-translucent-modals(var(--f7-actions-bg-color-rgb));
.hairline(bottom, var(--f7-actions-button-border-color));
&:first-child {
border-radius: var(--f7-actions-border-radius) var(--f7-actions-border-radius) 0 0;
Expand Down Expand Up @@ -97,7 +97,7 @@
}
}
.actions-button.active-state {
.translucent(var(--f7-actions-button-pressed-bg-color-rgb));
.ios-translucent-modals(var(--f7-actions-button-pressed-bg-color-rgb));
}

.actions-button-media {
Expand Down Expand Up @@ -189,7 +189,7 @@
}
}
.actions-grid .actions-group {
.translucent(var(--f7-actions-bg-color-rgb));
.ios-translucent-modals(var(--f7-actions-bg-color-rgb));
}
.if-ios-theme({
@import url('./actions-ios.less');
Expand Down
10 changes: 7 additions & 3 deletions packages/core/components/app/app-class.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ class Framework7 extends Framework7Class {
initOnDeviceReady: true,
init: true,
autoDarkTheme: false,
iosTranslucent: true,
iosTranslucentBars: true,
iosTranslucentModals: true,
};

// Extend defaults with modules params
Expand Down Expand Up @@ -187,8 +188,11 @@ class Framework7 extends Framework7Class {
$('html').removeClass('ios md aurora').addClass(app.theme);

// iOS Translucent
if (app.theme === 'ios' && app.params.iosTranslucent) {
$('html').addClass('ios-translucent');
if (app.theme === 'ios' && app.params.iosTranslucentBars) {
$('html').addClass('ios-translucent-bars');
}
if (app.theme === 'ios' && app.params.iosTranslucentModals) {
$('html').addClass('ios-translucent-modals');
}

// Init class
Expand Down
8 changes: 6 additions & 2 deletions packages/core/components/app/app-vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@
--f7-bars-bg-image: none;
--f7-bars-bg-color: #f7f7f8;
--f7-bars-bg-color-rgb: 247, 247, 248;
--f7-bars-translucent-opacity: 0.8;
--f7-bars-translucent-blur: 20px;
--f7-bars-text-color: #000;
--f7-bars-shadow-bottom-image: linear-gradient(to bottom,
rgba(0,0,0,0.25) 0%,
Expand All @@ -123,8 +125,6 @@
);
}
.theme-dark {
--f7-bars-bg-color: #1b1b1b;
--f7-bars-bg-color-rgb: 27, 27, 27;
--f7-bars-text-color: #fff;
}
.ios-vars({
Expand All @@ -137,10 +137,14 @@
});
.md-vars({
--f7-bars-border-color: transparent;
.theme-dark, &.theme-dark {
--f7-bars-bg-color: #202020;
}
});
.aurora-vars({
--f7-bars-border-color: rgba(0,0,0,0.2);
.theme-dark, &.theme-dark {
--f7-bars-bg-color: #202020;
--f7-bars-border-color: rgba(255, 255, 255, 0.1);
}
});
Expand Down
2 changes: 1 addition & 1 deletion packages/core/components/appbar.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/core/components/appbar.rtl.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/core/components/appbar/appbar-vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
});
.aurora-vars({
--f7-appbar-height: 38px;
--f7-appbar-inner-padding-left: 15px;
--f7-appbar-inner-padding-right: 15px;
--f7-appbar-inner-padding-left: 16px;
--f7-appbar-inner-padding-right: 16px;
});
2 changes: 1 addition & 1 deletion packages/core/components/appbar/appbar.less
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
color: var(--f7-appbar-text-color, var(--f7-bars-text-color));
font-size: var(--f7-appbar-font-size);
z-index: 7000;
.translucent(var(--f7-appbar-bg-color-rgb, var(--f7-bars-bg-color-rgb)));
.ios-translucent-bars(var(--f7-appbar-bg-color-rgb, var(--f7-bars-bg-color-rgb)));
.panel ~ .appbar {
z-index: 5500;
}
Expand Down
Loading

0 comments on commit bd3d33a

Please sign in to comment.