Browse Source

twerking on buttons

pull/245/head
connors 11 years ago
parent
commit
f11bf17d2d
  1. 2
      _includes/header.html
  2. 10
      assets/css/docs.css
  3. 4
      dist/android-theme.css
  4. 45
      dist/ratchet.css
  5. 56
      lib/sass/buttons.scss
  6. 3
      lib/sass/theme-android.scss
  7. 3
      lib/sass/theme-ios.scss

2
_includes/header.html

@ -7,7 +7,7 @@
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black"> <meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="dist/ratchet.css"> <link rel="stylesheet" href="dist/ratchet.css">
<link rel="stylesheet" href="dist/android-theme.css"> <!-- <link rel="stylesheet" href="dist/ios-theme.css"> -->
<link rel="stylesheet" href="assets/css/docs.css"> <link rel="stylesheet" href="assets/css/docs.css">
<link rel="stylesheet" href="assets/css/pygments.css"> <link rel="stylesheet" href="assets/css/pygments.css">
<!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]--> <!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->

10
assets/css/docs.css

@ -313,15 +313,7 @@ h6 {
width: 320px; width: 320px;
height: 548px; height: 548px;
overflow: hidden; overflow: hidden;
background-color: $chrome-color; background-color: #efeff4;
background: rgb(0,0,0); /* Old browsers */
background: -moz-linear-gradient(top, rgba(0,0,0,1) 0%, rgba(34,34,34,1) 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,1)), color-stop(100%,rgba(34,34,34,1))); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, rgba(0,0,0,1) 0%,rgba(34,34,34,1) 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, rgba(0,0,0,1) 0%,rgba(34,34,34,1) 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, rgba(0,0,0,1) 0%,rgba(34,34,34,1) 100%); /* IE10+ */
background: linear-gradient(to bottom, rgba(0,0,0,1) 0%,rgba(34,34,34,1) 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#000000', endColorstr='#222222',GradientType=0 ); /* IE6-9 */
} }
.iphone .content, .iphone .content,

4
dist/android-theme.css vendored

@ -34,6 +34,10 @@
bottom: 71px; bottom: 71px;
} }
.bar-nav {
display: block;
}
.bar-tab { .bar-tab {
height: 70px; height: 70px;
border-top: 1px solid #565656; border-top: 1px solid #565656;

45
dist/ratchet.css vendored

@ -727,51 +727,6 @@ select {
.bar-nav .button-primary { .bar-nav .button-primary {
font-weight: 500; font-weight: 500;
} }
.bar-nav .button-prev:before,
.bar-nav .button-prev:after,
.bar-nav .button-next:before,
.bar-nav .button-next:after {
position: absolute;
display: block;
width: 15px;
height: 3px;
background-color: #428bca;
content: '';
}
.bar-nav .button-prev {
padding-left: 20px;
margin-left: -5px;
}
.bar-nav .button-next {
padding-right: 20px;
margin-right: -5px;
}
.bar-nav .button-prev:before,
.bar-nav .button-prev:after {
left: 0;
}
.bar-nav .button-next:before,
.bar-nav .button-next:after {
right: 0;
}
.bar-nav .button-prev:before,
.bar-nav .button-next:before {
top: 16px;
}
.bar-nav .button-prev:after,
.bar-nav .button-next:after {
top: 25px;
}
.bar-nav .button-prev:before,
.bar-nav .button-next:after {
-webkit-transform: rotate(-45deg);
transform: rotate(-45deg);
}
.bar-nav .button-prev:after,
.bar-nav .button-next:before {
-webkit-transform: rotate(45deg);
transform: rotate(45deg);
}
[class*="bar"] .button-block { [class*="bar"] .button-block {
padding: 7px 0; padding: 7px 0;

56
lib/sass/buttons.scss

@ -148,62 +148,6 @@
.button-primary { .button-primary {
font-weight: $font-weight; font-weight: $font-weight;
} }
// Directional buttons in nav bars
// --------------------------------------------------
.button-prev:before,
.button-prev:after,
.button-next:before,
.button-next:after {
position: absolute;
display: block;
width: 15px;
height: 3px;
background-color: $primary-color;
content: '';
}
// Prev/next button base styles
.button-prev {
padding-left: $button-directional-padding;
margin-left: $button-directional-margin;
}
.button-next {
padding-right: $button-directional-padding;
margin-right: $button-directional-margin;
}
// Position the chevrons horizontally
.button-prev:before,
.button-prev:after {
left: 0;
}
.button-next:before,
.button-next:after {
right: 0;
}
// Position the chevrons vertically
.button-prev:before,
.button-next:before {
top: 16px;
}
.button-prev:after,
.button-next:after {
top: 25px;
}
// Rotate the chevrons
.button-prev:before,
.button-next:after {
@include transform(rotate(-45deg));
}
.button-prev:after,
.button-next:before {
@include transform(rotate(45deg));
}
} }
// Block buttons in all bars // Block buttons in all bars

3
lib/sass/theme-android.scss

@ -66,6 +66,9 @@ $border-radius: 0;
bottom: $bar-tab-height + 1; bottom: $bar-tab-height + 1;
} }
} }
.bar-nav {
display: block;
}
.bar-tab { .bar-tab {
height: $bar-tab-height; height: $bar-tab-height;
border-top: $border-default; border-top: $border-default;

3
lib/sass/theme-ios.scss

@ -59,9 +59,6 @@ $timing-fuction: cubic-bezier(.1, .5, .1, 1); // Inspired by @c2prods
bottom: $bar-tab-height; bottom: $bar-tab-height;
} }
} }
.bar-nav {
display: block;
}
.bar-tab { .bar-tab {
border-top: 0; border-top: 0;
@include box-shadow(0 0 -1px rgba(0,0,0,.85)); @include box-shadow(0 0 -1px rgba(0,0,0,.85));

Loading…
Cancel
Save