diff --git a/assets/styles/app/_mixins/all.sass b/assets/styles/app/_mixins/all.sass index ed40fd4d..6ce21b22 100644 --- a/assets/styles/app/_mixins/all.sass +++ b/assets/styles/app/_mixins/all.sass @@ -11,12 +11,17 @@ z-index: 100 background-color: #fff border: 10px solid rgba(114, 131, 139, 0.6) - @include background-clip(padding-box) - @include border-radius(4px) - - - + background-clip: padding-box + border-radius 4px +@mixin clearfix + &:before, + &:after + content: "" + display: table + &:after + clear: both + diff --git a/assets/styles/app/auth.sass b/assets/styles/app/auth.sass index 6f6cc32b..b8f2a807 100644 --- a/assets/styles/app/auth.sass +++ b/assets/styles/app/auth.sass @@ -8,7 +8,7 @@ width: 400px min-width: auto max-height: 400px - @include border-radius(8px) + border-radius: 8px h2 color: #919191 diff --git a/assets/styles/app/charm.sass b/assets/styles/app/charm.sass index a53e3de2..80842fa5 100644 --- a/assets/styles/app/charm.sass +++ b/assets/styles/app/charm.sass @@ -4,8 +4,6 @@ .pro #CHARM_TAB display: block - -webkit-transform: translateY(0) rotate(270deg) !important - -moz-transform: translateY(0) rotate(270deg) !important transform: translateY(0) rotate(270deg) !important background-image: url(/images/ui/charmtab.png) margin-left: -135px !important @@ -14,6 +12,4 @@ left: 100% !important #CHARM_TAB:hover - -webkit-transform: translateY(-7px) rotate(270deg) !important - -moz-transform: translateY(-7px) rotate(270deg) !important transform: translateY(-7px) rotate(270deg) !important diff --git a/assets/styles/app/components/loader.sass b/assets/styles/app/components/loader.sass index c91719b4..951987ae 100644 --- a/assets/styles/app/components/loader.sass +++ b/assets/styles/app/components/loader.sass @@ -60,7 +60,6 @@ position : absolute top : 0 left : 0 - -webkit-animation : bounce 1.5s infinite ease-in-out animation : bounce 1.5s infinite ease-in-out .load-circle1 @@ -68,22 +67,11 @@ .load-circle2 background-color : #bdc5c5 - -webkit-animation-delay : -0.5s animation-delay : -0.5s -@-webkit-keyframes bounce - 0%, 100% - -webkit-transform : scale(0.0) - - 60% - -webkit-transform : scale(1.0) - - @keyframes bounce 0%, 100% transform : scale(0.0) - -webkit-transform : scale(0.0) 60% transform: scale(1.0) - -webkit-transform : scale(1.0) diff --git a/assets/styles/app/forms.scss b/assets/styles/app/forms.scss index 5b25d75f..7bf32d58 100644 --- a/assets/styles/app/forms.scss +++ b/assets/styles/app/forms.scss @@ -106,7 +106,7 @@ input, textarea { border: 1px solid #ddd; font-size: 13px; - @include border-radius(1px); + border-radius: 1px } input { margin-top: 4px; @@ -183,14 +183,14 @@ color: white; text-shadow: 2px 2px 0 #666; cursor: hand; - @include border-radius(6px); + border-radius: 6px; background-color: #19A509; - @include background-image(linear-gradient(#3f9c33 0%, #348629 100%)); + background-image: linear-gradient(#3f9c33, #348629); &:hover { - @include background-image(linear-gradient(#1CBE0A 0%, #158F07 100%)); + background-image: linear-gradient(#1CBE0A, #158F07); } &[disabled] { - @include background-image(linear-gradient(#ddd 0%, #ccc 100%)); + background-image: linear-gradient(#ddd, #ccc); color: #f6f6f6; text-shadow: 2px 2px 0 #aaa; } diff --git a/assets/styles/app/getting_started.sass b/assets/styles/app/getting_started.sass index 109f5a98..252db939 100644 --- a/assets/styles/app/getting_started.sass +++ b/assets/styles/app/getting_started.sass @@ -2,7 +2,6 @@ width: 850px margin: 0 auto padding-top: 30px - font-family: 'Source Sans Pro', Helvetica, sans-serif font-size: 17px line-height: 26px text-align: center diff --git a/assets/styles/app/github.sass b/assets/styles/app/github.sass index 876b34b0..87374820 100644 --- a/assets/styles/app/github.sass +++ b/assets/styles/app/github.sass @@ -32,7 +32,6 @@ text-shadow: 0 0 10px #522600 pointer-events: auto - - @include rotate(45deg) - @include box-shadow(rgba(black, 0.5) 1px 1px 10px, rgba(black, 0.07) 0 0 3px 1px inset) + transform: rotate(45deg) + box-shadow: rgba(black, 0.5) 1px 1px 10px, rgba(black, 0.07) 0 0 3px 1px inset diff --git a/assets/styles/app/left/list.sass b/assets/styles/app/left/list.sass index ddcc8c4b..2c88d646 100644 --- a/assets/styles/app/left/list.sass +++ b/assets/styles/app/left/list.sass @@ -83,7 +83,7 @@ p margin: 0 -10px 0 -10px padding: 12px 35px 12px 73px - @include box-shadow($color-shadow-list-info 0 1px 8px 0 inset) + box-shadow: $color-shadow-list-info 0 1px 8px 0 inset .indicator display: none @@ -102,7 +102,7 @@ width: 20px height: 20px border: 1px solid $color-border-normal - @include rotate(45deg) + transform: rotate(45deg) &.selected .indicator display: block diff --git a/assets/styles/app/main/annotations.sass b/assets/styles/app/main/annotations.sass index bb5cd5d7..03554d49 100644 --- a/assets/styles/app/main/annotations.sass +++ b/assets/styles/app/main/annotations.sass @@ -1,9 +1,9 @@ @import "app/_mixins/all" #annotations + @include clearfix margin: 8px 0 25px 12px padding: 12px 0 0 0 - @include clearfix a text-decoration: underline diff --git a/assets/styles/app/main/list.sass b/assets/styles/app/main/list.sass index 497c5797..b5615782 100644 --- a/assets/styles/app/main/list.sass +++ b/assets/styles/app/main/list.sass @@ -39,10 +39,10 @@ table.list white-space: normal td:first-child - @include border-left-radius(4px) + border-left-radius: 4px td:last-child - @include border-right-radius(4px) + border-right-radius: 4px tr.message, td.message width: 100% diff --git a/assets/styles/app/main/log.sass b/assets/styles/app/main/log.sass index f59d964e..0adf03b3 100644 --- a/assets/styles/app/main/log.sass +++ b/assets/styles/app/main/log.sass @@ -123,8 +123,8 @@ pre#log border: 1px solid #bbb border-top-color: #ddd border-bottom-color: #bbb - @include border-radius(8px) - @include background(linear-gradient(#fff, #e0e0e0)) + border-radius: 8px + background: linear-gradient(#fff, #e0e0e0) label display: none @@ -149,8 +149,8 @@ pre#log width: 8px height: 8px background-color: #aaa - @include border-radius(4px) - @include box-shadow(white 1px 1px 2px) + border-radius: 4px + box-shadow: $white 1px 1px 2px &.active .status background-color: #6b0 diff --git a/assets/styles/app/main/summary.sass b/assets/styles/app/main/summary.sass index b742e00f..132d20af 100644 --- a/assets/styles/app/main/summary.sass +++ b/assets/styles/app/main/summary.sass @@ -23,7 +23,7 @@ #new-summary @include clearfix - @include border-radius(4px) + border-radius: 4px padding: 0 11px 0 51px position: relative min-height: 155px @@ -97,7 +97,7 @@ text-decoration: underline .build-status - @include border-radius(4px) + border-radius: 4px color: white padding: 8px 0 font-size: 16px diff --git a/assets/styles/app/main/tools.sass b/assets/styles/app/main/tools.sass index 71dedd0f..53ecc904 100644 --- a/assets/styles/app/main/tools.sass +++ b/assets/styles/app/main/tools.sass @@ -22,7 +22,7 @@ background-position: 6px 7px, right 9px center background-color: #a6adad background-repeat: no-repeat - @include border-radius(4px) + border-radius: 4px cursor: pointer float: right @@ -38,7 +38,7 @@ top: -4px width: 140px background-color: #a6adad - @include border-bottom-radius(4px) + border-bottom-radius: 4px a display: block color: $white @@ -47,7 +47,7 @@ &:hover:not(.disabled) background-color: #909393 &:last-child - @include border-bottom-radius(4px) + border-bottom-radius: 4px &.disabled cursor: default color: $color-link-disabled diff --git a/assets/styles/app/maximize.sass b/assets/styles/app/maximize.sass index deb4a98a..18eb40c0 100644 --- a/assets/styles/app/maximize.sass +++ b/assets/styles/app/maximize.sass @@ -13,7 +13,7 @@ height: 20px background-image: inline-image('ui/slider-open.svg') background-position: 6px 5px - @include border-bottom-left-radius(4px) + border-bottom-left-radius: 4px display: none @media #{$medium-up} diff --git a/assets/styles/app/popup.sass b/assets/styles/app/popup.sass index ca551bdd..346862d7 100644 --- a/assets/styles/app/popup.sass +++ b/assets/styles/app/popup.sass @@ -21,7 +21,7 @@ margin: -200px 0 0 -200px padding: 20px @include popup - @include box-sizing(border-box) + box-sizing: border-box .close position: absolute @@ -48,7 +48,7 @@ background-color: $color-bg-pre margin: 0 padding: 10px 20px - @include border-radius(4px) + border-radius: 4px #status-images display: none @@ -67,7 +67,7 @@ padding: 4px resize: vertical margin-bottom: 0px - @include border-radius(3px) + border-radius: 3px p:last-child margin-top: 10px @@ -93,7 +93,7 @@ border: 1px solid $color-border-light width: 505px padding: 4px - @include border-radius(3px) + border-radius: 3px #regenerate-key, #regeneration-success display: none diff --git a/assets/styles/app/pro.sass b/assets/styles/app/pro.sass index a8c8e9d1..2f42c4ce 100644 --- a/assets/styles/app/pro.sass +++ b/assets/styles/app/pro.sass @@ -141,7 +141,7 @@ background-color: $color-bg-slider cursor: pointer background: transparent url(/images/ui/slider-closed.png) no-repeat 3px 38px - @include border-top-left-radius(4px) + border-top-left-radius: 4px &:hover background-color: $color-border-slider-hover diff --git a/assets/styles/app/profile.sass b/assets/styles/app/profile.sass index 7e234f30..ffa37ae6 100644 --- a/assets/styles/app/profile.sass +++ b/assets/styles/app/profile.sass @@ -14,7 +14,7 @@ width: 100px height: 100px margin: 3px 20px 0 0 - @include border-radius(100px) + border-radius: 100px background-color: $color-bg-light dl.profile diff --git a/assets/styles/app/profile/hooks.sass b/assets/styles/app/profile/hooks.sass index aeb2145a..8202b3f5 100644 --- a/assets/styles/app/profile/hooks.sass +++ b/assets/styles/app/profile/hooks.sass @@ -11,7 +11,6 @@ #hooks, #unadministerable-hooks .travis-switch font-size: 10px - // @include list-base margin-top: 10px li diff --git a/assets/styles/app/right/lists.sass b/assets/styles/app/right/lists.sass index d9240341..7a056110 100644 --- a/assets/styles/app/right/lists.sass +++ b/assets/styles/app/right/lists.sass @@ -15,7 +15,7 @@ border-bottom-color: $color-border-light white-space: nowrap cursor: pointer - @include border-top-radius(2px) + border-top-radius: 2px font-size: 10px &:hover @@ -100,5 +100,5 @@ width: 8px height: 8px margin-right: 3px - @include border-radius(4px) + border-radius: 4px diff --git a/assets/styles/app/right/sponsors.sass b/assets/styles/app/right/sponsors.sass index afbe2b8c..fa06a915 100644 --- a/assets/styles/app/right/sponsors.sass +++ b/assets/styles/app/right/sponsors.sass @@ -11,7 +11,7 @@ width: 205px margin: 0 0 8px 0 border: 1px solid $color-border-light - @include border-radius(8px) + border-radius: 8px list-style-type: none a @@ -21,7 +21,7 @@ z-index: 200 overflow: hidden width: 205px - @include border-radius(8px) + border-radius: 8px .platinum height: 130px diff --git a/assets/styles/app/settings.sass b/assets/styles/app/settings.sass index 005c5cfc..24986523 100644 --- a/assets/styles/app/settings.sass +++ b/assets/styles/app/settings.sass @@ -237,14 +237,8 @@ padding-bottom: 10px overflow: auto display: flex - display: -webkit-flex - display: -moz-flex - -webkit-align-items: center - -moz-align-items: center align-items: center justify-content: left - -webkit-justify-content: left - -moz-justify-content: left border-bottom: 1px solid #F1F1F1 width: 100% @@ -287,12 +281,6 @@ max-width: 390px min-height: 25px display: flex - display: -webkit-flex - display: -moz-flex - -webkit-align-items: center - -moz-align-items: center align-items: center justify-content: left - -webkit-justify-content: left - -moz-justify-content: left padding: 8px 12px