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

Merge pull request #424 from twbs/footer-border 

iOS `bar-footer` cleanup
pull/426/head
Connor Sears 11 years ago
parent
4522e7dff1 5f99ba2f1b
commit
752875d780
7 changed files with 9 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
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      dist/css/ratchet-theme-ios.css
  2. 2
      dist/css/ratchet-theme-ios.min.css
  3. 8
      docs/assets/css/docs.css
  4. 2
      docs/assets/css/docs.min.css
  5. 8
      docs/dist/css/ratchet-theme-ios.css
  6. 2
      docs/dist/css/ratchet-theme-ios.min.css
  7. 8
      sass/theme-ios.scss

8
dist/css/ratchet-theme-ios.css vendored
Unescape View File

@ -131,18 +131,12 @@ p {
.bar.bar-footer-secondary-tab {
bottom: 50px;
}
.bar .bar-footer,
.bar .bar-footer-secondary,
.bar .bar-footer-secondary-tab {
.bar.bar-footer, .bar.bar-footer-secondary, .bar.bar-footer-secondary-tab {
border-top: 0;
-webkit-box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85);
box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85);
}
.bar-tab {
border-top: 0;
-webkit-box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85);
box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85);
}
.tab-item {

2
dist/css/ratchet-theme-ios.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
docs/assets/css/docs.css
Unescape View File

@ -1078,17 +1078,11 @@ hr {
.platform-ios .bar.bar-footer-secondary-tab {
bottom: 50px;
}
.platform-ios .bar .bar-footer,
.platform-ios .bar .bar-footer-secondary,
.platform-ios .bar .bar-footer-secondary-tab {
.platform-ios .bar.bar-footer, .platform-ios .bar.bar-footer-secondary, .platform-ios .bar.bar-footer-secondary-tab {
border-top: 0;
-webkit-box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85);
box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85);
}
.platform-ios .bar-tab {
border-top: 0;
-webkit-box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85);
box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85);
}
.platform-ios .tab-item {
color: #929292;

2
docs/assets/css/docs.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
docs/dist/css/ratchet-theme-ios.css vendored
Unescape View File

@ -131,18 +131,12 @@ p {
.bar.bar-footer-secondary-tab {
bottom: 50px;
}
.bar .bar-footer,
.bar .bar-footer-secondary,
.bar .bar-footer-secondary-tab {
.bar.bar-footer, .bar.bar-footer-secondary, .bar.bar-footer-secondary-tab {
border-top: 0;
-webkit-box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85);
box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85);
}
.bar-tab {
border-top: 0;
-webkit-box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85);
box-shadow: 0 0 -1px rgba(0, 0, 0, 0.85);
}
.tab-item {

2
docs/dist/css/ratchet-theme-ios.min.css vendored
View File

File diff suppressed because one or more lines are too long

8
sass/theme-ios.scss
Unescape View File

@ -199,18 +199,16 @@ p {
bottom: $bar-tab-height;
}
// Give the footers the correct border
.bar-footer,
.bar-footer-secondary,
.bar-footer-secondary-tab {
&.bar-footer,
&.bar-footer-secondary,
&.bar-footer-secondary-tab {
border-top: 0;
@include box-shadow(0 0 -1px rgba(0,0,0,.85));
}
}
// Tab bar
.bar-tab {
border-top: 0;
@include box-shadow(0 0 -1px rgba(0,0,0,.85));
}
.tab-item {
color: #929292;

Write Preview
Loading…
Cancel
Save