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

Derpin on bars

pull/214/head
connors 11 years ago
parent
a357c1968e
commit
98b03d295a
6 changed files with 34 additions and 29 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. 31
      dist/ratchet.css
  2. 2
      lib/sass/bars.scss
  3. 12
      lib/sass/buttons.scss
  4. 4
      lib/sass/forms.scss
  5. 10
      lib/sass/segmented-controllers.scss
  6. 4
      lib/sass/table-views.scss

31
dist/ratchet.css vendored
Unescape View File

@ -284,7 +284,7 @@ a {
left: 0; left: 0;
z-index: 10; z-index: 10;
height: 44px; height: 44px;
padding: 0 10px; padding: 5px 10px;
background-color: rgba(247, 247, 247, 0.98); background-color: rgba(247, 247, 247, 0.98);
box-shadow: 0 0 1px rgba(0, 0, 0, 0.85); box-shadow: 0 0 1px rgba(0, 0, 0, 0.85);
} }
@ -397,6 +397,9 @@ a {
margin: -11px -60px -11px 0; margin: -11px -60px -11px 0;
color: inherit; color: inherit;
} }
.table-view li p {
margin: 0;
}
.table-view.inset { .table-view.inset {
width: auto; width: auto;
margin-right: 10px; margin-right: 10px;
@ -560,14 +563,14 @@ select {
} }
[class*="bar-"] input[type=search] { [class*="bar-"] input[type=search] {
height: 32px; height: 29px;
margin: 0; margin: 2px 0;
} }
[class*="button"] { [class*="button"] {
position: relative; position: relative;
display: inline-block; display: inline-block;
padding: 4px 12px; padding: 5px 10px 6px;
margin: 0; margin: 0;
font-weight: 400; font-weight: 400;
line-height: 1; line-height: 1;
@ -624,6 +627,7 @@ select {
position: relative; position: relative;
z-index: 10; z-index: 10;
padding: 0; padding: 0;
margin-top: -5px;
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
line-height: 44px; line-height: 44px;
@ -638,7 +642,7 @@ select {
.bar-title .button + [class*="button"]:last-child, .bar-title .button + [class*="button"]:last-child,
.bar-title [class*="button"].pull-right { .bar-title [class*="button"].pull-right {
position: absolute; position: absolute;
top: 0; top: 5px;
right: 10px; right: 10px;
} }
.bar-title .button:active, .bar-title .button:active,
@ -696,11 +700,7 @@ select {
[class*="bar"] .button-block { [class*="bar"] .button-block {
padding: 7px 0; padding: 7px 0;
margin-top: 6px; margin-top: 1px;
margin-bottom: 0;
}
[class*="bar"] .button-block:active {
padding: 7px 0;
} }
input[type="submit"], input[type="submit"],
@ -775,7 +775,7 @@ input[type="button"] {
display: -webkit-box; display: -webkit-box;
display: box; display: box;
padding: 0; padding: 0;
margin-bottom: 10px; margin: 0 0 10px 0;
overflow: hidden; overflow: hidden;
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
@ -796,7 +796,7 @@ input[type="button"] {
} }
.segmented-controller li > a { .segmented-controller li > a {
display: block; display: block;
padding: 7px 16px; padding: 6px 16px 7px;
overflow: hidden; overflow: hidden;
line-height: 1; line-height: 1;
color: #007aff; color: #007aff;
@ -821,12 +821,15 @@ input[type="button"] {
} }
[class*="bar-"] .segmented-controller { [class*="bar-"] .segmented-controller {
margin-top: 9px; margin: 3px 0;
margin-bottom: 8px;
-webkit-box-flex: 1; -webkit-box-flex: 1;
box-flex: 1; box-flex: 1;
} }
.bar-title .segmented-controller {
margin-bottom: 4px;
}
[class*="bar-"] .segmented-controller + [class*="button"], [class*="bar-"] .segmented-controller + [class*="button"],
[class*="bar-"] [class*="button"] + .segmented-controller { [class*="bar-"] [class*="button"] + .segmented-controller {
margin-left: 10px; margin-left: 10px;

2
lib/sass/bars.scss
Unescape View File

@ -8,7 +8,7 @@
left: 0; left: 0;
z-index: 10; z-index: 10;
height: $bar-base-height; height: $bar-base-height;
padding: 0 $bar-side-spacing; padding: 5px $bar-side-spacing;
background-color: $chrome-color; background-color: $chrome-color;
box-shadow: 0 0 1px rgba(0,0,0,.85); box-shadow: 0 0 1px rgba(0,0,0,.85);

12
lib/sass/buttons.scss
Unescape View File

@ -5,7 +5,7 @@
[class*="button"] { [class*="button"] {
position: relative; position: relative;
display: inline-block; display: inline-block;
padding: 4px 12px; padding: 5px 10px 6px;
margin: 0; margin: 0;
font-weight: $font-weight-light; font-weight: $font-weight-light;
line-height: 1; line-height: 1;
@ -93,6 +93,7 @@
position: relative; position: relative;
z-index: 10; // Places buttons over full width title z-index: 10; // Places buttons over full width title
padding: 0; padding: 0;
margin-top: -5px; // Offsets the bar's vertical padding
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
line-height: $bar-base-height; line-height: $bar-base-height;
@ -110,7 +111,7 @@
.button + [class*="button"]:last-child, .button + [class*="button"]:last-child,
[class*="button"].pull-right { [class*="button"].pull-right {
position: absolute; position: absolute;
top: 0; top: 5px; // Offsets the bar's vertical padding
right: $bar-side-spacing; right: $bar-side-spacing;
} }
@ -188,12 +189,7 @@
// Add proper padding and replace buttons normal dropshadow with a shine from bar // Add proper padding and replace buttons normal dropshadow with a shine from bar
[class*="bar"] .button-block { [class*="bar"] .button-block {
padding: 7px 0; padding: 7px 0;
margin-top: 6px; margin-top: 1px;
margin-bottom: 0;
&:active {
padding: 7px 0;
}
} }
// Button overrides // Button overrides

4
lib/sass/forms.scss
Unescape View File

@ -133,6 +133,6 @@ select {
// Position/size search bar within the bar // Position/size search bar within the bar
[class*="bar-"] input[type=search] { [class*="bar-"] input[type=search] {
height: 32px; height: 29px;
margin: 0; margin: 2px 0;
} }

10
lib/sass/segmented-controllers.scss
Unescape View File

@ -6,7 +6,7 @@
display: -webkit-box; display: -webkit-box;
display: box; display: box;
padding: 0; padding: 0;
margin-bottom: 10px; margin: 0 0 10px 0;
overflow: hidden; overflow: hidden;
font-size: 12px; font-size: 12px;
font-weight: $font-weight-light; font-weight: $font-weight-light;
@ -29,7 +29,7 @@
// Link that fills each section // Link that fills each section
> a { > a {
display: block; display: block;
padding: 7px 16px; padding: 6px 16px 7px;
overflow: hidden; overflow: hidden;
line-height: 1; line-height: 1;
color: $primary-color; color: $primary-color;
@ -68,11 +68,13 @@
// Remove standard segmented bottom margin // Remove standard segmented bottom margin
[class*="bar-"] .segmented-controller { [class*="bar-"] .segmented-controller {
margin-top: 9px; // Optically center the controller margin: 3px 0;
margin-bottom: 8px;
-webkit-box-flex: 1; -webkit-box-flex: 1;
box-flex: 1; box-flex: 1;
} }
.bar-title .segmented-controller {
margin-bottom: 4px;
}
// Add margins between segmented controllers and buttons // Add margins between segmented controllers and buttons
[class*="bar-"] .segmented-controller + [class*="button"], [class*="bar-"] .segmented-controller + [class*="button"],

4
lib/sass/table-views.scss
Unescape View File

@ -28,6 +28,10 @@
margin: -11px -60px -11px 0; margin: -11px -60px -11px 0;
color: inherit; color: inherit;
} }
p {
margin: 0;
}
} }

Write Preview
Loading…
Cancel
Save