javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-06 22:29:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

renamed framework-with-theme.css to framework.css

Browse Source
This commit is contained in:
Adam Bradley
2013-08-26 15:22:38 -05:00
parent fb1cb94de3
commit 7b55036fa7
29 changed files with 86 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -3,4 +3,4 @@
all: release all: release
release: release:
@sass -I scss/ scss/framework-with-default-theme.scss:dist/framework-with-theme.css @sass -I scss/ scss/framework.scss:dist/framework.css

0
dist/framework-theme-default.css vendored
View File

31
dist/framework-with-theme.css → dist/framework.css vendored
View File

@ -32,6 +32,7 @@ body {
right: 0; right: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
margin: 0;
font: 14px/1.25 "Helvetica Neue", sans-serif; } font: 14px/1.25 "Helvetica Neue", sans-serif; }
a { a {
@ -41,6 +42,16 @@ ul {
margin: 0; margin: 0;
padding: 0; } padding: 0; }
body > section {
position: relative;
z-index: 100;
width: 100%;
min-width: 100%;
max-width: 100%;
height: 100%;
min-height: 100%;
max-height: 100%; }
main { main {
position: fixed; position: fixed;
top: 0; top: 0;
@ -60,12 +71,6 @@ main > * {
.content-padded { .content-padded {
padding: 10px; } padding: 10px; }
.hide {
display: none; }
.show {
display: block; }
.ptr-capable { .ptr-capable {
-webkit-user-drag: element; } -webkit-user-drag: element; }
@ -84,15 +89,24 @@ main > * {
.ptr-content .refreshing { .ptr-content .refreshing {
display: none; } display: none; }
/* the page content the panel should move around */
.panel-page-container {
left: 100px; }
/* the container of panel content to show */
.panel-content { .panel-content {
width: 17em; width: 17em;
min-height: 100%; min-height: 100%;
max-height: none; max-height: 100%;
border-width: 0; border-width: 0;
position: absolute; position: absolute;
top: 0; top: 0;
display: block; } display: block; }
.panel-reveal {
z-index: 0;
left: -17em; }
.button { .button {
position: relative; position: relative;
display: block; display: block;
@ -517,3 +531,6 @@ a.list-item {
.ptr-content { .ptr-content {
background: #eee; } background: #eee; }
.panel-content {
background: #eee; }

2
example/alerts.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
</head> </head>
<body> <body>

2
example/angular/index.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
<link rel="stylesheet" href="app.css"> <link rel="stylesheet" href="app.css">
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0rc1/angular.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0rc1/angular.min.js"></script>

2
example/button-groups.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
</head> </head>
<body> <body>

2
example/buttons.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
<link rel="stylesheet" href="app.css"> <link rel="stylesheet" href="app.css">
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0rc1/angular.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0rc1/angular.min.js"></script>

2
example/events.html
View File

@ -5,7 +5,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
<link rel="stylesheet" href="app.css"> <link rel="stylesheet" href="app.css">
<script> <script>
</script> </script>

2
example/footers.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
</head> </head>
<body> <body>

2
example/grids.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
</head> </head>
<body> <body>

2
example/headers.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
</head> </head>
<body> <body>

2
example/image-swipe.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
</head> </head>
<body> <body>

2
example/index.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
<link rel="stylesheet" href="app.css"> <link rel="stylesheet" href="app.css">
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0rc1/angular.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0rc1/angular.min.js"></script>

2
example/input-slider.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
</head> </head>
<body ng-app="peopleApp"> <body ng-app="peopleApp">

2
example/input-text.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
</head> </head>
<body ng-app="peopleApp"> <body ng-app="peopleApp">

2
example/input-toggle.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
</head> </head>
<body ng-app="peopleApp"> <body ng-app="peopleApp">

2
example/lists.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
<link rel="stylesheet" href="app.css"> <link rel="stylesheet" href="app.css">
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0rc1/angular.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0rc1/angular.min.js"></script>

2
example/modals.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
</head> </head>
<body> <body>

9
example/panels.html
View File

@ -6,24 +6,25 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
</head> </head>
<body> <body>
<section> <section class="panel-page-container">
<header class="bar bar-header bar-dark"> <header class="bar bar-header bar-dark">
<h1 class="title">Panels</h1> <h1 class="title">Panels</h1>
</header> </header>
<main class="has-header"> <main class="content-padded has-header">
<p>A whole bunch of content</p> <p>A whole bunch of content</p>
<a class="button button-primary" href="#">Panel</a>
</main> </main>
</section> </section>
<section class="panel-content"> <section class="panel-content panel-reveal">
Panel! Panel!
</section> </section>

2
example/popovers.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
</head> </head>
<body> <body>

2
example/pull-to-refresh.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
</head> </head>
<body> <body>

2
example/tab-bars.html
View File

@ -6,7 +6,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet"> <link href="//netdna.bootstrapcdn.com/font-awesome/3.2.1/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../dist/framework-with-theme.css"> <link rel="stylesheet" href="../../dist/framework.css">
</head> </head>
<body> <body>

1
scss/framework-theme-default.scss → scss/framework-theme.scss
View File

@ -11,4 +11,5 @@
"framework/theme/icon", "framework/theme/icon",
"framework/theme/listview", "framework/theme/listview",
"framework/theme/pull-to-refresh", "framework/theme/pull-to-refresh",
"framework/theme/panel",
"framework/theme/table"; "framework/theme/table";

2
scss/framework-with-default-theme.scss
View File

@ -1,2 +0,0 @@
@import "framework-structure";
@import "framework-theme-default";

2
scss/framework.scss Normal file
View File

@ -0,0 +1,2 @@
@import "framework-structure";
@import "framework-theme";

2
scss/framework/_structure-variables.scss
View File

@ -28,3 +28,5 @@ $barPaddingLandscape : 5px;
// Lists // Lists
$listItemBorder: 1px solid #ddd; $listItemBorder: 1px solid #ddd;
// Panels
$panelViewWidth: 17em;

18
scss/framework/structure/_base.scss
View File

@ -11,6 +11,7 @@ body {
right: 0; right: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
margin: 0;
font: 14px/1.25 "Helvetica Neue", sans-serif; font: 14px/1.25 "Helvetica Neue", sans-serif;
} }
@ -21,6 +22,17 @@ a {
ul { margin: 0; padding: 0; } ul { margin: 0; padding: 0; }
body > section {
position: relative;
z-index: 100;
width: 100%;
min-width: 100%;
max-width: 100%;
height: 100%;
min-height: 100%;
max-height: 100%;
}
main { main {
position: fixed; position: fixed;
top: 0; top: 0;
@ -44,9 +56,3 @@ main > * {
padding: $contentPadding; padding: $contentPadding;
} }
.hide {
display: none;
}
.show {
display: block;
}

20
scss/framework/structure/_panel.scss
View File

@ -1,14 +1,28 @@
/* the page content the panel should move around */
.panel-page-container {
left: 100px;
}
/* the container of panel content to show */
.panel-content { .panel-content {
width: 17em; width: $panelViewWidth;
min-height: 100%; min-height: 100%;
max-height: none; max-height: 100%;
border-width: 0; border-width: 0;
position: absolute; position: absolute;
top: 0; top: 0;
display: block; display: block;
} }
.panel-content { .panel-reveal {
z-index: 0;
left: $panelViewWidth * -1;
}
.panel-reveal-open {
} }

4
scss/framework/theme/_panel.scss Normal file
View File

@ -0,0 +1,4 @@
.panel-content {
background: #eee;
}