From 7a78c89482140f55f7d61fadc20bf28e1e2a276c Mon Sep 17 00:00:00 2001 From: connors Date: Sat, 8 Feb 2014 13:30:29 -0800 Subject: [PATCH] use default light theme --- dist/android-theme.css | 62 +++++++++++++++++------------------ docs-assets/css/docs.css | 65 ++++++++++++++++++------------------- lib/sass/docs.scss | 3 +- lib/sass/theme-android.scss | 8 ++--- 4 files changed, 68 insertions(+), 70 deletions(-) diff --git a/dist/android-theme.css b/dist/android-theme.css index ac71ffe..9f7d0e8 100644 --- a/dist/android-theme.css +++ b/dist/android-theme.css @@ -16,19 +16,19 @@ body { } .content { - background: #111111; - background: -moz-linear-gradient(top, #111111 0%, #2b2b2b 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #111111), color-stop(100%, #2b2b2b)); - background: -webkit-linear-gradient(top, #111111 0%, #2b2b2b 100%); - background: -o-linear-gradient(top, #111111 0%, #2b2b2b 100%); - background: -ms-linear-gradient(top, #111111 0%, #2b2b2b 100%); - background: linear-gradient(to bottom, #111111 0%, #2b2b2b 100%); + background: #dddddd; + background: -moz-linear-gradient(top, #dddddd 0%, #f7f7f7 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dddddd), color-stop(100%, #f7f7f7)); + background: -webkit-linear-gradient(top, #dddddd 0%, #f7f7f7 100%); + background: -o-linear-gradient(top, #dddddd 0%, #f7f7f7 100%); + background: -ms-linear-gradient(top, #dddddd 0%, #f7f7f7 100%); + background: linear-gradient(to bottom, #dddddd 0%, #f7f7f7 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$color-form', endColorstr='$color-to',GradientType=0 ); } .bar { height: 50px; - background-color: #111111; + background-color: #dddddd; border-bottom: 1px solid #565656; } .bar.bar-header-secondary { @@ -45,7 +45,7 @@ body { position: static; padding-left: 10px; line-height: 50px; - color: white; + color: #9a9a9a; text-align: left; } @@ -131,13 +131,13 @@ textarea, .btn { border: 1px solid #565656; - color: white; - background-color: #111111; + color: #9a9a9a; + background-color: #dddddd; border-radius: 3px; } .btn:active, .btn.active { color: #fff; - background-color: white; + background-color: #9a9a9a; } .bar .btn { @@ -165,22 +165,22 @@ textarea, .btn-positive { color: #fff; - border: 1px solid #81c700; - background-color: #81c700; + border: 1px solid #99cc00; + background-color: #99cc00; } .btn-positive:active, .btn-positive.active { - border: 1px solid #609400; - background-color: #609400; + border: 1px solid #739900; + background-color: #739900; } .btn-negative { color: #fff; - border: 1px solid #f20754; - background-color: #f20754; + border: 1px solid #ff4444; + background-color: #ff4444; } .btn-negative:active, .btn-negative.active { - border: 1px solid #c00643; - background-color: #c00643; + border: 1px solid #ff1111; + background-color: #ff1111; } .btn-outlined { @@ -190,10 +190,10 @@ textarea, color: #33b5e5; } .btn-outlined.btn-positive { - color: #81c700; + color: #99cc00; } .btn-outlined.btn-negative { - color: #f20754; + color: #ff4444; } .btn-outlined.btn-primary:active, .btn-outlined.btn-positive:active, .btn-outlined.btn-negative:active { color: #fff; @@ -218,7 +218,7 @@ textarea, } .badge.badge-inverted { - color: white; + color: #9a9a9a; } .badge-primary { @@ -231,18 +231,18 @@ textarea, .badge-positive { color: #fff; - background-color: #81c700; + background-color: #99cc00; } .badge-positive.badge-inverted { - color: #81c700; + color: #99cc00; } .badge-negative { color: #fff; - background-color: #f20754; + background-color: #ff4444; } .badge-negative.badge-inverted { - color: #f20754; + color: #ff4444; } .segmented-control { @@ -266,7 +266,7 @@ textarea, border-radius: 12px; } .popover:after { - border-bottom: 15px solid #111111; + border-bottom: 15px solid #dddddd; } .toggle .toggle-handle { @@ -276,9 +276,9 @@ textarea, width: 35px; } .toggle.active { - border: 2px solid #81c700; - background-color: #81c700; + border: 2px solid #99cc00; + background-color: #99cc00; } .toggle.active .toggle-handle { - border-color: #81c700; + border-color: #99cc00; } diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css index 37dcb1a..5db19a8 100644 --- a/docs-assets/css/docs.css +++ b/docs-assets/css/docs.css @@ -1204,18 +1204,18 @@ hr { line-height: 21px; } .platform-android .content { - background: #111111; - background: -moz-linear-gradient(top, #111111 0%, #2b2b2b 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #111111), color-stop(100%, #2b2b2b)); - background: -webkit-linear-gradient(top, #111111 0%, #2b2b2b 100%); - background: -o-linear-gradient(top, #111111 0%, #2b2b2b 100%); - background: -ms-linear-gradient(top, #111111 0%, #2b2b2b 100%); - background: linear-gradient(to bottom, #111111 0%, #2b2b2b 100%); + background: #dddddd; + background: -moz-linear-gradient(top, #dddddd 0%, #f7f7f7 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dddddd), color-stop(100%, #f7f7f7)); + background: -webkit-linear-gradient(top, #dddddd 0%, #f7f7f7 100%); + background: -o-linear-gradient(top, #dddddd 0%, #f7f7f7 100%); + background: -ms-linear-gradient(top, #dddddd 0%, #f7f7f7 100%); + background: linear-gradient(to bottom, #dddddd 0%, #f7f7f7 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='$color-form', endColorstr='$color-to',GradientType=0 ); } .platform-android .bar { height: 50px; - background-color: #111111; + background-color: #dddddd; border-bottom: 1px solid #565656; } .platform-android .bar.bar-header-secondary { @@ -1230,7 +1230,7 @@ hr { position: static; padding-left: 10px; line-height: 50px; - color: white; + color: #9a9a9a; text-align: left; } .platform-android .popover .bar-nav { @@ -1303,13 +1303,13 @@ hr { } .platform-android .btn { border: 1px solid #565656; - color: white; - background-color: #111111; + color: #9a9a9a; + background-color: #dddddd; border-radius: 3px; } .platform-android .btn:active, .platform-android .btn.active { color: #fff; - background-color: white; + background-color: #9a9a9a; } .platform-android .bar .btn { padding-top: 9px; @@ -1334,21 +1334,21 @@ hr { } .platform-android .btn-positive { color: #fff; - border: 1px solid #81c700; - background-color: #81c700; + border: 1px solid #99cc00; + background-color: #99cc00; } .platform-android .btn-positive:active, .platform-android .btn-positive.active { - border: 1px solid #609400; - background-color: #609400; + border: 1px solid #739900; + background-color: #739900; } .platform-android .btn-negative { color: #fff; - border: 1px solid #f20754; - background-color: #f20754; + border: 1px solid #ff4444; + background-color: #ff4444; } .platform-android .btn-negative:active, .platform-android .btn-negative.active { - border: 1px solid #c00643; - background-color: #c00643; + border: 1px solid #ff1111; + background-color: #ff1111; } .platform-android .btn-outlined { background-color: transparent; @@ -1357,10 +1357,10 @@ hr { color: #33b5e5; } .platform-android .btn-outlined.btn-positive { - color: #81c700; + color: #99cc00; } .platform-android .btn-outlined.btn-negative { - color: #f20754; + color: #ff4444; } .platform-android .btn-outlined.btn-primary:active, .platform-android .btn-outlined.btn-positive:active, .platform-android .btn-outlined.btn-negative:active { color: #fff; @@ -1382,7 +1382,7 @@ hr { opacity: .6; } .platform-android .badge.badge-inverted { - color: white; + color: #9a9a9a; } .platform-android .badge-primary { color: #fff; @@ -1393,17 +1393,17 @@ hr { } .platform-android .badge-positive { color: #fff; - background-color: #81c700; + background-color: #99cc00; } .platform-android .badge-positive.badge-inverted { - color: #81c700; + color: #99cc00; } .platform-android .badge-negative { color: #fff; - background-color: #f20754; + background-color: #ff4444; } .platform-android .badge-negative.badge-inverted { - color: #f20754; + color: #ff4444; } .platform-android .segmented-control { background-color: transparent; @@ -1425,7 +1425,7 @@ hr { border-radius: 12px; } .platform-android .popover:after { - border-bottom: 15px solid #111111; + border-bottom: 15px solid #dddddd; } .platform-android .toggle .toggle-handle { border: 1px solid #565656; @@ -1434,19 +1434,18 @@ hr { width: 35px; } .platform-android .toggle.active { - border: 2px solid #81c700; - background-color: #81c700; + border: 2px solid #99cc00; + background-color: #99cc00; } .platform-android .toggle.active .toggle-handle { - border-color: #81c700; + border-color: #99cc00; } .platform-android .device { font-family: 'Roboto', sans-serif; background-image: url("../img/android.png"); } .platform-android .device .device-content { - background-color: #000; - background-image: linear-gradient(to bottom, #111111 0%, #2b2b2b 100%); + background-color: #f2f2f2; } @-webkit-keyframes fadeOverlay { diff --git a/lib/sass/docs.scss b/lib/sass/docs.scss index 1e9c9fd..64b43c5 100644 --- a/lib/sass/docs.scss +++ b/lib/sass/docs.scss @@ -778,8 +778,7 @@ hr { background-image: url("../img/android.png"); .device-content { - background-color: #000; - background-image: linear-gradient(to bottom, #111111 0%, #2b2b2b 100%); + background-color: #f2f2f2; } } } diff --git a/lib/sass/theme-android.scss b/lib/sass/theme-android.scss index c4ec3ed..99b3967 100644 --- a/lib/sass/theme-android.scss +++ b/lib/sass/theme-android.scss @@ -22,12 +22,12 @@ $line-height-default: 21px; // Colors // Main theme colors $primary-color: #33b5e5; -$chrome-color: #111; +$chrome-color: #dddddd; // Action colors -$default-color: #fff; -$positive-color: #81c700; -$negative-color: #f20754; +$default-color: #9a9a9a; +$positive-color: #99cc00; +$negative-color: #ff4444; // Bars $bar-base-height: 50px;