css structure combine

This commit is contained in:
Adam Bradley
2013-09-10 13:49:08 -05:00
parent 8ba2411eb0
commit 292ff90193
38 changed files with 341 additions and 2353 deletions

2
.gitignore vendored
View File

@@ -9,3 +9,5 @@ framework.sublime-project
framework.sublime-workspace
UserInterfaceState.xcuserstate
dist/*

1912
dist/ionic.css vendored
View File

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,7 @@
// Brand Colors
// -------------------------------
$brand-primary: #428bca;
$brand-success: #5cb85c;
$brand-warning: #f0ad4e;
@@ -10,6 +11,7 @@ $brand-info: #5bc0de;
// Global Gray Colors
// -------------------------------
$black: #000 !default;
$gray-darker: lighten(#000, 13.5%) !default; // #222
$gray-dark: lighten(#000, 20%) !default; // #333
@@ -21,6 +23,7 @@ $white: #fff !default;
// Global Accent Colors
// -------------------------------
$blue: #049cdb !default;
$blue-dark: #0064cd !default;
$green: #46a546 !default;
@@ -35,6 +38,7 @@ $component-active-bg: $brand-primary !default;
// Global Fonts
// -------------------------------
$sans-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$light-sans-font-family: "Helvetica Neue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$serif-font-family: Georgia, "Times New Roman", Times, serif !default;
@@ -43,19 +47,75 @@ $mono-font-family: Monaco, Menlo, Consolas, "Courier New", monospace !de
// Base
// -------------------------------
$base-font-family: $sans-font-family;
$base-background-color: $white;
$content-padding: 10px;
$inset-margin: 10px;
$border-radius-base: 4px !default;
$border-radius-large: 6px !default;
$border-radius-small: 3px !default;
// Typography
// -------------------------------
$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$font-family-serif: Georgia, "Times New Roman", Times, serif !default;
$font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace !default;
$font-family-base: $font-family-sans-serif !default;
$font-size-base: 14px !default;
$font-size-large: ceil($font-size-base * 1.25) !default; // ~18px
$font-size-small: ceil($font-size-base * 0.85) !default; // ~12px
$line-height-base: 1.428571429 !default; // 20/14
$line-height-computed: floor($font-size-base * $line-height-base) !default; // ~20px
$headings-font-family: $font-family-base !default;
$headings-font-weight: 500 !default;
$headings-line-height: 1.1 !default;
// Components
// -------------------------------
// Based on 14px font-size and 1.428 line-height (~20px to start)
$padding-base-vertical: 6px !default;
$padding-base-horizontal: 12px !default;
$padding-large-vertical: 10px !default;
$padding-large-horizontal: 16px !default;
$padding-small-vertical: 5px !default;
$padding-small-horizontal: 10px !default;
$line-height-large: 1.33 !default;
$line-height-small: 1.5 !default;
$border-radius-base: 4px !default;
$border-radius-large: 6px !default;
$border-radius-small: 3px !default;
$caret-width-base: 4px !default;
$caret-width-large: 5px !default;
// Forms
// -------------------------------
$input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
$input-height-large: (floor($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
$input-bg: $white !default;
$input-bg-disabled: $gray-lighter !default;
$input-color: $gray !default;
$input-border-color: #ccc !default;
$input-border-width: 1px !default;
$input-border-radius: $border-radius-base !default;
$input-border-radius: 2px !default;
$input-border-focus: #66afe9 !default;
$input-color-placeholder: $gray-light !default;
@@ -67,9 +127,11 @@ $input-group-addon-bg: $gray-lighter !default;
$input-group-addon-border-color: $input-border-color !default;
// Buttons
// -------------------------------
$button-bar-button-line-height: 15px !default;
$button-color: #222;
$button-padding: 12px 12px;
$button-clear-padding: 10px 0px;
@@ -115,6 +177,14 @@ $button-dark-border: #111;
// Bars
// -------------------------------
$bar-height: 44px !default;
$bar-button-line-height: 23px !default;
$bar-button-bar-line-height: 18px !default;
$bar-title-font-size: $font-size-large;
$bar-padding-portrait: 5px;
$bar-padding-landscape: 5px;
$bar-bg: #fff;
// Bar variations
@@ -145,12 +215,15 @@ $bar-dark-border-color: #111;
// Lists
// -------------------------------
$list-divider-bg: #f5f5f5;
$list-divider-color: #222;
$list-item-border: 1px solid #ddd;
// Form States and Alerts
// -------------------------------
$warning-text: #c09853;
$warning-bg: #fcf8e3;
$warning-border: darken(adjust-hue($warning-bg, -10), 3%);
@@ -168,7 +241,61 @@ $info-bg: #d9edf7;
$info-border: darken(adjust-hue($info-bg, -10), 7%);
// Side Menu
// Menus
// -------------------------------
$menu-bg: #eee;
$menu-inset-border-color: #bbb;
$menu-width: 270px;
$menu-animation-speed: 200ms;
// Media queries breakpoints
// -------------------------------
// Extra small screen / phone
$screen-xs: 480px !default;
$screen-phone: $screen-xs !default;
// Small screen / tablet
$screen-sm: 768px !default;
$screen-tablet: $screen-sm !default;
// Medium screen / desktop
$screen-md: 992px !default;
$screen-desktop: $screen-md !default;
// Large screen / wide desktop
$screen-lg: 1200px !default;
$screen-lg-desktop: $screen-lg !default;
// So media queries don't overlap when required, provide a maximum
$screen-xs-max: ($screen-sm - 1) !default;
$screen-sm-max: ($screen-md - 1) !default;
$screen-md-max: ($screen-lg - 1) !default;
// Grid system
// -------------------------------
// Number of columns in the grid system
$grid-columns: 12 !default;
// Padding, to be divided by two and applied to the left and right of all columns
$grid-gutter-width: 30px !default;
// Point at which the navbar stops collapsing
$grid-float-breakpoint: $screen-tablet !default;
// Container sizes
// -------------------------------
// Small screen / tablet
$container-tablet: ((720px + $grid-gutter-width)) !default;
// Medium screen / desktop
$container-desktop: ((940px + $grid-gutter-width)) !default;
// Large screen / wide desktop
$container-lg-desktop: ((1140px + $grid-gutter-width)) !default;

View File

@@ -1,26 +0,0 @@
@charset "UTF-8";
// Component Structures
@import
"ionic/structure-variables",
"ionic/mixins",
"ionic/theme-variables",
"ionic/structure/normalize",
"ionic/structure/base",
"ionic/structure/alerts",
"ionic/structure/bar",
"ionic/structure/button",
"ionic/structure/button-group",
"ionic/structure/card",
"ionic/structure/form",
"ionic/structure/grid",
"ionic/structure/icon",
"ionic/structure/img",
"ionic/structure/listview",
"ionic/structure/menu",
"ionic/structure/pull-to-refresh",
"ionic/structure/table",
"ionic/structure/tabs";

View File

@@ -1,21 +0,0 @@
@charset "UTF-8";
// Component Themes
@import
"ionic/structure-variables",
"ionic/mixins",
"ionic/theme-variables",
"ionic/theme/base",
"ionic/theme/alerts",
"ionic/theme/bar",
"ionic/theme/button",
"ionic/theme/card",
"ionic/theme/icon",
"ionic/theme/listview",
"ionic/theme/menu",
"ionic/theme/pull-to-refresh",
"ionic/theme/table",
"ionic/theme/tabs";

View File

@@ -1,2 +1,33 @@
@import "ionic-structure";
@import "ionic-theme";
@charset "UTF-8";
@import
// Variables
"mixins",
"variables",
// Base
"ionic/normalize",
"ionic/base",
"ionic/grid",
// Nav
"ionic/bar",
"ionic/tabs",
"ionic/menu",
"ionic/listview",
// Buttons
"ionic/button",
"ionic/button-group",
// Icons
"ionic/icon",
// Components
"ionic/alerts",
"ionic/card",
"ionic/form",
"ionic/table",
// Animations
"ionic/animations";

View File

@@ -1,12 +1,9 @@
//
// Alerts
// --------------------------------------------------
// Base styles
// -------------------------
.alert {
padding: 8px 35px 8px 14px;
margin-bottom: $line-height-base;
text-shadow: 0 1px 0 rgba(255,255,255,.5);
background-color: $warning-bg;
@@ -16,11 +13,27 @@
.alert h4 {
// Specified for the h4 to prevent conflicts of changing $headingsColor
color: $warning-text;
margin: 0;
}
.alert .close {
position: relative;
top: -2px;
right: -21px;
line-height: $line-height-base;
}
// Alternate styles
// -------------------------
.alert-block {
padding-top: 14px;
padding-bottom: 14px;
}
.alert-block > p,
.alert-block > ul {
margin-bottom: 0;
}
.alert-block p + p {
margin-top: 5px;
}
.alert-success {
background-color: $success-bg;

View File

@@ -1,4 +1,18 @@
.bar {
@include user-select(none);
display: -webkit-box;
display: box;
position: fixed;
left: 0;
right: 0;
z-index: 10;
width: 100%;
height: $bar-height;
padding: $bar-padding-portrait;
box-sizing: border-box;
background-color: $bar-bg;
border-style: solid;
border-width: 0;
@@ -83,6 +97,61 @@
//@media screen and (orientation : landscape) {
//padding: $barPaddingLandscape;
//}
// Title inside of a bar is centered
.title {
position: absolute;
z-index: 0;
top: 0;
left: 0;
right: 0;
line-height: $bar-height;
margin: 0;
//padding: $barPaddingVertical 0px;
min-width: 30px;
// Go into ellipsis if too small
text-overflow: ellipsis;
text-align: center;
white-space: nowrap;
font-size: $bar-title-font-size;
}
.title a {
color: inherit;
}
.button {
@include box-flex(0);
background-color: transparent;
line-height: $bar-button-line-height;
font-size: 12px;
padding: 4px 12px;
}
.button-bar {
line-height: $bar-button-bar-line-height;
}
.button-bar + .button, .button + .button-bar {
margin-left: 5px;
}
// Place the last button in a bar on the right of the bar
.title + .button:last-child,
> .button + .button:last-child,
> .button.pull-right,
.title + .buttons {
position: absolute;
top: 5px;
right: 5px;
}
}
// Default styles for buttons inside of styled bars
@@ -135,3 +204,35 @@
background-color: transparent;
border: 1px solid transparent;
}
// Header at top
.bar-header {
top: 0;
}
// Footer at bottom
.bar-footer {
bottom: 0;
}
// Don't render padding if the bar is just for tabs
.bar-tabs {
padding: 0;
}
.bar-header-secondary {
top: $bar-height;
}
.bar-footer-secondary {
bottom: $bar-height;
}
/* Pad top/bottom of content so it doesn't hide behind .bar-title and .bar-tab.
Note: For these to work, content must come after both bars in the markup */
.has-header {
top: $bar-height;
}
.has-footer {
bottom: $bar-height;
}

