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

Merge branch 'master' into jump-nav

pull/530/head
connors 11 years ago
parent
4fc7fe9e7b a57d2ae616
commit
01e8cf566c
13 changed files with 124 additions and 12 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. 27
      dist/css/ratchet-theme-android.css
  2. 2
      dist/css/ratchet-theme-android.min.css
  3. 3
      dist/css/ratchet.css
  4. 2
      dist/css/ratchet.min.css
  5. 36
      docs/assets/css/docs.css
  6. 2
      docs/assets/css/docs.min.css
  7. 27
      docs/dist/css/ratchet-theme-android.css
  8. 2
      docs/dist/css/ratchet-theme-android.min.css
  9. 3
      docs/dist/css/ratchet.css
  10. 2
      docs/dist/css/ratchet.min.css
  11. 10
      sass/docs.scss
  12. 3
      sass/forms.scss
  13. 17
      sass/theme-android.scss

27
dist/css/ratchet-theme-android.css vendored
Unescape View File

@ -332,6 +332,33 @@ a:active {
border-bottom: 2px solid #a9a9a9;
}
.table-view-cell .navigate-left > .btn,
.table-view-cell .navigate-left > .badge,
.table-view-cell .navigate-left > .toggle,
.table-view-cell .navigate-right > .btn,
.table-view-cell .navigate-right > .badge,
.table-view-cell .navigate-right > .toggle,
.table-view-cell .push-left > .btn,
.table-view-cell .push-left > .badge,
.table-view-cell .push-left > .toggle,
.table-view-cell .push-right > .btn,
.table-view-cell .push-right > .badge,
.table-view-cell .push-right > .toggle,
.table-view-cell > a .navigate-left > .btn,
.table-view-cell > a .navigate-left > .badge,
.table-view-cell > a .navigate-left > .toggle,
.table-view-cell > a .navigate-right > .btn,
.table-view-cell > a .navigate-right > .badge,
.table-view-cell > a .navigate-right > .toggle,
.table-view-cell > a .push-left > .btn,
.table-view-cell > a .push-left > .badge,
.table-view-cell > a .push-left > .toggle,
.table-view-cell > a .push-right > .btn,
.table-view-cell > a .push-right > .badge,
.table-view-cell > a .push-right > .toggle {
right: 15px;
}
select,
textarea,
input[type="text"],

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

File diff suppressed because one or more lines are too long

3
dist/css/ratchet.css vendored
Unescape View File

