From 86e4e291bfda3365c0bb82bacb2b9990a86ce759 Mon Sep 17 00:00:00 2001 From: ARC Date: Sat, 25 Apr 2015 09:13:54 -0400 Subject: First Commit --- scss/ionic.app.scss | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 scss/ionic.app.scss (limited to 'scss') diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss new file mode 100644 index 00000000..9eb2f782 --- /dev/null +++ b/scss/ionic.app.scss @@ -0,0 +1,23 @@ +/* +To customize the look and feel of Ionic, you can override the variables +in ionic's _variables.scss file. + +For example, you might change some of the default colors: + +$light: #fff !default; +$stable: #f8f8f8 !default; +$positive: #387ef5 !default; +$calm: #11c1f3 !default; +$balanced: #33cd5f !default; +$energized: #ffc900 !default; +$assertive: #ef473a !default; +$royal: #886aea !default; +$dark: #444 !default; +*/ + +// The path for our ionicons font files, relative to the built CSS in www/css +$ionicons-font-path: "../lib/ionic/fonts" !default; + +// Include all of Ionic +@import "www/lib/ionic/scss/ionic"; + -- cgit v1.2.3 From bfdcdcccee146f924f3311b6955ce81d2dab226f Mon Sep 17 00:00:00 2001 From: PliablePixels Date: Fri, 10 Jul 2015 10:50:12 -0400 Subject: New skin and SCSS implementation --- scss/ionic.app.scss | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'scss') diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss index 9eb2f782..92c6706e 100644 --- a/scss/ionic.app.scss +++ b/scss/ionic.app.scss @@ -18,6 +18,24 @@ $dark: #444 !default; // The path for our ionicons font files, relative to the built CSS in www/css $ionicons-font-path: "../lib/ionic/fonts" !default; + +$stable: #00A0A0 !default; +$positive: #367588 !default; +$assertive: #cd5c5c !default; +$balanced: #66cdaa !default; + + +$button-stable-active-bg: #00B0B0 !default; +$button-stable-active-border: #00B0B0 !default; + +$dark: #008080 !default; +$button-stable-text: #FFFFFF !default; + +$button-border-radius: 15px !default; +$button-stable-border: #00A0A0 !default; + +$input-color-placeholder: #BBBBBB !default; + // Include all of Ionic @import "www/lib/ionic/scss/ionic"; -- cgit v1.2.3 From 89640e9b0212a2525ea132b1d11bb8962f5444dd Mon Sep 17 00:00:00 2001 From: PliablePixels Date: Thu, 16 Jul 2015 15:06:41 -0400 Subject: general formatting --- scss/ionic.app.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scss') diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss index 92c6706e..4dfc5cc8 100644 --- a/scss/ionic.app.scss +++ b/scss/ionic.app.scss @@ -36,6 +36,10 @@ $button-stable-border: #00A0A0 !default; $input-color-placeholder: #BBBBBB !default; +//$range-slider-box-shadow: 0 0 0px rgba(0,0,0,.3), 0 0px 0px rgba(0,0,0,0.2) !default; +//$range-slider-border-radius: 10% !default; +$range-positive-track-bg: #00A0A0 !default; + // Include all of Ionic @import "www/lib/ionic/scss/ionic"; -- cgit v1.2.3 From 10f5788d747d2f96027c0591fe332b74f9b9aac7 Mon Sep 17 00:00:00 2001 From: PliablePixels Date: Wed, 5 Aug 2015 17:59:26 -0400 Subject: Timeline feature (Experimental) --- scss/ionic.app.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss index 4dfc5cc8..a8ece2bc 100644 --- a/scss/ionic.app.scss +++ b/scss/ionic.app.scss @@ -36,10 +36,11 @@ $button-stable-border: #00A0A0 !default; $input-color-placeholder: #BBBBBB !default; -//$range-slider-box-shadow: 0 0 0px rgba(0,0,0,.3), 0 0px 0px rgba(0,0,0,0.2) !default; +$range-slider-box-shadow: 0 0 0px rgba(0,0,0,.3), 0 0px 0px rgba(0,0,0,0.2) !default; //$range-slider-border-radius: 10% !default; $range-positive-track-bg: #00A0A0 !default; + // Include all of Ionic @import "www/lib/ionic/scss/ionic"; -- cgit v1.2.3 From 076607ce4ae3b0cb67ed96f06b2e0a75a5c10f17 Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Wed, 16 Sep 2015 10:35:15 -0400 Subject: SCSS --- scss/ionic.app.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'scss') diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss index a8ece2bc..a2cc8b8b 100644 --- a/scss/ionic.app.scss +++ b/scss/ionic.app.scss @@ -16,6 +16,7 @@ $dark: #444 !default; */ // The path for our ionicons font files, relative to the built CSS in www/css +// FIXME: figure out what went wrong with SCSS $ionicons-font-path: "../lib/ionic/fonts" !default; -- cgit v1.2.3 From fe8e827a86ce2304d5deefc4c969d9ea7ce2bd79 Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Wed, 23 Sep 2015 15:43:35 -0400 Subject: SCSS wasn't working because various gulp tasks were not installed after platform add/remove --- scss/ionic.app.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scss') diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss index a2cc8b8b..ec111c0c 100644 --- a/scss/ionic.app.scss +++ b/scss/ionic.app.scss @@ -16,7 +16,6 @@ $dark: #444 !default; */ // The path for our ionicons font files, relative to the built CSS in www/css -// FIXME: figure out what went wrong with SCSS $ionicons-font-path: "../lib/ionic/fonts" !default; @@ -34,6 +33,8 @@ $button-stable-text: #FFFFFF !default; $button-border-radius: 15px !default; $button-stable-border: #00A0A0 !default; +$button-dark-border: #008080 !default; +$button-dark-active-border: #008080 !default; $input-color-placeholder: #BBBBBB !default; -- cgit v1.2.3 From 575c211ea3efc29f846b7b8ea97ea321cc9c49e1 Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Fri, 25 Sep 2015 12:05:31 -0400 Subject: use sanfran font for ios --- scss/ionic.app.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'scss') diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss index ec111c0c..d70cd29b 100644 --- a/scss/ionic.app.scss +++ b/scss/ionic.app.scss @@ -42,6 +42,7 @@ $range-slider-box-shadow: 0 0 0px rgba(0,0,0,.3), 0 0px 0px rgba(0,0,0,0.2) !d //$range-slider-border-radius: 10% !default; $range-positive-track-bg: #00A0A0 !default; +$font-family-sans-serif: -apple-system-font, "Helvetica Neue", HelveticaNeue, "Roboto", "Segoe UI", sans-serif !default; // Include all of Ionic @import "www/lib/ionic/scss/ionic"; -- cgit v1.2.3 From b17a027e9f600cf341ffa9061889ad4d93f8a468 Mon Sep 17 00:00:00 2001 From: Arjun Roychowdhury Date: Fri, 8 Jan 2016 18:03:09 +0530 Subject: circular navigation optimizations, scss inclusion Former-commit-id: a7369f5319348a2919957173f94926e77b03bfdb --- scss/angular-circular-navigation.scss | 615 ++++++++++++++++++++++++++++++++++ 1 file changed, 615 insertions(+) create mode 100644 scss/angular-circular-navigation.scss (limited to 'scss') diff --git a/scss/angular-circular-navigation.scss b/scss/angular-circular-navigation.scss new file mode 100644 index 00000000..ade1e6c9 --- /dev/null +++ b/scss/angular-circular-navigation.scss @@ -0,0 +1,615 @@ +// ------------------------------------- +// User defined +// ------------------------------------- + +$item-background-color: #0A833D; +$item-color: #ffffff; + +$button-small-size: 2em; +$button-middle-size: 3em; +$button-big-size: 4em; + +$li-small-top: 1.6em; +$li-middle-top: 2.6em; +$li-big-top: 3.5em; + +$a-small-size: 6em; +$a-middle-size: 8em; +$a-big-size: 10em; + + +// ------------------------------------- +// Sizing +// ------------------------------------- + +// are calculated +$wrapper-small-size: $a-small-size * 1.75; +$wrapper-middle-size: $a-middle-size * 1.75; +$wrapper-big-size: $a-big-size * 1.75; +$li-small-size: $a-small-size; +$li-middle-size: $a-middle-size; +$li-big-size: $a-big-size; + +// sizing buttons +.cn-button { + margin-top: - $button-middle-size / 2; + margin-left: - $button-middle-size / 2; + width: $button-middle-size; + height: $button-middle-size; +} +.cn-button.small { + margin-top: - $button-small-size / 2; + margin-left: - $button-small-size / 2; + width: $button-small-size; + height: $button-small-size; +} +.cn-button.big { + margin-top: - $button-big-size / 2; + margin-left: - $button-big-size / 2; + width: $button-big-size; + height: $button-big-size; +} + +// sizing wrapper +.cn-wrapper { + margin-top: - $wrapper-middle-size / 2; + margin-left: - $wrapper-middle-size / 2; + width: $wrapper-middle-size; + height: $wrapper-middle-size; +} +.cn-wrapper.small { + margin-top: - $wrapper-small-size / 2; + margin-left: - $wrapper-small-size / 2; + width: $wrapper-small-size; + height: $wrapper-small-size; +} +.cn-wrapper.big { + margin-top: - $wrapper-big-size / 2; + margin-left: - $wrapper-big-size / 2; + width: $wrapper-big-size; + height: $wrapper-big-size; +} + +// sizing items +.cn-wrapper li { + margin-top: - $li-middle-top; + margin-left: - $li-middle-size; + width: $li-middle-size; + height: $li-middle-size; +} +.cn-wrapper.small li { + margin-top: - $li-small-top; + margin-left: - $li-small-size; + width: $li-small-size; + height: $li-small-size; +} +.cn-wrapper.big li { + margin-top: - $li-big-top; + margin-left: - $li-big-size; + width: $li-big-size; + height: $li-big-size; +} + +.cn-wrapper li a { + right: - $a-middle-size / 2; + bottom: - $a-middle-size / 2; + width: $a-middle-size; + height: $a-middle-size; +} +.cn-wrapper.small li a { + right: - $a-small-size / 2; + bottom: - $a-small-size / 2; + width: $a-small-size; + height: $a-small-size; +} +.cn-wrapper.big li a { + right: - $a-big-size / 2; + bottom: - $a-big-size / 2; + width: $a-big-size; + height: $a-big-size; +} + + +// ------------------------------------- +// Main +// ------------------------------------- + +circular *, .circular * { + -moz-box-sizing: border-box; + box-sizing: border-box; + margin: 0; + padding: 0; + list-style: none; + position: relative +} + +circular, .circular { + position: absolute; + top: 100%; + left: 50%; +} + + +// ------------------------------------- +// central Button +// ------------------------------------- + +.cn-button { + position: absolute; + top: 100%; + left: 50%; + z-index: 11; + padding-top: 0em; + border: none; + border-radius: 50%; + background: none; + background-color: $item-background-color; + color: $item-color; + text-align: center; + font-weight: 700; + font-size: 1.3em; + text-transform: uppercase; + cursor: pointer; + -webkit-backface-visibility: hidden; + outline: 0; +} + +// ------------------------------------- +// Zooming +// ------------------------------------- +.cn-wrapper { + position: absolute; + top: 100%; + left: 50%; + z-index: 10; + border-radius: 50%; + background: transparent; + opacity: 0; + -webkit-transition: all .3s ease 0.3s; + -moz-transition: all .3s ease 0.3s; + transition: all .3s ease 0.3s; + -webkit-transform: scale(0.1); + -ms-transform: scale(0.1); + transform: scale(0.1); + pointer-events: none; + overflow: hidden; +} + +.opened-nav { + border-radius: 50%; + opacity: 1; + -webkit-transition: all .3s ease; + -moz-transition: all .3s ease; + transition: all .3s ease; + -webkit-transform: scale(1); + -ms-transform: scale(1); + transform: scale(1); + pointer-events: auto; +} + + +// ------------------------------------- +// basic Items +// ------------------------------------- + +.cn-wrapper li { + position: absolute; + top: 50%; + left: 50%; + overflow: hidden; + font-size: 1.3em; + -webkit-transition: all .3s ease; + -moz-transition: all .3s ease; + transition: all .3s ease; + -webkit-transform-origin: 100% 100%; + transform-origin: 100% 100%; + pointer-events: none; +} + +.cn-wrapper li a { + position: absolute; + display: block; + border-radius: 50%; + background: $item-background-color; + opacity: 0.7; + color: $item-color; + text-align: center; + text-decoration: none; + font-size: 1.2em; + line-height: 2.5; + -webkit-backface-visibility: hidden; + backface-visibility: hidden; + pointer-events: auto; + cursor: pointer; +} + +.cn-wrapper li a.is-active { + opacity: 1; +} + +.cn-wrapper li a:hover, +.cn-wrapper li a:active, +.cn-wrapper li a:focus { + opacity: 0.9; +} + +.cn-wrapper li a.is-active:hover, +.cn-wrapper li a.is-active:active, +.cn-wrapper li a.is-active:focus { + opacity: 0.9; +} +.cn-wrapper li a span { + position: relative; + top: 1.8em; + display: block; + font-size: .5em; + font-weight: 700; + text-transform: uppercase; +} + +.opened-nav li { + -webkit-transition: all .3s ease .3s; + -moz-transition: all .3s ease .3s; + transition: all .3s ease .3s; +} + + +// ------------------------------------- +// rotated items +// ------------------------------------- + +@mixin prefix($property, $value) { + @each $prefix in -webkit-, -ms-, '' { + #{$prefix}#{$property}: $value; + } +} + +$skew: 60deg; +// odd +.item-odd-left-5 { + @include prefix(transform, rotate(-105deg) skew($skew)); +} +.item-odd-left-4 { + @include prefix(transform, rotate(-63deg) skew($skew)); +} +.item-odd-left-3 { + @include prefix(transform, rotate(-21deg) skew($skew)); +} +.item-odd-left-2 { + @include prefix(transform, rotate(11deg) skew($skew)); +} +.item-odd-left-1 { + @include prefix(transform, rotate(23deg) skew($skew)); +} +.item-odd-center { + @include prefix(transform, rotate(75deg) skew($skew)); +} +.item-odd-right-1 { + @include prefix(transform, rotate(127deg) skew($skew)); +} +.item-odd-right-2 { + @include prefix(transform, rotate(139deg) skew($skew)); +} +.item-odd-right-3 { + @include prefix(transform, rotate(171deg) skew($skew)); +} +.item-odd-right-4 { + @include prefix(transform, rotate(213deg) skew($skew)); +} +.item-odd-right-5 { + @include prefix(transform, rotate(235deg) skew($skew)); +} + +// even +.item-even-left-5 { + @include prefix(transform, rotate(-69deg) skew($skew)); +} +.item-even-left-4 { + @include prefix(transform, rotate(-37deg) skew($skew)); +} +.item-even-left-3 { + @include prefix(transform, rotate(-5deg) skew($skew)); +} +.item-even-left-2 { + @include prefix(transform, rotate(27deg) skew($skew)); +} +.item-even-left-1 { + @include prefix(transform, rotate(59deg) skew($skew)); +} +.item-even-right-1 { + @include prefix(transform, rotate(91deg) skew($skew)); +} +.item-even-right-2 { + @include prefix(transform, rotate(123deg) skew($skew)); +} +.item-even-right-3 { + @include prefix(transform, rotate(155deg) skew($skew)); +} +.item-even-right-4 { + @include prefix(transform, rotate(187deg) skew($skew)); +} +.item-even-right-5 { + @include prefix(transform, rotate(219deg) skew($skew)); +} + +// ----- Default ----- +.cn-wrapper li { + @extend .item-odd-center; +} +// ----- Content ----- +.cn-wrapper li a { + @include prefix(transform, skew(- $skew) rotate(-75deg) scale(1)); +} + +// ----- items-1 ----- + .opened-nav.items-1 li:first-child { + @extend .item-odd-center; + } + +// ----- items-2 ----- + .opened-nav.items-2 li:first-child { + @extend .item-even-left-1; + } + .opened-nav.items-2 li:nth-child(2) { + @extend .item-even-right-1; + } + +// ----- items-3 ----- + .opened-nav.items-3 li:first-child { + @extend .item-odd-left-1; + } + + .opened-nav.items-3 li:nth-child(2) { + @extend .item-odd-center; + } + + .opened-nav.items-3 li:nth-child(3) { + @extend .item-odd-right-1; + } + +// ----- items-4 ----- + .opened-nav.items-4 li:first-child { + @extend .item-even-left-2; + } + + .opened-nav.items-4 li:nth-child(2) { + @extend .item-even-left-1; + } + + .opened-nav.items-4 li:nth-child(3) { + @extend .item-even-right-1; + } + + .opened-nav.items-4 li:nth-child(4) { + @extend .item-even-right-2; + } + +// ----- items-5 ----- + .opened-nav.items-5 li:first-child { + @extend .item-odd-left-2; + } + + .opened-nav.items-5 li:nth-child(2) { + @extend .item-odd-left-1; + } + + .opened-nav.items-5 li:nth-child(3) { + @extend .item-odd-center; + } + + .opened-nav.items-5 li:nth-child(4) { + @extend .item-odd-right-1; + } + + .opened-nav.items-5 li:nth-child(5) { + @extend .item-odd-right-2; + } + +// ----- items-6 ----- + .opened-nav.items-6 li:first-child { + @extend .item-even-left-3; + } + + .opened-nav.items-6 li:nth-child(2) { + @extend .item-even-left-2; + } + + .opened-nav.items-6 li:nth-child(3) { + @extend .item-even-left-1; + } + + .opened-nav.items-6 li:nth-child(4) { + @extend .item-even-right-1; + } + + .opened-nav.items-6 li:nth-child(5) { + @extend .item-even-right-2; + } + + .opened-nav.items-6 li:nth-child(6) { + @extend .item-even-right-3; + } + +// ----- items-7 ----- + .opened-nav.items-7 li:first-child { + @extend .item-odd-left-3; + } + + .opened-nav.items-7 li:nth-child(2) { + @extend .item-odd-left-2; + } + + .opened-nav.items-7 li:nth-child(3) { + @extend .item-odd-left-1; + } + + .opened-nav.items-7 li:nth-child(4) { + @extend .item-odd-center; + } + + .opened-nav.items-7 li:nth-child(5) { + @extend .item-odd-right-1; + } + + .opened-nav.items-7 li:nth-child(6) { + @extend .item-odd-right-2; + } + + .opened-nav.items-7 li:nth-child(7) { + @extend .item-odd-right-3; + } + +// ----- items-8 ----- + .opened-nav.items-8 li:first-child { + @extend .item-even-left-4; + } + + .opened-nav.items-8 li:nth-child(2) { + @extend .item-even-left-3; + } + + .opened-nav.items-8 li:nth-child(3) { + @extend .item-even-left-2; + } + + .opened-nav.items-8 li:nth-child(4) { + @extend .item-even-left-1; + } + + .opened-nav.items-8 li:nth-child(5) { + @extend .item-even-right-1; + } + + .opened-nav.items-8 li:nth-child(6) { + @extend .item-even-right-2; + } + + .opened-nav.items-8 li:nth-child(7) { + @extend .item-even-right-3; + } + + .opened-nav.items-8 li:nth-child(8) { + @extend .item-even-right-4; + } + +// ----- items-9 ----- + .opened-nav.items-9 li:first-child { + @extend .item-odd-left-4; + } + .opened-nav.items-9 li:nth-child(2) { + @extend .item-odd-left-3; + } + + .opened-nav.items-9 li:nth-child(3) { + @extend .item-odd-left-2; + } + + .opened-nav.items-9 li:nth-child(4) { + @extend .item-odd-left-1; + } + + .opened-nav.items-9 li:nth-child(5) { + @extend .item-odd-center; + } + + .opened-nav.items-9 li:nth-child(6) { + @extend .item-odd-right-1; + } + + .opened-nav.items-9 li:nth-child(7) { + @extend .item-odd-right-2; + } + + .opened-nav.items-9 li:nth-child(8) { + @extend .item-odd-right-3; + } + + .opened-nav.items-9 li:nth-child(9) { + @extend .item-odd-right-4; + } + +// ----- items-10 ----- + .opened-nav.items-10 li:first-child { + @extend .item-even-left-5; + } + + .opened-nav.items-10 li:nth-child(2) { + @extend .item-even-left-4; + } + + .opened-nav.items-10 li:nth-child(3) { + @extend .item-even-left-3; + } + + .opened-nav.items-10 li:nth-child(4) { + @extend .item-even-left-2; + } + + .opened-nav.items-10 li:nth-child(5) { + @extend .item-even-left-1; + } + + .opened-nav.items-10 li:nth-child(6) { + @extend .item-even-right-1; + } + + .opened-nav.items-10 li:nth-child(7) { + @extend .item-even-right-2; + } + + .opened-nav.items-10 li:nth-child(8) { + @extend .item-even-right-3; + } + + .opened-nav.items-10 li:nth-child(9) { + @extend .item-even-right-4; + } + + .opened-nav.items-10 li:nth-child(10) { + @extend .item-even-right-5; + } + +// ----- items-11 ----- + .opened-nav.items-11 li:first-child { + @extend .item-odd-left-5; + } + + .opened-nav.items-11 li:nth-child(2) { + @extend .item-odd-left-4; + } + + .opened-nav.items-11 li:nth-child(3) { + @extend .item-odd-left-3; + } + + .opened-nav.items-11 li:nth-child(4) { + @extend .item-odd-left-2; + } + + .opened-nav.items-11 li:nth-child(5) { + @extend .item-odd-left-1; + } + + .opened-nav.items-11 li:nth-child(6) { + @extend .item-odd-center; + } + + .opened-nav.items-11 li:nth-child(7) { + @extend .item-odd-right-1; + } + + .opened-nav.items-11 li:nth-child(8) { + @extend .item-odd-right-2; + } + + .opened-nav.items-11 li:nth-child(9) { + @extend .item-odd-right-3; + } + + .opened-nav.items-11 li:nth-child(10) { + @extend .item-odd-right-4; + } + + .opened-nav.items-11 li:nth-child(11) { + @extend .item-odd-right-5; + } -- cgit v1.2.3 From 374b1e58d415c5e2525a45654893516c798c5f44 Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Mon, 16 May 2016 04:50:06 -0400 Subject: #249 - new color scheme Former-commit-id: f4b8c44e19d528ee37ff4cfcee11610e908c0105 --- scss/ionic.app.scss | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'scss') diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss index d70cd29b..e801ae31 100644 --- a/scss/ionic.app.scss +++ b/scss/ionic.app.scss @@ -1,4 +1,7 @@ /* + +sass ionic.app.scss --style compressed >../www/css/ionic.app.min.css + To customize the look and feel of Ionic, you can override the variables in ionic's _variables.scss file. @@ -19,31 +22,31 @@ $dark: #444 !default; $ionicons-font-path: "../lib/ionic/fonts" !default; -$stable: #00A0A0 !default; -$positive: #367588 !default; +$stable: #2980b9 !default; +$positive: #2980b9 !default; $assertive: #cd5c5c !default; -$balanced: #66cdaa !default; +$balanced: #3498DB !default; -$button-stable-active-bg: #00B0B0 !default; -$button-stable-active-border: #00B0B0 !default; +$button-stable-active-bg: #2980b9 !default; +$button-stable-active-border: #2980b9 !default; -$dark: #008080 !default; +$dark: #256e9f !default; $button-stable-text: #FFFFFF !default; -$button-border-radius: 15px !default; -$button-stable-border: #00A0A0 !default; -$button-dark-border: #008080 !default; -$button-dark-active-border: #008080 !default; +$button-border-radius: 8px !default; +$button-stable-border: #2980b9 !default; +$button-dark-border: #256e9f !default; +$button-dark-active-border: #256e9f !default; $input-color-placeholder: #BBBBBB !default; $range-slider-box-shadow: 0 0 0px rgba(0,0,0,.3), 0 0px 0px rgba(0,0,0,0.2) !default; //$range-slider-border-radius: 10% !default; -$range-positive-track-bg: #00A0A0 !default; +$range-positive-track-bg: #2980b9 !default; $font-family-sans-serif: -apple-system-font, "Helvetica Neue", HelveticaNeue, "Roboto", "Segoe UI", sans-serif !default; // Include all of Ionic -@import "www/lib/ionic/scss/ionic"; +@import "../www/lib/ionic/scss/ionic"; -- cgit v1.2.3 From 23f880f303425d878891ac1a793235166df4fa3e Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Thu, 19 May 2016 19:49:27 -0400 Subject: nits and color tweaks Former-commit-id: 2701669af548c318a456f5ecbf206e2c9ca63418 --- scss/ionic.app.scss | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'scss') diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss index e801ae31..0d59941e 100644 --- a/scss/ionic.app.scss +++ b/scss/ionic.app.scss @@ -26,6 +26,7 @@ $stable: #2980b9 !default; $positive: #2980b9 !default; $assertive: #cd5c5c !default; $balanced: #3498DB !default; +$royal: #95A5A6 !default; $button-stable-active-bg: #2980b9 !default; @@ -39,6 +40,10 @@ $button-stable-border: #2980b9 !default; $button-dark-border: #256e9f !default; $button-dark-active-border: #256e9f !default; +$button-royal-active-bg: #95A5A6 !default; +$button-royal-active-order: #95A5A6 !default; +$button-royal-text: #000 !default; + $input-color-placeholder: #BBBBBB !default; $range-slider-box-shadow: 0 0 0px rgba(0,0,0,.3), 0 0px 0px rgba(0,0,0,0.2) !default; -- cgit v1.2.3 From 1f7363db5b096976817c7b4362169c48ead955c4 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 22 Aug 2016 11:20:14 -0400 Subject: tweak scss for dark buttons Former-commit-id: f403e43bc056ff57b90344227d6297d2d439a5b6 --- scss/ionic.app.scss | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'scss') diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss index 0d59941e..e9adb36f 100644 --- a/scss/ionic.app.scss +++ b/scss/ionic.app.scss @@ -26,19 +26,27 @@ $stable: #2980b9 !default; $positive: #2980b9 !default; $assertive: #cd5c5c !default; $balanced: #3498DB !default; -$royal: #95A5A6 !default; +$royal: #95A5A6 !default; +$bar-dark-bg: #256e9f !default; +$bar-dark-active-bg: #256e9f !default; + $button-stable-active-bg: #2980b9 !default; $button-stable-active-border: #2980b9 !default; - +/* $dark: #256e9f !default; +$button-dark-border: #256e9f !default; +$button-dark-active-border: #256e9f !default; +*/ + $button-stable-text: #FFFFFF !default; $button-border-radius: 8px !default; + + $button-stable-border: #2980b9 !default; -$button-dark-border: #256e9f !default; -$button-dark-active-border: #256e9f !default; + $button-royal-active-bg: #95A5A6 !default; $button-royal-active-order: #95A5A6 !default; -- cgit v1.2.3 From 6b84852df705b8c6804759d39cebf48f2e487d3a Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 22 Aug 2016 11:21:26 -0400 Subject: formatting Former-commit-id: 893b1441ba325f1aa62c9812d45754a4e76a58c3 --- scss/ionic.app.scss | 60 +++++++++++++++++++++++------------------------------ 1 file changed, 26 insertions(+), 34 deletions(-) (limited to 'scss') diff --git a/scss/ionic.app.scss b/scss/ionic.app.scss index e9adb36f..9bd630ee 100644 --- a/scss/ionic.app.scss +++ b/scss/ionic.app.scss @@ -20,46 +20,38 @@ $dark: #444 !default; // The path for our ionicons font files, relative to the built CSS in www/css $ionicons-font-path: "../lib/ionic/fonts" !default; +$stable: #2980b9 !default; +$positive: #2980b9 !default; +$assertive: #cd5c5c !default; +$balanced: #3498DB !default; +$royal: #95A5A6 !default; +$bar-dark-bg: #256e9f !default; +$bar-dark-active-bg: #256e9f !default; +$button-stable-active-bg: #2980b9 !default; +$button-stable-active-border: #2980b9 !default; - -$stable: #2980b9 !default; -$positive: #2980b9 !default; -$assertive: #cd5c5c !default; -$balanced: #3498DB !default; -$royal: #95A5A6 !default; -$bar-dark-bg: #256e9f !default; -$bar-dark-active-bg: #256e9f !default; - - - -$button-stable-active-bg: #2980b9 !default; -$button-stable-active-border: #2980b9 !default; /* $dark: #256e9f !default; $button-dark-border: #256e9f !default; $button-dark-active-border: #256e9f !default; */ -$button-stable-text: #FFFFFF !default; - -$button-border-radius: 8px !default; - - -$button-stable-border: #2980b9 !default; - - -$button-royal-active-bg: #95A5A6 !default; -$button-royal-active-order: #95A5A6 !default; -$button-royal-text: #000 !default; - -$input-color-placeholder: #BBBBBB !default; - -$range-slider-box-shadow: 0 0 0px rgba(0,0,0,.3), 0 0px 0px rgba(0,0,0,0.2) !default; +$button-stable-text: #FFFFFF !default; +$button-border-radius: 8px !default; +$button-stable-border: #2980b9 !default; +$button-royal-active-bg: #95A5A6 !default; +$button-royal-active-order: #95A5A6 !default; +$button-royal-text: #000 !default; +$input-color-placeholder: #BBBBBB !default; +$range-slider-box-shadow: 0 0 0px rgba(0, 0, 0, .3), +0 0px 0px rgba(0, 0, 0, 0.2) !default; //$range-slider-border-radius: 10% !default; -$range-positive-track-bg: #2980b9 !default; - -$font-family-sans-serif: -apple-system-font, "Helvetica Neue", HelveticaNeue, "Roboto", "Segoe UI", sans-serif !default; - +$range-positive-track-bg: #2980b9 !default; +$font-family-sans-serif: -apple-system-font, +"Helvetica Neue", +HelveticaNeue, +"Roboto", +"Segoe UI", +sans-serif !default; // Include all of Ionic -@import "../www/lib/ionic/scss/ionic"; - +@import "../www/lib/ionic/scss/ionic"; \ No newline at end of file -- cgit v1.2.3