View File

@@ -7,6 +7,10 @@ html {
}
body {
font-size: 14px;
line-height: 1.25;
font-family: $base-font-family;
position: fixed;
top: 0;
right: 0;

View File

@@ -5,6 +5,24 @@
border-style: solid;
padding: $button-padding;
font-size: $button-font-size;
position: relative;
display: inline-block;
vertical-align: middle;
text-align: center;
cursor: pointer;
margin: 0;
&.button-icon {
background: none;
border: none;
}
&.button-block {
margin: $button-block-margin;
display: block;
width: 100%;
}
&.button-default {
@include button-style($button-default-bg, $buttonDefaultBorder, $gray-dark);

View File

@@ -63,13 +63,9 @@
// Linked list items
a.list-item {
//color: $list-group-link-color;
color: $gray-dark;
text-decoration: none;
.list-item-heading {
//color: $list-group-link-heading-color;
}
// Hover state
&:hover,
&:focus {
@@ -79,6 +75,9 @@ a.list-item {
}
.list-divider {
background-color: $list-divider-bg;
color: $list-divider-color;
font-weight: bold;
padding: 5px 15px;
}

View File

@@ -27,3 +27,15 @@
-moz-transition: -moz-transform $menu-animation-speed ease;
transition: transform $menu-animation-speed ease;
}
.ion-panel {
background: $menu-bg;
}
.ion-panel-left .ion-panel {
border-right: 1px solid $menu-inset-border-color;
}
.ion-panel-right .ion-panel {
border-left: 1px solid $menu-inset-border-color;
}

View File

@@ -1,133 +0,0 @@
// Components
// -------------------------
// Based on 14px font-size and 1.428 line-height (~20px to start)
$padding-base-vertical: 6px !default;
$padding-base-horizontal: 12px !default;
$padding-large-vertical: 10px !default;
$padding-large-horizontal: 16px !default;
$padding-small-vertical: 5px !default;
$padding-small-horizontal: 10px !default;
$line-height-large: 1.33 !default;
$line-height-small: 1.5 !default;
$border-radius-base: 4px !default;
$border-radius-large: 6px !default;
$border-radius-small: 3px !default;
$caret-width-base: 4px !default;
$caret-width-large: 5px !default;
// Typography
// -------------------------
$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$font-family-serif: Georgia, "Times New Roman", Times, serif !default;
$font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace !default;
$font-family-base: $font-family-sans-serif !default;
$font-size-base: 14px !default;
$font-size-large: ceil($font-size-base * 1.25) !default; // ~18px
$font-size-small: ceil($font-size-base * 0.85) !default; // ~12px
$line-height-base: 1.428571429 !default; // 20/14
$line-height-computed: floor($font-size-base * $line-height-base) !default; // ~20px
$headings-font-family: $font-family-base !default;
$headings-font-weight: 500 !default;
$headings-line-height: 1.1 !default;
// Content stuff
// -------------------------------
$content-padding: 10px;
$inset-margin: 10px;
$border-radius-base: 4px !default;
$border-radius-large: 6px !default;
$border-radius-small: 3px !default;
// Bar stuff
// -------------------------------
$bar-height: 44px !default;
$bar-button-line-height: 23px !default;
$bar-button-bar-line-height: 18px !default;
$bar-title-font-size: $font-size-large;
$bar-padding-portrait: 5px;
$bar-padding-landscape: 5px;
// Button bar stuff
// -------------------------------
$button-bar-button-line-height: 15px !default;
// Forms
// -------------------------------
$input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
$input-height-large: (floor($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
// Lists
// -------------------------------
$list-item-border: 1px solid #ddd;
// Menus
// -------------------------------
$menu-width: 270px;
$menu-animation-speed: 200ms;
// Media queries breakpoints
// -------------------------------
// Extra small screen / phone
$screen-xs: 480px !default;
$screen-phone: $screen-xs !default;
// Small screen / tablet
$screen-sm: 768px !default;
$screen-tablet: $screen-sm !default;
// Medium screen / desktop
$screen-md: 992px !default;
$screen-desktop: $screen-md !default;
// Large screen / wide desktop
$screen-lg: 1200px !default;
$screen-lg-desktop: $screen-lg !default;
// So media queries don't overlap when required, provide a maximum
$screen-xs-max: ($screen-sm - 1) !default;
$screen-sm-max: ($screen-md - 1) !default;
$screen-md-max: ($screen-lg - 1) !default;
// Grid system
// -------------------------------
// Number of columns in the grid system
$grid-columns: 12 !default;
// Padding, to be divided by two and applied to the left and right of all columns
$grid-gutter-width: 30px !default;
// Point at which the navbar stops collapsing
$grid-float-breakpoint: $screen-tablet !default;
// Container sizes
// -------------------------------
// Small screen / tablet
$container-tablet: ((720px + $grid-gutter-width)) !default;
// Medium screen / desktop
$container-desktop: ((940px + $grid-gutter-width)) !default;
// Large screen / wide desktop
$container-lg-desktop: ((1140px + $grid-gutter-width)) !default;

View File

@@ -4,6 +4,23 @@
* A navigation bar with any number of tab items supported.
*/
.tabs {
font-size: 16px;
}
.tab-item {
a {
font-family: $light-sans-font-family;
font-weight: 200;
.active, &:active {
//box-shadow: inset 0 0 10px rgba(0, 0, 0, .12);
}
}
i {
font-size: 25px;
}
}
.tabs-inner {
display: -webkit-box;
display: box;

View File

@@ -1,38 +0,0 @@
//
// Alerts
// --------------------------------------------------
// Base styles
// -------------------------
.alert {
padding: 8px 35px 8px 14px;
}
.alert h4 {
margin: 0;
}
// Adjust close link position
.alert .close {
position: relative;
top: -2px;
right: -21px;
line-height: $line-height-base;
}
// Block alerts
// -------------------------
.alert-block {
padding-top: 14px;
padding-bottom: 14px;
}
.alert-block > p,
.alert-block > ul {
margin-bottom: 0;
}
.alert-block p + p {
margin-top: 5px;
}

View File

@@ -1,109 +0,0 @@
// Use Flexbox for our header and footer bars
.bar {
@include user-select(none);
display: -webkit-box;
display: box;
position: fixed;
left: 0;
right: 0;
z-index: 10;
width: 100%;
height: $bar-height;
padding: $bar-padding-portrait;
box-sizing: border-box;
// Title inside of a bar is centered
.title {
position: absolute;
z-index: 0;
top: 0;
left: 0;
right: 0;
line-height: $bar-height;
margin: 0;
//padding: $barPaddingVertical 0px;
min-width: 30px;
// Go into ellipsis if too small
text-overflow: ellipsis;
text-align: center;
white-space: nowrap;
font-size: $bar-title-font-size;
}
.title a {
color: inherit;
}
.button {
@include box-flex(0);
background-color: transparent;
line-height: $bar-button-line-height;
font-size: 12px;
padding: 4px 12px;
}
.button-bar {
line-height: $bar-button-bar-line-height;
}
.button-bar + .button, .button + .button-bar {
margin-left: 5px;
}
// Place the last button in a bar on the right of the bar
.title + .button:last-child,
> .button + .button:last-child,
> .button.pull-right,
.title + .buttons {
position: absolute;
top: 5px;
right: 5px;
}
}
// Header at top
.bar-header {
top: 0;
}
// Footer at bottom
.bar-footer {
bottom: 0;
}
// Don't render padding if the bar is just for tabs
.bar-tabs {
padding: 0;
}
.bar-header-secondary {
top: $bar-height;
}
.bar-footer-secondary {
bottom: $bar-height;
}
/* Pad top/bottom of content so it doesn't hide behind .bar-title and .bar-tab.
Note: For these to work, content must come after both bars in the markup */
.has-header {
top: $bar-height;
}
.has-footer {
bottom: $bar-height;
}

View File

@@ -1,19 +0,0 @@
.button {
position: relative;
display: inline-block;
vertical-align: middle;
text-align: center;
cursor: pointer;
margin: 0;
&.button-icon {
background: none;
border: none;
}
&.button-block {
margin: $button-block-margin;
display: block;
width: 100%;
}
}

View File

View File

View File

@@ -1,22 +0,0 @@
.ptr-capable {
-webkit-user-drag: element;
}
.ptr-content {
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
overflow: auto;
height: 0;
}
.ptr-content .pulling {
display: none;
}
.ptr-content .refreshing {
display: none;
}

View File

@@ -1,14 +0,0 @@
body {
font-size: 14px;
line-height: 1.25;
font-family: $base-font-family;
}
main {
background-color: $base-background-color;
}
.full-section {
@include box-shadow(#{-3px 0px 10px rgba(0,0,0,0.2), 3px 0px 10px rgba(0,0,0,0.2)});
}

View File

View File

View File

View File

@@ -1,9 +0,0 @@
.list-divider {
background-color: $list-divider-bg;
color: $list-divider-color;
font-weight: bold;
}
a.list-item {
color: $gray-dark;
}

View File

@@ -1,12 +0,0 @@
.ion-panel {
background: $menu-bg;
}
.ion-panel-left .ion-panel {
border-right: 1px solid $menu-inset-border-color;
}
.ion-panel-right .ion-panel {
border-left: 1px solid $menu-inset-border-color;
}

View File

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

View File

View File

@@ -1,17 +0,0 @@
.tabs {
font-size: 16px;
}
.tab-item {
a {
font-family: $light-sans-font-family;
font-weight: 200;
.active, &:active {
//box-shadow: inset 0 0 10px rgba(0, 0, 0, .12);
}
}
i {
font-size: 25px;
}
}