Skip to content

Property order #534

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Apr 1, 2014
Merged

Property order #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff3025d
fixing prop order on android theme
Apr 1, 2014
9e94148
fixing prop order on ios theme
Apr 1, 2014
d3e98c2
fixing prop order in the lib scss
Apr 1, 2014
230b3d1
updating the docs order
Apr 1, 2014
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
10 changes: 5 additions & 5 deletions sass/bars.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
height: $bar-base-height;
padding-right: $bar-side-spacing;
padding-left: $bar-side-spacing;
border-bottom: $border-default;
background-color: $chrome-color;
border-bottom: $border-default;
}

// Modifier class to dock any bar below .bar-nav
Expand All @@ -38,8 +38,8 @@
.bar-footer,
.bar-footer-secondary,
.bar-footer-secondary-tab {
border-bottom: 0;
border-top: $border-default;
border-bottom: 0;
}


Expand Down Expand Up @@ -83,18 +83,18 @@
width: 100%;
height: $bar-tab-height;
padding: 0;
table-layout: fixed;
border-top: $border-default;
border-bottom: 0;
table-layout: fixed;

// Navigational tab (Nested to be more specific for the icons in tab-items)
.tab-item {
display: table-cell;
width: 1%;
height: $bar-tab-height;
vertical-align: middle;
color: #929292;
text-align: center;
vertical-align: middle;

// Active states for the tab bar
&.active,
Expand Down Expand Up @@ -144,8 +144,8 @@
top: 0;
padding: 0;
font-size: 16px;
color: $primary-color;
line-height: $bar-base-height;
color: $primary-color;
border: 0;

&:active,
Expand Down
16 changes: 8 additions & 8 deletions sass/buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
line-height: 1;
color: #333;
text-align: center;
vertical-align: top;
white-space: nowrap;
vertical-align: top;
cursor: pointer;
background-color: $chrome-color;
border: 1px solid #ccc;
Expand All @@ -40,42 +40,42 @@
// Primary button (Default color is blue)
.btn-primary {
color: #fff;
border: 1px solid $primary-color;
background-color: $primary-color;
border: 1px solid $primary-color;

&:active,
&.active {
color: #fff;
border: 1px solid darken($primary-color, 10%);
background-color: darken($primary-color, 10%);
border: 1px solid darken($primary-color, 10%);
}
}

// Positive button (Default color is green)
.btn-positive {
color: #fff;
border: 1px solid $positive-color;
background-color: $positive-color;
border: 1px solid $positive-color;

&:active,
&.active {
color: #fff;
border: 1px solid darken($positive-color, 10%);
background-color: darken($positive-color, 10%);
border: 1px solid darken($positive-color, 10%);
}
}

// Negative button (Default color is red)
.btn-negative {
color: #fff;
border: 1px solid $negative-color;
background-color: $negative-color;
border: 1px solid $negative-color;

&:active,
&.active {
color: #fff;
border: 1px solid darken($negative-color, 10%);
background-color: darken($negative-color, 10%);
border: 1px solid darken($negative-color, 10%);
}
}

Expand Down Expand Up @@ -140,8 +140,8 @@ input[type="button"] {

// Generic styles for all badges within default buttons
.btn .badge {
font-size: 12px;
margin: -2px -4px -2px 4px;
font-size: 12px;
background-color: rgba(0,0,0,.15);
}

Expand Down
6 changes: 3 additions & 3 deletions sass/cards.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// --------------------------------------------------

.card {
overflow: hidden;
margin: $bar-side-spacing;
overflow: hidden;
background-color: $card-bg;
border: $border-default;
border-radius: $border-radius;
Expand All @@ -21,14 +21,14 @@
// Rounding first divider on carded lists and remove border on the top
.table-view-divider:first-child {
top: 0;
border-top-right-radius: $border-radius;
border-top-left-radius: $border-radius;
border-top-right-radius: $border-radius;
}

// Rounding last divider on carded table views
.table-view-divider:last-child {
border-bottom-right-radius: $border-radius;
border-bottom-left-radius: $border-radius;
border-bottom-right-radius: $border-radius;
}
}
// Remove the bottom border from last table cell
Expand Down
Loading