playground
/
ratchet
mirror of https://github.com/twbs/ratchet.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

icon top

pull/253/head
connors 11 years ago
parent
747d92e6dd
commit
2fa386bee9
6 changed files with 48 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      dist/android-theme.css
  2. 7
      dist/ratchet.css
  3. 7
      docs-assets/css/docs.css
  4. 40
      examples/app-default/choose-theater.html
  5. 8
      lib/sass/bars.scss
  6. 8
      lib/sass/theme-android.scss

7
dist/android-theme.css vendored
Unescape View File

@ -179,7 +179,7 @@ a:active {
color: #33b5e5; color: #33b5e5;
} }
.bar-tab .tab-item .icon { .bar-tab .tab-item .icon {
margin-top: 5px; top: 2px;
} }
.title { .title {
@ -219,13 +219,16 @@ a:active {
color: #33b5e5; color: #33b5e5;
opacity: .6; opacity: .6;
} }
.bar-nav .btn-link .icon {
top: 2px;
}
.bar .segmented-control { .bar .segmented-control {
top: 7px; top: 7px;
} }
.bar .icon { .bar .icon {
margin-top: 13px; top: 13px;
} }
.bar input[type="search"] { .bar input[type="search"] {

7
dist/ratchet.css vendored
Unescape View File

@ -548,7 +548,7 @@ input[type="button"] {
.bar-tab .tab-item .icon { .bar-tab .tab-item .icon {
width: 24px; width: 24px;
height: 24px; height: 24px;
margin-top: 4px; top: 2px;
} }
.bar-tab .tab-item .icon ~ .tab-label { .bar-tab .tab-item .icon ~ .tab-label {
display: block; display: block;
@ -596,6 +596,9 @@ input[type="button"] {
margin-right: -8px; margin-right: -8px;
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;
@ -616,9 +619,9 @@ input[type="button"] {
.bar .icon { .bar .icon {
position: relative; position: relative;
top: 10px;
z-index: 20; z-index: 20;
font-size: 24px; font-size: 24px;
margin-top: 11px;
} }
.bar .icon.pull-left { .bar .icon.pull-left {
margin-left: -3px; margin-left: -3px;

7
docs-assets/css/docs.css
Unescape View File

@ -1357,7 +1357,7 @@ hr {
color: #33b5e5; color: #33b5e5;
} }
.platform-android .bar-tab .tab-item .icon { .platform-android .bar-tab .tab-item .icon {
margin-top: 5px; top: 2px;
} }
.platform-android .title { .platform-android .title {
position: static; position: static;
@ -1394,11 +1394,14 @@ hr {
color: #33b5e5; color: #33b5e5;
opacity: .6; opacity: .6;
} }
.platform-android .bar-nav .btn-link .icon {
top: 2px;
}
.platform-android .bar .segmented-control { .platform-android .bar .segmented-control {
top: 7px; top: 7px;
} }
.platform-android .bar .icon { .platform-android .bar .icon {
margin-top: 13px; top: 13px;
} }
.platform-android .bar input[type="search"] { .platform-android .bar input[type="search"] {
height: 35px; height: 35px;

40
examples/app-default/choose-theater.html
Unescape View File

@ -34,54 +34,54 @@
<ul class="table-view"> <ul class="table-view">
<li class="table-view-cell table-view-divider">Theaters nearby</li> <li class="table-view-cell table-view-divider">Theaters nearby</li>
<li class="table-view-cell"> <li class="table-view-cell">
<strong>Metreon 16</strong> Metreon 16
<p>1.3 miles away</p> <p>1.3 miles away</p>
<a class="btn btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a> <a class="btn btn-outlined btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a>
</li> </li>
<li class="table-view-cell"> <li class="table-view-cell">
<strong>AMC 5</strong> AMC 5
<p>3.5 miles away</p> <p>3.5 miles away</p>
<a class="btn btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a> <a class="btn btn-outlined btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a>
</li> </li>
<li class="table-view-cell"> <li class="table-view-cell">
<strong>Regal 42</strong> Regal 42
<p>7.3 miles away</p> <p>7.3 miles away</p>
<a class="btn btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a> <a class="btn btn-outlined btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a>
</li> </li>
<li class="table-view-cell"> <li class="table-view-cell">
<strong>Shorline theater</strong> Shorline theater
<p>12.5 miles away</p> <p>12.5 miles away</p>
<a class="btn btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a> <a class="btn btn-outlined btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a>
</li> </li>
<li class="table-view-cell"> <li class="table-view-cell">
<strong>AMC 16</strong> AMC 16
<p>12.2 miles away</p> <p>12.2 miles away</p>
<a class="btn btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a> <a class="btn btn-outlined btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a>
</li> </li>
<li class="table-view-cell"> <li class="table-view-cell">
<strong>BW3 16</strong> BW3 16
<p>13.4 miles away</p> <p>13.4 miles away</p>
<a class="btn btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a> <a class="btn btn-outlined btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a>
</li> </li>
<li class="table-view-cell"> <li class="table-view-cell">
<strong>MC Hammer 16</strong> MC Hammer 16
<p>14.1 miles away</p> <p>14.1 miles away</p>
<a class="btn btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a> <a class="btn btn-outlined btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a>
</li> </li>
<li class="table-view-cell"> <li class="table-view-cell">
<strong>AMC 3</strong> AMC 3
<p>14.3 miles away</p> <p>14.3 miles away</p>
<a class="btn btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a> <a class="btn btn-outlined btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a>
</li> </li>
<li class="table-view-cell"> <li class="table-view-cell">
<strong>AMC 2</strong> AMC 2
<p>14.7 miles away</p> <p>14.7 miles away</p>
<a class="btn btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a> <a class="btn btn-outlined btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a>
</li> </li>
<li class="table-view-cell"> <li class="table-view-cell">
<strong>AMC 10</strong> AMC 10
<p>15 miles away</p> <p>15 miles away</p>
<a class="btn btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a> <a class="btn btn-outlined btn-positive" href="checkout.html" data-transition="slide-in">Buy Tickets</a>
</li> </li>
</ul> </ul>
</div> </div>

8
lib/sass/bars.scss
Unescape View File

@ -112,7 +112,7 @@
.icon { .icon {
width: 24px; width: 24px;
height: 24px; height: 24px;
margin-top: 4px; top: 2px;
// 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 {
@ -174,6 +174,10 @@
margin-left: -3px; margin-left: -3px;
} }
} }
// Position icons in link buttons correctly.
.icon {
top: 2px;
}
} }
@ -214,9 +218,9 @@
.bar .icon { .bar .icon {
position: relative; position: relative;
top: 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;
margin-top: 11px;
&.pull-left { &.pull-left {
margin-left: -3px; margin-left: -3px;

8
lib/sass/theme-android.scss
Unescape View File

@ -265,7 +265,7 @@ a {
} }
.icon { .icon {
margin-top: 5px; top: 2px;
} }
} }
} }
@ -316,6 +316,10 @@ a {
color: $primary-color; color: $primary-color;
opacity: .6; opacity: .6;
} }
// Position icons in link buttons correctly.
.icon {
top: 2px;
}
} }
} }
@ -328,7 +332,7 @@ a {
// Bars with Ratchicons // Bars with Ratchicons
.bar .icon { .bar .icon {
margin-top: 13px; top: 13px;
} }
// Standard bars with search forms // Standard bars with search forms

Write Preview
Loading…
Cancel
Save