Browse Source

make icons easier to tap

pull/253/head
connors 11 years ago
parent
commit
d4bc4cb990
  1. 10
      dist/android-theme.css
  2. 29
      dist/ratchet.css
  3. 10
      docs-assets/css/docs.css
  4. 32
      lib/sass/bars.scss
  5. 10
      lib/sass/theme-android.scss

10
dist/android-theme.css vendored

@ -183,6 +183,10 @@ a:active {
color: #929292; color: #929292;
background-color: #78c6e3; background-color: #78c6e3;
} }
.bar-tab .tab-item .icon {
top: 3px;
padding: 0;
}
.title { .title {
position: static; position: static;
@ -222,11 +226,13 @@ a:active {
top: 7px; top: 7px;
} }
.bar > .icon { .bar .icon {
top: 13px; padding-top: 13px;
padding-bottom: 13px;
} }
.bar .title .icon-caret { .bar .title .icon-caret {
top: 10px; top: 10px;
padding: 0;
color: #777; color: #777;
} }

29
dist/ratchet.css vendored

@ -541,8 +541,10 @@ input[type="button"] {
color: #428bca; color: #428bca;
} }
.bar-tab .tab-item .icon { .bar-tab .tab-item .icon {
top: 2px;
width: 24px; width: 24px;
height: 24px; height: 24px;
padding: 0;
} }
.bar-tab .tab-item .icon ~ .tab-label { .bar-tab .tab-item .icon ~ .tab-label {
display: block; display: block;
@ -576,23 +578,24 @@ input[type="button"] {
.bar-nav .btn-link:active, .bar-nav .btn-link.active { .bar-nav .btn-link:active, .bar-nav .btn-link.active {
color: #3071a9; color: #3071a9;
} }
.bar-nav .btn-link .icon {
padding-right: 0;
padding-left: 0;
}
.bar-nav .btn-link.pull-left { .bar-nav .btn-link.pull-left {
margin-left: 5px; margin-left: 5px;
} }
.bar-nav .btn-link.pull-left .icon { .bar-nav .btn-link.pull-left .icon {
margin-right: -3px; margin-right: -3px;
margin-left: -8px; margin-left: -10px;
} }
.bar-nav .btn-link.pull-right { .bar-nav .btn-link.pull-right {
margin-right: 5px; margin-right: 5px;
} }
.bar-nav .btn-link.pull-right .icon { .bar-nav .btn-link.pull-right .icon {
margin-right: -8px; margin-right: -10px;
margin-left: -3px; margin-left: -3px;
} }
.bar-nav .btn-link .icon {
top: 2px;
}
.bar .btn-block { .bar .btn-block {
padding: 7px 0 6px; padding: 7px 0 6px;
@ -613,21 +616,23 @@ input[type="button"] {
.bar .icon { .bar .icon {
position: relative; position: relative;
top: 2px; padding: 10px;
z-index: 20; z-index: 20;
font-size: 24px; font-size: 24px;
} }
.bar .icon.pull-left { .bar > .icon {
margin-left: -3px; padding-right: 5px;
padding-left: 5px;
} }
.bar .icon.pull-right { .bar > .icon.pull-left {
margin-right: -3px; margin-left: -10px;
} }
.bar > .icon { .bar > .icon.pull-right {
top: 10px; margin-right: -10px;
} }
.bar .title .icon-caret { .bar .title .icon-caret {
top: 4px; top: 4px;
padding: 0;
margin-left: -5px; margin-left: -5px;
} }

10
docs-assets/css/docs.css

@ -1362,6 +1362,10 @@ hr {
color: #929292; color: #929292;
background-color: #78c6e3; background-color: #78c6e3;
} }
.platform-android .bar-tab .tab-item .icon {
top: 3px;
padding: 0;
}
.platform-android .title { .platform-android .title {
position: static; position: static;
padding-left: 15px; padding-left: 15px;
@ -1396,11 +1400,13 @@ hr {
.platform-android .bar .segmented-control { .platform-android .bar .segmented-control {
top: 7px; top: 7px;
} }
.platform-android .bar > .icon { .platform-android .bar .icon {
top: 13px; padding-top: 13px;
padding-bottom: 13px;
} }
.platform-android .bar .title .icon-caret { .platform-android .bar .title .icon-caret {
top: 10px; top: 10px;
padding: 0;
color: #777; color: #777;
} }
.platform-android .bar input[type="search"] { .platform-android .bar input[type="search"] {

32
lib/sass/bars.scss

@ -104,8 +104,10 @@
// Tab icon // Tab icon
.icon { .icon {
top: 2px;
width: 24px; width: 24px;
height: 24px; height: 24px;
padding: 0;
// Make the label smaller if it's used with an icon // Make the label smaller if it's used with an icon
~ .tab-label { ~ .tab-label {
@ -150,27 +152,28 @@
&.active { &.active {
color: darken($primary-color, 10%); color: darken($primary-color, 10%);
} }
// Make sure link buttons line up with the content correctly
// Make sure link buttons w/ icons line up with the content correctly
.icon {
padding-right: 0;
padding-left: 0;
}
&.pull-left { &.pull-left {
margin-left: 5px; margin-left: 5px;
.icon { .icon {
margin-right: -3px; margin-right: -3px;
margin-left: -8px; margin-left: -10px;
} }
} }
&.pull-right { &.pull-right {
margin-right: 5px; margin-right: 5px;
.icon { .icon {
margin-right: -8px; margin-right: -10px;
margin-left: -3px; margin-left: -3px;
} }
} }
// Position icons in link buttons correctly.
.icon {
top: 2px;
}
} }
@ -212,23 +215,26 @@
.bar { .bar {
.icon { .icon {
position: relative; position: relative;
top: 2px; padding: 10px;
z-index: 20; // Position the buttons on top of .title z-index: 20; // Position the buttons on top of .title
font-size: 24px; font-size: 24px;
}
> .icon {
padding-right: 5px;
padding-left: 5px;
// Offset the bar's side padding
&.pull-left { &.pull-left {
margin-left: -3px; margin-left: -10px;
} }
&.pull-right { &.pull-right {
margin-right: -3px; margin-right: -10px;
}
} }
> .icon {
top: 10px;
} }
// Handle carets in the titles // Handle carets in the titles
.title .icon-caret { .title .icon-caret {
top: 4px; top: 4px;
padding: 0;
margin-left: -5px; margin-left: -5px;
} }
} }

10
lib/sass/theme-android.scss

@ -268,6 +268,10 @@ a {
color: #929292; color: #929292;
background-color: #78c6e3; background-color: #78c6e3;
} }
.icon {
top: 3px;
padding: 0;
}
} }
} }
@ -324,12 +328,14 @@ a {
// Bars with Ratchicons // Bars with Ratchicons
.bar { .bar {
> .icon { .icon {
top: 13px; padding-top: 13px;
padding-bottom: 13px;
} }
// Handle carets in the titles // Handle carets in the titles
.title .icon-caret { .title .icon-caret {
top: 10px; top: 10px;
padding: 0;
color: #777; color: #777;
} }
} }

Loading…
Cancel
Save