Browse Source

buttons and i honest can't remember what else.

pull/214/head
connors 11 years ago
parent
commit
10d0914d3e
  1. 16
      dist/ratchet.css
  2. 14
      lib/sass/buttons.scss
  3. 3
      lib/sass/table-views.scss
  4. 2
      test/components/index.html

16
dist/ratchet.css vendored

@ -399,6 +399,9 @@ a {
margin: -11px -60px -11px 0; margin: -11px -60px -11px 0;
color: inherit; color: inherit;
} }
.table-view li > a:not([class*="button"]):active {
background-color: #eee;
}
.table-view li p { .table-view li p {
margin: 0; margin: 0;
} }
@ -504,7 +507,6 @@ input[type=search] {
border-width: 0; border-width: 0;
background-color: rgba(0, 0, 0, 0.1); background-color: rgba(0, 0, 0, 0.1);
box-sizing: border-box; box-sizing: border-box;
transition: text-align 1s linear;
} }
input[type=search]:focus { input[type=search]:focus {
@ -655,12 +657,20 @@ select {
right: 10px; right: 10px;
} }
.bar-title .button:active, .bar-title .button:active,
.bar-title .button-prev:active, .bar-title .button.active
.bar-title .button-next:active { .button-prev:active
.button-prev.active,
.bar-title .button-next:active
.button-next.active,
.bar-title .button-primary:active,
.bar-title .button-primary.active {
color: #007aff; color: #007aff;
background-color: transparent; background-color: transparent;
opacity: .3; opacity: .3;
} }
.bar-title .button-primary {
font-weight: 500;
}
.bar-title .button-prev:before, .bar-title .button-prev:before,
.bar-title .button-prev:after, .bar-title .button-prev:after,
.bar-title .button-next:before, .bar-title .button-next:before,

14
lib/sass/buttons.scss

@ -117,13 +117,23 @@
// Override standard button active states // Override standard button active states
.button:active, .button:active,
.button-prev:active, .button.active
.button-next:active { .button-prev:active
.button-prev.active,
.button-next:active
.button-next.active,
.button-primary:active,
.button-primary.active {
color: $primary-color; color: $primary-color;
background-color: transparent; background-color: transparent;
opacity: .3; opacity: .3;
} }
// Primary button in bars
.button-primary {
font-weight: $font-weight;
}
// Directional buttons in nav bars // Directional buttons in nav bars
// -------------------------------------------------- // --------------------------------------------------

3
lib/sass/table-views.scss

@ -28,6 +28,9 @@
margin: -11px -60px -11px 0; margin: -11px -60px -11px 0;
color: inherit; color: inherit;
} }
> a:not([class*="button"]):active {
background-color: #eee;
}
p { p {
margin: 0; margin: 0;

2
test/components/index.html

@ -138,7 +138,7 @@
<!-- Title-bar left button --> <!-- Title-bar left button -->
<header class="bar-title" id="newshit"> <header class="bar-title" id="newshit">
<a class="button open-shelf" href="#"> <a class="button-primary open-shelf" href="#">
Open Open
</a> </a>
<ul class="segmented-controller"> <ul class="segmented-controller">

Loading…
Cancel
Save