@ -896,6 +896,7 @@ select {
}
.input-row {
height: 35px;
overflow: hidden;
border-bottom: 1px solid #ddd;
}
@ -903,7 +904,7 @@ select {
.input-row label {
float: left;
width: 35%;
padding: 10px 15px;
padding: 8px 15px;
font-family: "Helvetica Neue", Helvetica, sans-serif;
line-height: 1.1;
}

2
dist/css/ratchet.min.css vendored
View File

File diff suppressed because one or more lines are too long

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

@ -57,8 +57,14 @@ body {
.docs-header,
.docs-sub-header {
position: relative;
background-image: linear-gradient(45deg, #0a1855 0%, #da0024 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0a1855', endColorstr='#da0024', GradientType=0 );
background-color: #0a1855;
background-image: -moz-linear-gradient(45deg, #0a1855 0%, #da0024 100%);
background-image: -webkit-gradient(linear, left bottom, right top, color-stop(0%, #0a1855), color-stop(100%, #da0024));
background-image: -webkit-linear-gradient(45deg, #0a1855 0%, #da0024 100%);
background-image: -o-linear-gradient(45deg, #0a1855 0%, #da0024 100%);
background-image: -ms-linear-gradient(45deg, #0a1855 0%, #da0024 100%);
background-image: linear-gradient(45deg, #0a1855 0%, #da0024 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0a1855', endColorstr='#da0024',GradientType=1 );
}
.docs-header {
@ -1690,6 +1696,32 @@ hr {
border-top: 0;
border-bottom: 2px solid #a9a9a9;
}
.platform-android .table-view-cell .navigate-left > .btn,
.platform-android .table-view-cell .navigate-left > .badge,
.platform-android .table-view-cell .navigate-left > .toggle,
.platform-android .table-view-cell .navigate-right > .btn,
.platform-android .table-view-cell .navigate-right > .badge,
.platform-android .table-view-cell .navigate-right > .toggle,
.platform-android .table-view-cell .push-left > .btn,
.platform-android .table-view-cell .push-left > .badge,
.platform-android .table-view-cell .push-left > .toggle,
.platform-android .table-view-cell .push-right > .btn,
.platform-android .table-view-cell .push-right > .badge,
.platform-android .table-view-cell .push-right > .toggle,
.platform-android .table-view-cell > a .navigate-left > .btn,
.platform-android .table-view-cell > a .navigate-left > .badge,
.platform-android .table-view-cell > a .navigate-left > .toggle,
.platform-android .table-view-cell > a .navigate-right > .btn,
.platform-android .table-view-cell > a .navigate-right > .badge,
.platform-android .table-view-cell > a .navigate-right > .toggle,
.platform-android .table-view-cell > a .push-left > .btn,
.platform-android .table-view-cell > a .push-left > .badge,
.platform-android .table-view-cell > a .push-left > .toggle,
.platform-android .table-view-cell > a .push-right > .btn,
.platform-android .table-view-cell > a .push-right > .badge,
.platform-android .table-view-cell > a .push-right > .toggle {
right: 15px;
}
.platform-android select,
.platform-android textarea,
.platform-android input[type="text"],

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

File diff suppressed because one or more lines are too long

27
docs/dist/css/ratchet-theme-android.css vendored
Unescape View File

@ -332,6 +332,33 @@ a:active {
border-bottom: 2px solid #a9a9a9;
}
.table-view-cell .navigate-left > .btn,
.table-view-cell .navigate-left > .badge,
.table-view-cell .navigate-left > .toggle,
.table-view-cell .navigate-right > .btn,
.table-view-cell .navigate-right > .badge,
.table-view-cell .navigate-right > .toggle,
.table-view-cell .push-left > .btn,
.table-view-cell .push-left > .badge,
.table-view-cell .push-left > .toggle,
.table-view-cell .push-right > .btn,
.table-view-cell .push-right > .badge,
.table-view-cell .push-right > .toggle,
.table-view-cell > a .navigate-left > .btn,
.table-view-cell > a .navigate-left > .badge,
.table-view-cell > a .navigate-left > .toggle,
.table-view-cell > a .navigate-right > .btn,
.table-view-cell > a .navigate-right > .badge,
.table-view-cell > a .navigate-right > .toggle,
.table-view-cell > a .push-left > .btn,
.table-view-cell > a .push-left > .badge,
.table-view-cell > a .push-left > .toggle,
.table-view-cell > a .push-right > .btn,
.table-view-cell > a .push-right > .badge,
.table-view-cell > a .push-right > .toggle {
right: 15px;
}
select,
textarea,
input[type="text"],

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

File diff suppressed because one or more lines are too long

3
docs/dist/css/ratchet.css vendored
Unescape View File

@ -896,6 +896,7 @@ select {
}
.input-row {
height: 35px;
overflow: hidden;
border-bottom: 1px solid #ddd;
}
@ -903,7 +904,7 @@ select {
.input-row label {
float: left;
width: 35%;
padding: 10px 15px;
padding: 8px 15px;
font-family: "Helvetica Neue", Helvetica, sans-serif;
line-height: 1.1;
}

2
docs/dist/css/ratchet.min.css vendored
View File

File diff suppressed because one or more lines are too long

10
sass/docs.scss
Unescape View File

@ -63,8 +63,14 @@ body {
.docs-header,
.docs-sub-header {
position: relative;
background-image: linear-gradient(45deg, #0a1855 0%,#da0024 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0a1855', endColorstr='#da0024', GradientType=0 );
background-color: #0a1855;
background-image: -moz-linear-gradient(45deg, #0a1855 0%, #da0024 100%);
background-image: -webkit-gradient(linear, left bottom, right top, color-stop(0%,#0a1855), color-stop(100%,#da0024));
background-image: -webkit-linear-gradient(45deg, #0a1855 0%,#da0024 100%);
background-image: -o-linear-gradient(45deg, #0a1855 0%,#da0024 100%);
background-image: -ms-linear-gradient(45deg, #0a1855 0%,#da0024 100%);
background-image: linear-gradient(45deg, #0a1855 0%,#da0024 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0a1855', endColorstr='#da0024',GradientType=1 );
}
.docs-header {
height: 100vh;

3
sass/forms.scss
Unescape View File

@ -92,6 +92,7 @@ select {
// To use labels with input groups, wrap a label and an input in an .input-row
.input-row {
overflow: hidden;
height: 35px; // Matches the height of inputs.
border-bottom: $border-default;
}
@ -99,7 +100,7 @@ select {
.input-row label {
float: left;
width: 35%;
padding: 10px 15px;
padding: 8px 15px;
font-family: $font-family-default;
line-height: 1.1; // Put the text on the baseline.
}

17
sass/theme-android.scss
Unescape View File

@ -455,6 +455,23 @@ a {
}
}
// Table-views with buttons, badges and toggles
// --------------------------------------------------
.table-view-cell,
.table-view-cell > a {
// Android has no cheverons so don't bump the buttons, badges, or toggles over.
.navigate-left,
.navigate-right,
.push-left,
.push-right {
> .btn,
> .badge,
> .toggle {
right: 15px;
}
}
}
// Forms
// --------------------------------------------------

Write Preview
Loading…
Cancel
Save