From 39ec89a22160c2669bcce6e2ae211f937c9acd95 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sat, 11 Apr 2015 13:37:24 -0400 Subject: [PATCH 01/28] Remove unused list classes --- app/assets/stylesheets/app/_main.scss | 48 +------------------ .../stylesheets/app/components/panels.scss | 4 -- 2 files changed, 1 insertion(+), 51 deletions(-) diff --git a/app/assets/stylesheets/app/_main.scss b/app/assets/stylesheets/app/_main.scss index 079718675..67e524b15 100644 --- a/app/assets/stylesheets/app/_main.scss +++ b/app/assets/stylesheets/app/_main.scss @@ -10,35 +10,15 @@ a:focus { text-decoration: none; } -// -- general ------------------- -.truncate { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} .ellipsis { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; } -.multiline-ellipsis { - overflow: hidden; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - text-overflow: -o-ellipsis-lastline; -} .no-wrap { white-space: nowrap; } -.noselect { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} + .img-rounded { border-radius: $border-radius-base; } @@ -116,15 +96,8 @@ input[type=week] { } // -- lists --------------------- -.list-inline-piped { - > li + li { - border-left: 1px solid $brand-divider; - padding-left: 5px + 4px; // + 4px accounts for inline-block whitespace - } -} .list-inline-media { - // @extend .list-inline; display: inline-block; > li { @@ -137,25 +110,6 @@ input[type=week] { } } -.list-piped { - // @extend .list-inline; - - > li + li { - border-left: 1px solid $brand-divider; - padding-left: 5px + 4px; // + 4px accounts for inline-block whitespace - } -} - -.list-grid { - // @extend .list-reset; - @include clearfix; - - > li { - float: left; - padding: $padding-small-vertical; - } -} - // pill lists .pill-hover { border-radius: 50px; diff --git a/app/assets/stylesheets/app/components/panels.scss b/app/assets/stylesheets/app/components/panels.scss index 581be2992..536a9ad4a 100644 --- a/app/assets/stylesheets/app/components/panels.scss +++ b/app/assets/stylesheets/app/components/panels.scss @@ -70,10 +70,6 @@ h6.panel-title { border-radius: 0; } -.panel-body > .list-grid { - margin: - $padding-small-vertical; -} - .panel-group { .panel + .panel { margin-top: 15px; From 4fb0d91859f4e188838a8357361137748ab12058 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sat, 11 Apr 2015 13:40:46 -0400 Subject: [PATCH 02/28] Remove duplicated text styles These are being overridden in the browser by `utilities/_type` --- app/assets/stylesheets/app/_main.scss | 36 --------------------------- 1 file changed, 36 deletions(-) diff --git a/app/assets/stylesheets/app/_main.scss b/app/assets/stylesheets/app/_main.scss index 67e524b15..73fe78694 100644 --- a/app/assets/stylesheets/app/_main.scss +++ b/app/assets/stylesheets/app/_main.scss @@ -23,45 +23,9 @@ a:focus { border-radius: $border-radius-base; } -// -- headers ------------------- -h1, h2, h3, h4, h5, h6 { - font-family: $font-family-sans-serif; - font-weight: bold; - line-height: $headings-line-height; -} -h1, .h1 { - font-size: $font-size-h1; // 30px/48px - line-height: 4rem; -} -h2, .h2 { - font-size: $font-size-h2; // 30px/36px - line-height: 3rem; -} -h3, .h3 { - font-size: $font-size-h3; // 24px/30px - line-height: 2.5rem; -} -h4, .h4 { - font-size: $font-size-h4; // 18px/24px - line-height: 2rem; -} -h5, .h5 { - font-size: $font-size-h5; // 16px/24px - line-height: 2rem; -} -h6, .h6 { - font-size: $font-size-h6; // 14px/18px - line-height: 1.5rem; -} - // -- code ---------------------- -pre, code, samp { - font-family: $font-family-monospace; - font-size: inherit; -} code { color: $red; - background-color: $gray-6; } mark, .mark { From 755a97e7bb981ed2a40215d82ad2f94c4f8d45de Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sat, 11 Apr 2015 15:33:17 -0400 Subject: [PATCH 03/28] Remove a *lot* of completely unused CSS --- .../app/components/accordion-grid.scss | 8 -- .../stylesheets/app/components/bounty.scss | 18 --- .../stylesheets/app/components/brand.scss | 13 -- .../stylesheets/app/components/comments.scss | 29 ----- .../stylesheets/app/components/counter.scss | 15 --- .../stylesheets/app/components/cue.scss | 17 --- .../stylesheets/app/components/devbar.scss | 17 --- .../app/components/discussion.scss | 3 - .../stylesheets/app/components/drawer.scss | 27 ---- .../app/components/general-copy.scss | 101 --------------- .../app/components/img_overlay.scss | 11 +- .../stylesheets/app/components/page.scss | 4 - .../app/components/quote-slider.scss | 97 --------------- .../stylesheets/app/components/team-grid.scss | 115 ------------------ app/assets/stylesheets/app/slop.scss | 98 --------------- .../app/temp/style-guide-updates.scss | 9 +- app/assets/stylesheets/base/_type.scss | 4 - 17 files changed, 2 insertions(+), 584 deletions(-) delete mode 100644 app/assets/stylesheets/app/components/bounty.scss delete mode 100644 app/assets/stylesheets/app/components/comments.scss delete mode 100644 app/assets/stylesheets/app/components/cue.scss delete mode 100644 app/assets/stylesheets/app/components/devbar.scss delete mode 100644 app/assets/stylesheets/app/components/discussion.scss delete mode 100644 app/assets/stylesheets/app/components/drawer.scss delete mode 100644 app/assets/stylesheets/app/components/general-copy.scss delete mode 100644 app/assets/stylesheets/app/components/quote-slider.scss delete mode 100644 app/assets/stylesheets/app/components/team-grid.scss diff --git a/app/assets/stylesheets/app/components/accordion-grid.scss b/app/assets/stylesheets/app/components/accordion-grid.scss index 27fd452df..dc2eedb99 100644 --- a/app/assets/stylesheets/app/components/accordion-grid.scss +++ b/app/assets/stylesheets/app/components/accordion-grid.scss @@ -52,11 +52,3 @@ } } } - -.accordian-grid { - -} - -// -- Delta's ------------ -// -// http://assembly.com/about diff --git a/app/assets/stylesheets/app/components/bounty.scss b/app/assets/stylesheets/app/components/bounty.scss deleted file mode 100644 index d0e7cb512..000000000 --- a/app/assets/stylesheets/app/components/bounty.scss +++ /dev/null @@ -1,18 +0,0 @@ -.bounty-description { - h1 { - font-size: $font-size-h3; - } - - h2 { - font-size: $font-size-h4; - } - - h3, - h4 { - font-size: $font-size-h5; - } - - p { - color: $gray-5; - } -} diff --git a/app/assets/stylesheets/app/components/brand.scss b/app/assets/stylesheets/app/components/brand.scss index 9173ae07b..75327c918 100644 --- a/app/assets/stylesheets/app/components/brand.scss +++ b/app/assets/stylesheets/app/components/brand.scss @@ -1,19 +1,6 @@ -// Catchall baseclass - -.navbar-brand { - font-size: 18px; -} - .brand { font-weight: 800; letter-spacing: 1.5pt; text-transform: uppercase; line-height: inherit; - - > .icon { - font-size: 32px; - vertical-align: middle; - position: relative; - top: -1px; - } } diff --git a/app/assets/stylesheets/app/components/comments.scss b/app/assets/stylesheets/app/components/comments.scss deleted file mode 100644 index 2a1da9114..000000000 --- a/app/assets/stylesheets/app/components/comments.scss +++ /dev/null @@ -1,29 +0,0 @@ -.comments-header { - // - .comments-filter { - a { - color:$black; - opacity:0.5; - // - &:hover, &.active { - opacity:1; - } - } - } -} -.comments-footer { - // - &:before { - content: ""; - position: absolute; - bottom: 0; - left: -3.25rem; - width: 50px; - height: 80%; - background: #fff; - } - ::-webkit-input-placeholder { color:#777; } - ::-moz-placeholder { color:#777; opacity: 1; } - :-ms-input-placeholder { color:#777; } - input:-moz-placeholder { color:#777; opacity: 1; } -} diff --git a/app/assets/stylesheets/app/components/counter.scss b/app/assets/stylesheets/app/components/counter.scss index 9a714d632..f6072c2ca 100644 --- a/app/assets/stylesheets/app/components/counter.scss +++ b/app/assets/stylesheets/app/components/counter.scss @@ -2,18 +2,3 @@ @include clearfix; border: 1px solid $gray-5; } - -.counter-btn { - float: left; - border: none; - - &.active { - cursor: default; - } -} - -.counter-badge { - float: right; - color: $gray-2; - background-color: transparent; -} diff --git a/app/assets/stylesheets/app/components/cue.scss b/app/assets/stylesheets/app/components/cue.scss deleted file mode 100644 index 23328b680..000000000 --- a/app/assets/stylesheets/app/components/cue.scss +++ /dev/null @@ -1,17 +0,0 @@ -.cue { - margin: 0 auto; - color: white; - font-size: $font-size-small; - - .icon { - font-size: 24px; - margin: 0 6px; - } -} - -.cue-container { - z-index: 0; - left: 0; - right: 0; - padding: 24px 0; -} diff --git a/app/assets/stylesheets/app/components/devbar.scss b/app/assets/stylesheets/app/components/devbar.scss deleted file mode 100644 index e3327f89c..000000000 --- a/app/assets/stylesheets/app/components/devbar.scss +++ /dev/null @@ -1,17 +0,0 @@ -.devbar:before { - display: block; - content: ''; - background: url(image-path('devbar.png')) repeat-x; - height: 4px; - width: 100%; -} - -@media -(-webkit-min-device-pixel-ratio: 1.5), -(min-resolution: 144dpi){ - /* Retina-specific stuff here */ - - .devbar:before { - background-size: 18px 6px; - } -} diff --git a/app/assets/stylesheets/app/components/discussion.scss b/app/assets/stylesheets/app/components/discussion.scss deleted file mode 100644 index eb023d9f9..000000000 --- a/app/assets/stylesheets/app/components/discussion.scss +++ /dev/null @@ -1,3 +0,0 @@ -.discussion { - padding: 0 20px; -} diff --git a/app/assets/stylesheets/app/components/drawer.scss b/app/assets/stylesheets/app/components/drawer.scss deleted file mode 100644 index a655957a1..000000000 --- a/app/assets/stylesheets/app/components/drawer.scss +++ /dev/null @@ -1,27 +0,0 @@ -/** - * ReactCSSTransition `drawer` - * Notes: `opacity` is initialized at 0.01 and not 0 - * so that React can listen to the `transitionend` event. - */ - -.drawer-enter { - max-height: 0px; - opacity: 0.01; - - &.drawer-enter-active { - max-height: 500px; - opacity: 1; - transition: max-height 1.2s ease, opacity 1.2s ease; - } -} - -.drawer-leave { - max-height: 500px; - opacity: 1; - - &.drawer-leave-active { - max-height: 0px; - opacity: 0.01; - transition: max-height 0.8s ease, opacity 0.8s ease; - } -} diff --git a/app/assets/stylesheets/app/components/general-copy.scss b/app/assets/stylesheets/app/components/general-copy.scss deleted file mode 100644 index ff3fa3bcf..000000000 --- a/app/assets/stylesheets/app/components/general-copy.scss +++ /dev/null @@ -1,101 +0,0 @@ -/* >> General Copy Component >>>>>>>>>>>>>>>>>>>> -=========================================== */ - -// -- Base Components ------------ -.general-copy { - @import 'app/temp/style-guide-updates'; // < details: https://assembly.com/meta/bounties/1038 - // - position: relative; - overflow: hidden; - padding-top: 3rem; - padding-bottom: 3rem; - background-color: $gray-6; - // - .footer { // bootstrap overwrite - margin:0; - padding:0; - border: none; - } - > .header, > .main, > .footer { - position: relative; - z-index: 5; - @extend .text-2; - p { - @extend .text-2; - } - } - .excerpt-header { - padding: 10rem 4rem 4rem 4rem; - background-image: url(http://placehold.it/1440x450/8B909A/91969f&text=background+img); - background-position: center; - background-size: cover; - background-repeat: no-repeat; - @media screen and (min-width: 768px) { - background-image: url(http://placehold.it/2560x900/8B909A/91969f&text=background+img); - } - // - &.text-light { - color: $white; - } - } - .left-offset { - margin-left: 0; - padding: 0 0 2rem 0; - @media screen and (min-width: 768px) { - padding-right: 30px; - } - @media screen and (min-width: 1160px) { - margin-left: -6rem; - } - } - .vertical-offset { - margin-top: -15px; - margin-bottom: 10px; - } - .caption-left { - figcaption { - text-align: left; - } - } - .caption-center { - figcaption { - text-align: center; - } - } - .caption-right { - figcaption { - text-align: right; - } - } - figure { - figcaption { - padding-top: 0.5rem; - color: $gray-2; - } - } -} - - -// -- Delta's ------------ -// -// http://assembly.com/about - -.general-copy { - padding-top: 5rem; - padding-bottom: 5rem; - // - h2, h3, p { - margin-top: 0; - margin-bottom: 2rem; - } - .excerpt-header { - background-image: url(http://placehold.it/1440x450/8B909A/91969f&text=background+img); - @media screen and (min-width: 768px) { - background-image: url(http://placehold.it/2560x900/8B909A/91969f&text=background+img); - } - // - .text-light { - color: $white; - } - } -} diff --git a/app/assets/stylesheets/app/components/img_overlay.scss b/app/assets/stylesheets/app/components/img_overlay.scss index 20f456201..6e4f2047c 100644 --- a/app/assets/stylesheets/app/components/img_overlay.scss +++ b/app/assets/stylesheets/app/components/img_overlay.scss @@ -1,12 +1,3 @@ -.overlay, -.img-overlay { +.overlay { position: relative; } - -.overlay-content, -.img-overlay-content { - position: absolute; - bottom: 0; - width: 100%; - color: white; -} diff --git a/app/assets/stylesheets/app/components/page.scss b/app/assets/stylesheets/app/components/page.scss index 77d30f350..441f94cc3 100644 --- a/app/assets/stylesheets/app/components/page.scss +++ b/app/assets/stylesheets/app/components/page.scss @@ -8,10 +8,6 @@ padding-top: $line-height-computed * 2; } -.page-with-header { - padding-top: 0; -} - .page-alert { margin-top: - $line-height-computed * 2; border-top: none; diff --git a/app/assets/stylesheets/app/components/quote-slider.scss b/app/assets/stylesheets/app/components/quote-slider.scss deleted file mode 100644 index feaef6994..000000000 --- a/app/assets/stylesheets/app/components/quote-slider.scss +++ /dev/null @@ -1,97 +0,0 @@ -/* >> Quote Slider Component >>>>>>>>>>>>>>>>>>>> -=========================================== */ - -/* --- HTML Pattern ---------------- -
-
-

Section Header Content

-
-
-

Section Main Content

-
-
-

Section Footer Content

-
-
-*/ - -// -- Base Component ------------ -.quote-slider { - .carousel { - position: relative; - text-align: center; - } - .item { - width: 480px - } - .header { - color: $gray-3; - margin: 0 0 1.5rem 0; - // - a { - color: $gray-2; - // - &:hover { - text-decoration: underline; - } - &:last-child { - color: $gray-3; - } - } - } - .quote-avatar { - display: inline-block; - margin: 0 0 1rem 0; - // - img { - width: 8rem; - -webkit-border-radius: 4rem; - -moz-border-radius: 4rem; - border-radius: 4rem; - } - } - h3, p { - margin: 0; - } - .main { - margin: 0 0 3.5rem 0; - } - .owl-theme .owl-controls .owl-page { - vertical-align: middle; - width: 3rem; - height: 3rem; - // - &.active { - width: 4rem; - height: 4rem; - } - } - .owl-theme .owl-controls .owl-page span { - margin: 0 auto; - position: relative; - top: 50%; - -webkit-transform: translateY(-50%); - -moz-transform: translateY(-50%); - transform: translateY(-50%); - background: $gray-3; - } - .owl-theme .owl-controls .owl-page.active span { - width: 100%; - height: 100%; - background: transparent url('/assets/quote-slider-nav-active.png') no-repeat; - background-size: cover; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - opacity: 1; - } -} - -// -- Delta's ------------ -// -// http://assembly.com/about - -.quote-slider-about { - // background-color: $gray-4; -} diff --git a/app/assets/stylesheets/app/components/team-grid.scss b/app/assets/stylesheets/app/components/team-grid.scss deleted file mode 100644 index b12e17b21..000000000 --- a/app/assets/stylesheets/app/components/team-grid.scss +++ /dev/null @@ -1,115 +0,0 @@ -/* >> Team Grid Unit Component >>>>>>>>>>>>>>>>>>>> -=========================================== */ - -// -- Base Components ------------ -.team-grid-unit { - @import 'app/temp/style-guide-updates'; // < details: https://assembly.com/meta/bounties/1038 - // - position: relative; - padding-top: 5rem; - padding-bottom: 5rem; - .footer { // bootstrap overwrite - margin:0; - padding:0; - border: none; - } - > .header, > .main, > .footer { - position: relative; - z-index: 5; - @extend .text-2; - p { - @extend .text-2; - } - } - > .header { - // - p { - margin-bottom: 2rem; - } - } -} - -.team-grid { - > ul { - margin: 0; - padding: 0; - text-align: center; - @media screen and (min-width: 768px){ - text-align: left; - } - // - > li { - display: inline-block; - margin: 0 0 3rem 0; - padding: 0 2.25rem 0 0; - list-style-type: none; - @media screen and (min-width: 768px){ - width:33.33333% - } - @media screen and (min-width: 992px){ - width: auto; - } - // - > a { - // - &:first-child { - display: block; - margin-bottom: 0.5rem; - // - &:hover { - background-color: $black; - } - } - > img { - width: 100%; - @media screen and (min-width: 992px){ - width: 200px; - } - // - &:hover { - opacity: 0.5; - } - } - } - } - a.nametag { - display: block; - margin-bottom: 0.75rem; - font-weight: bold; - color:$black; - // - &:hover { - text-decoration: underline; - } - } - } - ul.social-row { - margin: 0; - padding: 0; - // - li { - display: inline-block; - margin: 0 0.5rem 0 0; - padding: 0; - list-style-type: none; - } - a { - display: block; - width: 1.5rem; - // - svg { - fill: $gray-3 - } - // - &:hover { - svg { - fill: $gray-2 - } - } - } - } -} - -// -- Delta's ------------ -// -// http://assembly.com/about diff --git a/app/assets/stylesheets/app/slop.scss b/app/assets/stylesheets/app/slop.scss index 175e7b096..ee79ced31 100644 --- a/app/assets/stylesheets/app/slop.scss +++ b/app/assets/stylesheets/app/slop.scss @@ -5,21 +5,6 @@ $hero-secondary: #CBCBBC; $text-copy: #353439; $text-accent: #BC9454; -// $home-primary: desaturate(darken($text-accent, 30%), 15%); -// $home-primary: desaturate(darken($brand-primary, 35%), 20%); -$home-primary: darken(#3E90CA, 30%); -$home-secondary: #A8D7F9; - -$product-helpful: #494d52; -$product-family-table: #77b8b4; -$product-buckets: #f9d233; -$product-really-good-emails: #ff6560; -$product-assembly-meta: darken(#2b8ec3, 2%); - -$user-whale: #63a4ae; -$user-chexee: #98658e; -$user-davidkaneda: #848C24; - .hero { background: linear-gradient(to bottom, transparent 0%, transparent 70%, $hero-primary 100%), url(image-path('getting-started/hero.jpg')) no-repeat; background-position: top center; @@ -28,85 +13,6 @@ $user-davidkaneda: #848C24; padding-top: 6rem; } - - -.page-home { - - .block-image-bg { - background: linear-gradient(140deg, rgba($home-primary, 0.92), rgba(desaturate(darken($home-primary, 15%), 10%), 0.92)), url(image-path('home/home.jpg')); - background-size: cover; - background-position: center; - - h1 { - margin-top: $line-height-computed * 1.5; - margin-bottom: $line-height-computed * 3; - line-height: 1.15; - font-weight: 200; - } - - @media screen and (min-width: $screen-sm-min) { - h1 { - font-size: 82px; - } - } - - .lead { - font-size: 32px; - line-height: 1.4; - } - } - - h6 { - font-size: 14px; - } -} - -.devbar:before { - display: none; -} - -.list-ruled { - - li { - border-bottom: 1px dotted $brand-divider; - padding: 8px 0; - - &:last-child { - border: none; - } - } -} - -.list-team { - - h6 { - margin-top: $line-height-computed * 0.75; - text-transform: none; - letter-spacing: 0; - - span, - span a { - color: $gray-2; - font-weight: normal; - font-size: 92.5%; - } - } - - .team-person { - - } -} - - -// ported from application.scss - 1-3-15 - -.hide-long-links { - .long-link { display: none; } - .stream-event-attachment { display: none; } - .commit-message { display: none; } - .gray-2 { color: $link-color; } -} - .alpha { margin-top: 0 !important; } @@ -119,10 +25,6 @@ $user-davidkaneda: #848C24; @extend .omega; } -.fb-like { - top: -7px; -} - .sub-thingy { margin-top: -24px; padding-top: 12px; padding-bottom: 12px; border-bottom: 1px solid $brand-divider; diff --git a/app/assets/stylesheets/app/temp/style-guide-updates.scss b/app/assets/stylesheets/app/temp/style-guide-updates.scss index dacc2cb5e..e3bb93e5c 100644 --- a/app/assets/stylesheets/app/temp/style-guide-updates.scss +++ b/app/assets/stylesheets/app/temp/style-guide-updates.scss @@ -32,13 +32,6 @@ h6, .h6 { text-transform: uppercase; } -// temp h4 due to bug -- bounty link - -.xh4 { - font-size: 1.5rem; // 18/22 - line-height: 1.9rem; -} - // General Copy .text-1 { // 20/28 @@ -52,4 +45,4 @@ h6, .h6 { .text-3 { // 13/20 font-size: 1.1rem; line-height: 1.7rem; -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/base/_type.scss b/app/assets/stylesheets/base/_type.scss index 43855fed7..6dafa5c72 100644 --- a/app/assets/stylesheets/base/_type.scss +++ b/app/assets/stylesheets/base/_type.scss @@ -9,10 +9,6 @@ body { font-size: 1.25rem; } -h1, h2, h3, h4, h5, h6 { - font-weight: bold; -} - h1 { font-size: 42px; line-height: 48px; From 5d2c9eb2b3391a6fd2165406a72f46b005d4a54e Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sat, 11 Apr 2015 16:05:26 -0400 Subject: [PATCH 04/28] Remove more components --- app/assets/stylesheets/_bootstrap.scss | 1 - .../app/components/full-slider.scss | 86 ------------------- .../app/components/hover_toggle.scss | 7 -- .../stylesheets/app/components/invite.scss | 10 --- 4 files changed, 104 deletions(-) delete mode 100644 app/assets/stylesheets/app/components/full-slider.scss delete mode 100644 app/assets/stylesheets/app/components/hover_toggle.scss delete mode 100644 app/assets/stylesheets/app/components/invite.scss diff --git a/app/assets/stylesheets/_bootstrap.scss b/app/assets/stylesheets/_bootstrap.scss index ab9693a2b..2256a63b6 100644 --- a/app/assets/stylesheets/_bootstrap.scss +++ b/app/assets/stylesheets/_bootstrap.scss @@ -24,7 +24,6 @@ @import "bootstrap/navbar"; @import "bootstrap/breadcrumbs"; @import "bootstrap/pagination"; -@import "bootstrap/pager"; @import "bootstrap/labels"; @import "bootstrap/badges"; @import "bootstrap/thumbnails"; diff --git a/app/assets/stylesheets/app/components/full-slider.scss b/app/assets/stylesheets/app/components/full-slider.scss deleted file mode 100644 index 5e7945e02..000000000 --- a/app/assets/stylesheets/app/components/full-slider.scss +++ /dev/null @@ -1,86 +0,0 @@ -/* >> Full Slider Component >>>>>>>>>>>>>>>>>>>> -=========================================== */ - -/* --- HTML Pattern ---------------- -
-
-

Section Header Content

-
-
-

Section Main Content

-
-
-

Section Footer Content

-
-
-*/ - -// -- Base Component ------------ -.full-slider { - @import 'app/temp/style-guide-updates'; // < details: https://assembly.com/meta/bounties/1038 - width: 100%; - background: $gray-4; - // - .carousel { - position: relative; - max-width: 1440px; - margin: 0 auto; - width: 100%; - } - img { - display: block; - width: 100%; - height: auto; - } - .owl-theme .owl-controls { - display:none !important; - position: absolute; - bottom: 0; - width: 100%; - background: rgba(53,57,65,0.25); - @media screen and (min-width: 480px) { - display:block !important; - } - } - .owl-theme .owl-controls .item-link { - position: relative; - display: block; - width: 80px; - height: 80px; - margin: 0; - outline: none; - } - .owl-theme .owl-controls .owl-page { - vertical-align: bottom; - // - span { - @extend .item-link; - background: $black; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - opacity: 1; - } - &.active, &:hover { - background: $black; - // - span { - opacity: 0.25; - } - } - } - .owl-pagination{ - margin: 0 auto; - overflow: hidden; - cursor: default; - } -} - -// -- Delta's ------------ -// -// http://assembly.com/about - -.full-slider-about { - // background-color: $gray-4; -} \ No newline at end of file diff --git a/app/assets/stylesheets/app/components/hover_toggle.scss b/app/assets/stylesheets/app/components/hover_toggle.scss deleted file mode 100644 index 79c9b2ab0..000000000 --- a/app/assets/stylesheets/app/components/hover_toggle.scss +++ /dev/null @@ -1,7 +0,0 @@ -.hover-toggle-target { - visibility: hidden; -} - -.hover-toggle-wrapper:hover .hover-toggle-target { - visibility: visible; -} diff --git a/app/assets/stylesheets/app/components/invite.scss b/app/assets/stylesheets/app/components/invite.scss deleted file mode 100644 index 859e482b9..000000000 --- a/app/assets/stylesheets/app/components/invite.scss +++ /dev/null @@ -1,10 +0,0 @@ -/* TODO: (whatupdave) this could be more modular */ - -.invite-enter { - opacity: 0.01; - transition: opacity 1s ease-in; -} - -.invite-enter.invite-enter-active { - opacity: 1; -} \ No newline at end of file From ac5468033e6a733516d3d85fed0348d80991c343 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sat, 11 Apr 2015 17:42:46 -0400 Subject: [PATCH 05/28] =?UTF-8?q?More=20=F0=9F=9A=BF=20on=20the=20CSS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stylesheets/app/components/entry.scss | 3 - .../app/components/form_control.scss | 17 -- .../stylesheets/app/components/hero.scss | 77 --------- .../stylesheets/app/components/panels.scss | 15 +- .../app/components/product_header.scss | 34 ---- .../stylesheets/app/components/tile.scss | 158 ------------------ 6 files changed, 2 insertions(+), 302 deletions(-) delete mode 100644 app/assets/stylesheets/app/components/entry.scss delete mode 100644 app/assets/stylesheets/app/components/form_control.scss delete mode 100644 app/assets/stylesheets/app/components/product_header.scss diff --git a/app/assets/stylesheets/app/components/entry.scss b/app/assets/stylesheets/app/components/entry.scss deleted file mode 100644 index e4b4e1ab1..000000000 --- a/app/assets/stylesheets/app/components/entry.scss +++ /dev/null @@ -1,3 +0,0 @@ -.entry-unread { - background-color: #ecf5fd; -} diff --git a/app/assets/stylesheets/app/components/form_control.scss b/app/assets/stylesheets/app/components/form_control.scss deleted file mode 100644 index fb9bc2497..000000000 --- a/app/assets/stylesheets/app/components/form_control.scss +++ /dev/null @@ -1,17 +0,0 @@ -.form-control-tagged { - input { - margin: 0; - padding: 2px 7px !important; - border: none; - font-size: 14px; - line-height: 14px; - - &:focus { - outline: none; - } - - &:first-child { - padding-left: 0; - } - } -} diff --git a/app/assets/stylesheets/app/components/hero.scss b/app/assets/stylesheets/app/components/hero.scss index 33b12b59a..bce428699 100644 --- a/app/assets/stylesheets/app/components/hero.scss +++ b/app/assets/stylesheets/app/components/hero.scss @@ -179,80 +179,3 @@ } } } -.hero-about-bottom { - padding-top: 5rem; - padding-bottom: 5rem; - color: $white; - background: none; - background-color: $black; - @media screen and (min-width: 768px){ - padding-top: 13.25rem; - padding-bottom: 8.75rem; - } - // - &:after { - content: ''; - opacity: .75; - position: absolute; - z-index: 0; - top: 0; - left: 0; - bottom: 0; - right: 0; - background-image: url(../assets/hero-office-bg-dark.jpg); - background-position: center; - background-size: cover; - background-repeat: no-repeat; - @media screen and (min-width: 768px){ - background-image: url(../assets/hero-office-bg-dark-lg.jpg); - } - } - > .main { - margin-bottom: 0; - - } - h1 { - color: $white; - margin-top:0; - margin-bottom: 3rem; - text-shadow: 0 0 75px rgba(53, 57, 65, 0.85); - @media screen and (min-width: 480px){ - margin-bottom: 2rem; - } - } - p { - display: none; - @media screen and (min-width: 480px){ - display: block; - margin-bottom: 4rem; - font-size: 1.7rem !important; - line-height: 2.25rem !important; - } - @media screen and (min-width: 768px){ - margin-bottom: 6rem; - } - } - .social-row { - ul { - margin: 0; - padding: 0; - // - li { - display: inline-block; - margin: 0 1.5rem; - padding: 0; - list-style-type: none; - // - img { - width: 60px; - } - } - a { - // - &:hover { - opacity: 0.5; - } - } - } - } -} diff --git a/app/assets/stylesheets/app/components/panels.scss b/app/assets/stylesheets/app/components/panels.scss index 536a9ad4a..4ccb776aa 100644 --- a/app/assets/stylesheets/app/components/panels.scss +++ b/app/assets/stylesheets/app/components/panels.scss @@ -54,26 +54,15 @@ h6.panel-title { font-size: $font-size-h6; } -.panel-nav { - > li > a { - font-weight: bold; - color: $text-color; - - &:hover { - color: $link-color; - } - } -} - .panel-body + .panel-heading { border-top: 1px solid $panel-inner-border; border-radius: 0; } .panel-group { + margin-bottom: 15px; + .panel + .panel { margin-top: 15px; } - - margin-bottom: 15px; } diff --git a/app/assets/stylesheets/app/components/product_header.scss b/app/assets/stylesheets/app/components/product_header.scss deleted file mode 100644 index 2024366bd..000000000 --- a/app/assets/stylesheets/app/components/product_header.scss +++ /dev/null @@ -1,34 +0,0 @@ -.product-header { - border-bottom: 1px solid rgba(100, 100, 100, 0.15); - // - h1 { - @media screen and (min-width: 768px) { - margin-top: -3px; - margin-left: -1px; - } - } - h4 { - @media screen and (min-width: 768px) { - margin: -7px 0 5px; - } - } - .app-icon { - max-width:82px; - @media screen and (min-width: 768px) { - max-width:100%; - } - } - - .primary { - li{ - a { - font-size:13px; - color:#666D78; - // - &:hover { - color: #1e66a3; - } - } - } - } -} diff --git a/app/assets/stylesheets/app/components/tile.scss b/app/assets/stylesheets/app/components/tile.scss index b85c72c0b..476b2cdf3 100644 --- a/app/assets/stylesheets/app/components/tile.scss +++ b/app/assets/stylesheets/app/components/tile.scss @@ -46,111 +46,6 @@ font-weight: 500; margin-bottom: 1rem; } - .corner { - position: absolute; - top:0; - right:0; - width: 5rem; - height: 5rem; - border-top-right-radius: 0.5rem; - background: -moz-linear-gradient(45deg, rgba(200,0,0,0) 0%, rgba(200,0,0,0) 50%, rgba(200,0,0,1) 51%, rgba(200,0,0,1) 100%); - background: -webkit-linear-gradient(45deg, rgba(200,0,0,0) 0%,rgba(200,0,0,0) 50%,rgba(200,0,0,1) 51%,rgba(200,0,0,1) 100%); - background: linear-gradient(45deg, rgba(200,0,0,0) 0%,rgba(200,0,0,0) 50%,rgba(200,0,0,1) 51%,rgba(200,0,0,1) 100%); - -webkit-transform:rotate(360deg); - - // below should be optimized into a mixin later - &.accent-brown { - background: -moz-linear-gradient(45deg, rgba(127,112,77,0) 0%, rgba(127,112,77,0) 50%, rgba(127,112,77,1) 51%, rgba(127,112,77,1) 100%); - background: -webkit-linear-gradient(45deg, rgba(127,112,77,0) 0%,rgba(127,112,77,0) 50%,rgba(127,112,77,1) 51%,rgba(127,112,77,1) 100%); - background: linear-gradient(45deg, rgba(127,112,77,0) 0%,rgba(127,112,77,0) 50%,rgba(127,112,77,1) 51%,rgba(127,112,77,1) 100%); - } - &.accent-blue { - background: -moz-linear-gradient(45deg, rgba(38,92,101,0) 0%, rgba(38,92,101,0) 50%, rgba(38,92,101,1) 51%, rgba(38,92,101,1) 100%); - background: -webkit-linear-gradient(45deg, rgba(38,92,101,0) 0%,rgba(38,92,101,0) 50%,rgba(38,92,101,1) 51%,rgba(38,92,101,1) 100%); - background: linear-gradient(45deg, rgba(38,92,101,0) 0%,rgba(38,92,101,0) 50%,rgba(38,92,101,1) 51%,rgba(38,92,101,1) 100%); - } - &.accent-red { - background: -moz-linear-gradient(45deg, rgba(240,85,72,0) 0%, rgba(240,85,72,0) 50%, rgba(240,85,72,1) 51%, rgba(240,85,72,1) 100%); - background: -webkit-linear-gradient(45deg, rgba(240,85,72,0) 0%,rgba(240,85,72,0) 50%,rgba(240,85,72,1) 51%,rgba(240,85,72,1) 100%); - background: linear-gradient(45deg, rgba(240,85,72,0) 0%,rgba(240,85,72,0) 50%,rgba(240,85,72,1) 51%,rgba(240,85,72,1) 100%); - } - &.accent-green { - background: -moz-linear-gradient(45deg, rgba(146,185,71,0) 0%, rgba(146,185,71,0) 50%, rgba(146,185,71,1) 51%, rgba(146,185,71,1) 100%); - background: -webkit-linear-gradient(45deg, rgba(146,185,71,0) 0%,rgba(146,185,71,0) 50%,rgba(146,185,71,1) 51%,rgba(146,185,71,1) 100%); - background: linear-gradient(45deg, rgba(146,185,71,0) 0%,rgba(146,185,71,0) 50%,rgba(146,185,71,1) 51%,rgba(146,185,71,1) 100%); - } - } -} - -.action-bar { - // - > .item { - width: 120%; - margin: 0 -10%; - display:inline-block; - vertical-align: middle; - border-bottom: 1px solid $gray-5; - // - &:last-child{ - margin-right: -5px; - border:none; - } - } -} - -a.comment-count { - display: inline-block; - vertical-align: middle; - color:$gray-2; - font-size: 1.1rem; - line-height: 1.7rem; - font-weight: bold; - // - &:hover, &:active { - // - .svg-icon-comment { - fill:$gray-2; - } - } - .svg-icon-comment { - width: 1.3rem; - margin-right:0.5rem; - fill:$gray-3; - } -} -.action-group { - display:table; - table-layout: fixed; - width: 100%; - // - > .item { - display: table-cell; - width:5rem; - vertical-align: middle; - text-align: center; - border-right: 1px solid $gray-5; - // - &:first-child { - width:auto; - text-align: left; - padding-right: 2rem; - padding-left: 2rem; - } - &:last-child { - border-right:none; - } - } - .action-icon { - padding: 1rem 0; - - // - &:hover, &:active { - // - .svg-icon-share { - fill:$gray-2; - } - } - } } .action-icon.red { @@ -179,52 +74,6 @@ a.comment-count { fill:$gray-3; } -.progress-group { - display:table; - table-layout:fixed; - width: 100%; - padding: 1.5rem 2rem 1.5rem 2rem; - // - > .item { - display:table-cell; - vertical-align: middle; - // - &:last-child{ - width: 5rem; - text-align: center; - } - } - progress { - display:block; - width:100%; - height: 1rem; - border-radius: 1rem; - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; - border: none; - color: $green; - } - progress::-webkit-progress-bar { - background: $gray-5; - border-radius: 1rem; - } - progress::-webkit-progress-value { - border-radius: 1rem; - background: -webkit-linear-gradient(top, $green 1%,$green 100%); - } - progress::-moz-progress-bar { - border-radius: 1rem; - background: -moz-linear-gradient(top, $green 1%,$green 100%); - } -} -.progress-count { - color:$black; - font-size: 1.1rem; - line-height: 1.7rem; - font-weight: bold; -} - // -- Size Variations ------------ .tile-small { @@ -242,10 +91,3 @@ a.comment-count { margin-top: -1rem; } } - -// -- Delta's ------------ -// -// http://assembly.com/ideas -// .tile-ideas { -// margin-bottom: 0; -// } From c06cb21c6a4a3bbb48fb271dd3dc160209bb30bb Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sun, 12 Apr 2015 00:09:24 -0400 Subject: [PATCH 06/28] Remove Bootstrap thumbnails --- app/assets/stylesheets/_bootstrap.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/_bootstrap.scss b/app/assets/stylesheets/_bootstrap.scss index 2256a63b6..70537042f 100644 --- a/app/assets/stylesheets/_bootstrap.scss +++ b/app/assets/stylesheets/_bootstrap.scss @@ -26,7 +26,6 @@ @import "bootstrap/pagination"; @import "bootstrap/labels"; @import "bootstrap/badges"; -@import "bootstrap/thumbnails"; @import "bootstrap/alerts"; @import "bootstrap/progress-bars"; @import "bootstrap/media"; From 13e2bf7c90dfeec97b27e209bebc9eaad9b5540f Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sun, 12 Apr 2015 00:09:43 -0400 Subject: [PATCH 07/28] Fix Bootstrap input addon bg color --- app/assets/stylesheets/vars/_base.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/vars/_base.scss b/app/assets/stylesheets/vars/_base.scss index ae978043e..9a721cd19 100644 --- a/app/assets/stylesheets/vars/_base.scss +++ b/app/assets/stylesheets/vars/_base.scss @@ -132,7 +132,7 @@ $input-height-small: (floor($font-size-small * $line-height-small) + ($padding-s $legend-color: $gray-2; $legend-border-color: #e5e5e5; -$input-group-addon-bg: $gray-1; +$input-group-addon-bg: #fff; $input-group-addon-border-color: $input-border; From dcf7a08758a8bccbde8a8649ec85eded31c6fba0 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sun, 12 Apr 2015 00:45:56 -0400 Subject: [PATCH 08/28] Remove even more unused CSS --- .../components/drag_and_drop_view.js.jsx | 2 +- app/assets/stylesheets/admin.scss | 387 ------------------ .../app/components/accordion-grid.scss | 54 --- .../stylesheets/app/components/footer.scss | 6 - .../stylesheets/app/components/heart.scss | 1 - .../stylesheets/app/components/labels.scss | 35 -- .../app/components/list_groups.scss | 43 +- .../stylesheets/app/components/markdown.scss | 9 - .../stylesheets/app/components/marker.scss | 8 - .../stylesheets/app/components/media.scss | 28 -- .../app/components/page_header.scss | 6 - .../stylesheets/app/components/slider.scss | 4 - app/assets/stylesheets/app/slop.scss | 37 +- app/views/admin/bounties/index.html.erb | 14 +- 14 files changed, 29 insertions(+), 605 deletions(-) delete mode 100644 app/assets/stylesheets/app/components/accordion-grid.scss delete mode 100644 app/assets/stylesheets/app/components/footer.scss delete mode 100644 app/assets/stylesheets/app/components/labels.scss diff --git a/app/assets/javascripts/components/drag_and_drop_view.js.jsx b/app/assets/javascripts/components/drag_and_drop_view.js.jsx index c3743b253..5f6d91a48 100644 --- a/app/assets/javascripts/components/drag_and_drop_view.js.jsx +++ b/app/assets/javascripts/components/drag_and_drop_view.js.jsx @@ -16,7 +16,7 @@ var DragAndDrop = React.createClass({ {this.props.alt} .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { color: #fff; } - -/* BOUNTIES DASHBOARD */ - -.charts_container { - margin-top:10px; -} - -h5 { - font-family: Arial, sans-serif; -} - -/*lines*/ -.chart { - display: inline-block; -} -#legend { - display: inline-block; - position: relative; - float:right; -} - -.chart_container { - float: left; - position: relative; - margin: 10px 5px; -} - -/* graph */ - -.rickshaw_graph { - position: relative; -} -.rickshaw_graph svg { - display: block; - overflow: hidden; -} - -/* ticks */ - -.rickshaw_graph .x_tick { - position: absolute; - top: 0; - bottom: 0; - width: 0px; - border-left: 1px dotted rgba(0, 0, 0, 0.2); - pointer-events: none; -} -.rickshaw_graph .x_tick .title { - position: absolute; - font-size: 12px; - font-family: Arial, sans-serif; - opacity: 0.5; - white-space: nowrap; - margin-left: 3px; - bottom: 1px; -} - -/* annotations */ - -.rickshaw_annotation_timeline { - height: 1px; - border-top: 1px solid #e0e0e0; - margin-top: 10px; - position: relative; -} -.rickshaw_annotation_timeline .annotation { - position: absolute; - height: 6px; - width: 6px; - margin-left: -2px; - top: -3px; - border-radius: 5px; - background-color: rgba(0, 0, 0, 0.25); -} -.rickshaw_graph .annotation_line { - position: absolute; - top: 0; - bottom: -6px; - width: 0px; - border-left: 2px solid rgba(0, 0, 0, 0.3); - display: none; -} -.rickshaw_graph .annotation_line.active { - display: block; -} - -.rickshaw_graph .annotation_range { - background: rgba(0, 0, 0, 0.1); - display: none; - position: absolute; - top: 0; - bottom: -6px; -} -.rickshaw_graph .annotation_range.active { - display: block; -} -.rickshaw_graph .annotation_range.active.offscreen { - display: none; -} - -.rickshaw_annotation_timeline .annotation .content { - background: white; - color: black; - opacity: 0.9; - padding: 5px 5px; - box-shadow: 0 0 2px rgba(0, 0, 0, 0.8); - border-radius: 3px; - position: relative; - z-index: 20; - font-size: 12px; - padding: 6px 8px 8px; - top: 18px; - left: -11px; - width: 160px; - display: none; - cursor: pointer; -} -.rickshaw_annotation_timeline .annotation .content:before { - content: "\25b2"; - position: absolute; - top: -11px; - color: white; - text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.8); -} -.rickshaw_annotation_timeline .annotation.active, -.rickshaw_annotation_timeline .annotation:hover { - background-color: rgba(0, 0, 0, 0.8); - cursor: none; -} -.rickshaw_annotation_timeline .annotation .content:hover { - z-index: 50; -} -.rickshaw_annotation_timeline .annotation.active .content { - display: block; -} -.rickshaw_annotation_timeline .annotation:hover .content { - display: block; - z-index: 50; -} -.rickshaw_graph .y_axis, -.rickshaw_graph .x_axis_d3 { - fill: none; -} -.rickshaw_graph .y_ticks .tick line, -.rickshaw_graph .x_ticks_d3 .tick { - stroke: rgba(0, 0, 0, 0.16); - stroke-width: 2px; - shape-rendering: crisp-edges; - pointer-events: none; -} -.rickshaw_graph .y_grid .tick, -.rickshaw_graph .x_grid_d3 .tick { - z-index: -1; - stroke: rgba(0, 0, 0, 0.20); - stroke-width: 1px; - stroke-dasharray: 1 1; -} -.rickshaw_graph .y_grid .tick[data-y-value="0"] { - stroke-dasharray: 1 0; -} -.rickshaw_graph .y_grid path, -.rickshaw_graph .x_grid_d3 path { - fill: none; - stroke: none; -} -.rickshaw_graph .y_ticks path, -.rickshaw_graph .x_ticks_d3 path { - fill: none; - stroke: #808080; -} -.rickshaw_graph .y_ticks text, -.rickshaw_graph .x_ticks_d3 text { - opacity: 0.5; - font-size: 12px; - pointer-events: none; -} -.rickshaw_graph .x_tick.glow .title, -.rickshaw_graph .y_ticks.glow text { - fill: black; - color: black; - text-shadow: - -1px 1px 0 rgba(255, 255, 255, 0.1), - 1px -1px 0 rgba(255, 255, 255, 0.1), - 1px 1px 0 rgba(255, 255, 255, 0.1), - 0px 1px 0 rgba(255, 255, 255, 0.1), - 0px -1px 0 rgba(255, 255, 255, 0.1), - 1px 0px 0 rgba(255, 255, 255, 0.1), - -1px 0px 0 rgba(255, 255, 255, 0.1), - -1px -1px 0 rgba(255, 255, 255, 0.1); -} -.rickshaw_graph .x_tick.inverse .title, -.rickshaw_graph .y_ticks.inverse text { - fill: white; - color: white; - text-shadow: - -1px 1px 0 rgba(0, 0, 0, 0.8), - 1px -1px 0 rgba(0, 0, 0, 0.8), - 1px 1px 0 rgba(0, 0, 0, 0.8), - 0px 1px 0 rgba(0, 0, 0, 0.8), - 0px -1px 0 rgba(0, 0, 0, 0.8), - 1px 0px 0 rgba(0, 0, 0, 0.8), - -1px 0px 0 rgba(0, 0, 0, 0.8), - -1px -1px 0 rgba(0, 0, 0, 0.8); -} - -/* graph detail */ -.rickshaw_graph .detail { - pointer-events: none; - position: absolute; - top: 0; - z-index: 2; - background: rgba(0, 0, 0, 0.1); - bottom: 0; - width: 1px; - transition: opacity 0.25s linear; - -moz-transition: opacity 0.25s linear; - -o-transition: opacity 0.25s linear; - -webkit-transition: opacity 0.25s linear; -} -.rickshaw_graph .detail.inactive { - opacity: 0; -} -.rickshaw_graph .detail .item.active { - opacity: 1; -} -.rickshaw_graph .detail .x_label { - font-family: Arial, sans-serif; - border-radius: 3px; - padding: 6px; - opacity: 0.5; - border: 1px solid #e0e0e0; - font-size: 12px; - position: absolute; - background: white; - white-space: nowrap; -} -.rickshaw_graph .detail .x_label.left { - left: 0; -} -.rickshaw_graph .detail .x_label.right { - right: 0; -} -.rickshaw_graph .detail .item { - position: absolute; - z-index: 2; - border-radius: 3px; - padding: 0.25em; - font-size: 12px; - font-family: Arial, sans-serif; - opacity: 0; - background: rgba(0, 0, 0, 0.4); - color: white; - border: 1px solid rgba(0, 0, 0, 0.4); - margin-left: 1em; - margin-right: 1em; - margin-top: -1em; - white-space: nowrap; -} -.rickshaw_graph .detail .item.left { - left: 0; -} -.rickshaw_graph .detail .item.right { - right: 0; -} -.rickshaw_graph .detail .item.active { - opacity: 1; - background: rgba(0, 0, 0, 0.8); -} -.rickshaw_graph .detail .item:after { - position: absolute; - display: block; - width: 0; - height: 0; - - content: ""; - - border: 5px solid transparent; -} -.rickshaw_graph .detail .item.left:after { - top: 1em; - left: -5px; - margin-top: -5px; - border-right-color: rgba(0, 0, 0, 0.8); - border-left-width: 0; -} -.rickshaw_graph .detail .item.right:after { - top: 1em; - right: -5px; - margin-top: -5px; - border-left-color: rgba(0, 0, 0, 0.8); - border-right-width: 0; -} -.rickshaw_graph .detail .dot { - width: 4px; - height: 4px; - margin-left: -3px; - margin-top: -3.5px; - border-radius: 5px; - position: absolute; - box-shadow: 0 0 2px rgba(0, 0, 0, 0.6); - box-sizing: content-box; - -moz-box-sizing: content-box; - background: white; - border-width: 2px; - border-style: solid; - display: none; - background-clip: padding-box; -} -.rickshaw_graph .detail .dot.active { - display: block; -} - -/* legend */ -.rickshaw_legend { - font-family: Arial; - font-size: 12px; - color: white; - background: #404040; - display: inline-block; - padding: 12px 5px; - border-radius: 2px; - position: relative; -} -.rickshaw_legend:hover { - z-index: 10; -} -.rickshaw_legend .swatch { - width: 10px; - height: 10px; - border: 1px solid rgba(0, 0, 0, 0.2); -} -.rickshaw_legend .line { - clear: both; - line-height: 140%; - padding-right: 15px; - display:inline; -} -.rickshaw_legend .line .swatch { - display: inline-block; - margin-right: 3px; - border-radius: 2px; -} -.rickshaw_legend .label { - margin: 0; - white-space: nowrap; - display: inline; - font-size: inherit; - background-color: transparent; - color: inherit; - font-weight: normal; - line-height: normal; - padding: 0px; - text-shadow: none; -} -.rickshaw_legend .action:hover { - opacity: 0.6; -} -.rickshaw_legend .action { - margin-right: 0.2em; - font-size: 10px; - opacity: 0.2; - cursor: pointer; - font-size: 14px; -} -.rickshaw_legend .line.disabled { - opacity: 0.4; -} -.rickshaw_legend ul { - list-style-type: none; - margin: 0; - padding: 0; - margin: 2px; - cursor: pointer; -} -.rickshaw_legend li { - padding: 0 0 0 2px; - min-width: 80px; - white-space: nowrap; -} -.rickshaw_legend li:hover { - background: rgba(255, 255, 255, 0.08); - border-radius: 3px; -} -.rickshaw_legend li:active { - background: rgba(255, 255, 255, 0.2); - border-radius: 3px; -} diff --git a/app/assets/stylesheets/app/components/accordion-grid.scss b/app/assets/stylesheets/app/components/accordion-grid.scss deleted file mode 100644 index dc2eedb99..000000000 --- a/app/assets/stylesheets/app/components/accordion-grid.scss +++ /dev/null @@ -1,54 +0,0 @@ -/* >> Accordion Grid & Accordion Grid Unit Component >>>>>>>>>>>>>>>>>>>> -=========================================== */ - -/* - -## note - accordion-grid can be used independent of flip-grid-unit - --- HTML Pattern ---------------- -
-
-

Section Header Content

-
-
-
    -
  • -
  • -
  • -
  • -
-
-
-

Section Footer Content

-
-
-*/ - -// -- Base Component ------------ -.accordion-grid-unit { - display:none; - @import 'app/temp/style-guide-updates'; // < details: https://assembly.com/meta/bounties/1038 - // - position: relative; - padding-top: 3rem; - padding-bottom: 3rem; - background-color: $gray-4; - .footer { // bootstrap overwrite - margin:0; - padding:0; - border: none; - } - > .header, > .main { - margin-bottom: 2rem; - } - > .header, > .main, > .footer { - position: relative; - z-index: 5; - text-align: center; - @extend .text-2; - // - p { - @extend .text-2; - } - } -} diff --git a/app/assets/stylesheets/app/components/footer.scss b/app/assets/stylesheets/app/components/footer.scss deleted file mode 100644 index 7675bb523..000000000 --- a/app/assets/stylesheets/app/components/footer.scss +++ /dev/null @@ -1,6 +0,0 @@ -.footer { - margin-top: $line-height-computed * 2; - padding-top: $line-height-computed * 2; - padding-bottom: $line-height-computed * 2; - border-top: 1px solid $brand-divider; -} diff --git a/app/assets/stylesheets/app/components/heart.scss b/app/assets/stylesheets/app/components/heart.scss index a1ae383ea..9625eed99 100644 --- a/app/assets/stylesheets/app/components/heart.scss +++ b/app/assets/stylesheets/app/components/heart.scss @@ -16,7 +16,6 @@ } } - .huge-heart.red { .svg-icon-huge-heart .path1, .svg-icon-huge-heart .path2 { fill:$red; diff --git a/app/assets/stylesheets/app/components/labels.scss b/app/assets/stylesheets/app/components/labels.scss deleted file mode 100644 index 4a71e07d3..000000000 --- a/app/assets/stylesheets/app/components/labels.scss +++ /dev/null @@ -1,35 +0,0 @@ -.label { - border-radius: 2px; - font-size: 14px; - font-weight: normal; - padding: 2px 7px; -} - -.label-urgent { - background-color: $green; -} - -.label-now { - background-color: $green; -} - -.label-someday { - background-color: $yellow; -} - -.label-muted { - background-color: white; - border: 1px solid $gray-6; - color: $gray-5; - - &:hover, &.hover { - border: 1px solid darken($gray-6, 10%); - color: darken($gray-5, 10%) !important; - } -} - -.label-outlined { - background: transparent; - box-shadow: inset 0 0 0 1px $brand-border; - color: $gray-2; -} diff --git a/app/assets/stylesheets/app/components/list_groups.scss b/app/assets/stylesheets/app/components/list_groups.scss index 1700922da..f54ca2545 100644 --- a/app/assets/stylesheets/app/components/list_groups.scss +++ b/app/assets/stylesheets/app/components/list_groups.scss @@ -3,40 +3,29 @@ background-color: transparent; } - -.list-group-padded { - > .list-group-item { - padding: 20px 0; - } -} - -.list-group-item-condensed { - padding: 4px 10px; +.list-group-padded > .list-group-item { + padding: 20px 0; } -.list-group-breakout { - > .list-group-item { - border-left: none; - border-right: none; +.list-group-breakout > .list-group-item { + border-left: none; + border-right: none; - &:first-child { - border-top: none; - } + &:first-child { + border-top: none; + } - &:last-child { - border-bottom: none; - } + &:last-child { + border-bottom: none; } } -.list-group-padded.list-group-breakout { - > .list-group-item { - &:first-child { - padding-top: 0; - } +.list-group-padded.list-group-breakout > .list-group-item { + &:first-child { + padding-top: 0; + } - &:last-child { - padding-bottom: 0; - } + &:last-child { + padding-bottom: 0; } } diff --git a/app/assets/stylesheets/app/components/markdown.scss b/app/assets/stylesheets/app/components/markdown.scss index 2523ac89c..b3c29d0cc 100644 --- a/app/assets/stylesheets/app/components/markdown.scss +++ b/app/assets/stylesheets/app/components/markdown.scss @@ -56,15 +56,6 @@ } } -// (@chrislloyd) Custom offset for comments in a timeline. It would be nice if -// this was a consistant style -.markdown-wide-quotes { - blockquote { - margin-left: calc(-2rem - 4px - 6px); - padding-left: calc(2rem + 6px); - } -} - // hack to shrink images in bounties but not the lightbox .shrink-images { img { max-width: 50%;} diff --git a/app/assets/stylesheets/app/components/marker.scss b/app/assets/stylesheets/app/components/marker.scss index a426b5e2e..d7dc21126 100644 --- a/app/assets/stylesheets/app/components/marker.scss +++ b/app/assets/stylesheets/app/components/marker.scss @@ -16,14 +16,6 @@ } } -.marker-blip { - background-color: $gray-5; - border: 2px solid white; - width: 10px; - height: 10px; - margin: 6px 10px 0; -} - .marker-default { border-color: $gray-5; color: $gray-5; diff --git a/app/assets/stylesheets/app/components/media.scss b/app/assets/stylesheets/app/components/media.scss index ee5dee9cc..91352e2e3 100644 --- a/app/assets/stylesheets/app/components/media.scss +++ b/app/assets/stylesheets/app/components/media.scss @@ -8,31 +8,3 @@ margin-left: $grid-gutter-width; } } - -// TODO: Line-height is fixed -.media-heading { - @include clearfix; - padding-top: (22px - 20px) / 2; - padding-bottom: (22px - 20px) / 2; - margin-bottom: $padding-base-vertical; - color: $gray-2; - line-height: 22px; - - a { - color: inherit; - font-weight: bold; - } - - .event-award:hover { - color: $brand-success; - } -} - -.media-footer { - margin-top: $padding-xl-vertical; - border-top: 1px solid $brand-divider; - padding-top: $padding-base-vertical; - padding-bottom: $padding-base-vertical; - - color: $gray-2; -} diff --git a/app/assets/stylesheets/app/components/page_header.scss b/app/assets/stylesheets/app/components/page_header.scss index a40f6bd0d..7503e3a1f 100644 --- a/app/assets/stylesheets/app/components/page_header.scss +++ b/app/assets/stylesheets/app/components/page_header.scss @@ -8,12 +8,6 @@ } } -.page-footer { - font-size: $font-size-large; - box-shadow: 0 -1px 0 0 rgba($black, 0.02); - border-top: 1px solid $gray-6 -} - // TODO Think about moving in with .summary .page-header-meta { margin-top: $line-height-computed / 4; diff --git a/app/assets/stylesheets/app/components/slider.scss b/app/assets/stylesheets/app/components/slider.scss index cf229a908..82ca354c1 100644 --- a/app/assets/stylesheets/app/components/slider.scss +++ b/app/assets/stylesheets/app/components/slider.scss @@ -5,7 +5,6 @@ margin-top: 30px; margin-bottom: $line-height-computed; position: relative; - } .slider-bar { @@ -65,6 +64,3 @@ } } } - -.slider-examples { -} diff --git a/app/assets/stylesheets/app/slop.scss b/app/assets/stylesheets/app/slop.scss index ee79ced31..3b25065d2 100644 --- a/app/assets/stylesheets/app/slop.scss +++ b/app/assets/stylesheets/app/slop.scss @@ -21,10 +21,6 @@ $text-accent: #BC9454; margin-bottom: 0 !important; } -.neuter-paragraphs > p:last-child { - @extend .omega; -} - .sub-thingy { margin-top: -24px; padding-top: 12px; padding-bottom: 12px; border-bottom: 1px solid $brand-divider; @@ -36,47 +32,26 @@ $text-accent: #BC9454; margin-top: $line-height-computed * 2; margin-bottom: $line-height-computed * 2; padding: ($line-height-computed * 2) ($grid-gutter-width * 2); - outline: none; -} -.play-button:hover { - background-color: rgba(black, .2); -} + &:hover { + background-color: rgba(black, 0.2); + } -.play-button:focus { - outline: none; + &:focus { + outline: none; + } } .masthead-gradient { @include gradient-vertical(rgb(34, 157, 171), rgb(16, 53, 97), 24%, 100%); - position: absolute; - top: 0; left: 0; right: 0; bottom: 0; - opacity: .7; } -.feature { - padding-bottom: $padding-large-vertical; - position: relative; - - > .glyphicon { - display: block; - font-size: $font-size-large; - margin-left: -36px; - position: absolute; - } - - > .feature-title { - line-height: 1.1; - margin-top: 0; - } -} - // TODO This was @chrislloyd's hack. To be replaced when more time is spent on the welcome banner. .welcome-banner-left { diff --git a/app/views/admin/bounties/index.html.erb b/app/views/admin/bounties/index.html.erb index ae881b423..3a4d2fef8 100644 --- a/app/views/admin/bounties/index.html.erb +++ b/app/views/admin/bounties/index.html.erb @@ -1,25 +1,25 @@ <%= stylesheet_link_tag 'admin' %>
-
+
Avg bounty lifespan: <%= @avg_bounty_age['avg_life'] %>

Append weeks=N param to get more history

-
-
+
+
Bounties Created
-
+
Award Ratio
-
+
Close Ratio
-
+
@@ -178,5 +178,3 @@ ] }); - - From bc2e76c2161294ecbb6861b0c85cf30a609ce4d2 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sun, 12 Apr 2015 00:46:18 -0400 Subject: [PATCH 09/28] Remove duplicated basscss-border code --- .../stylesheets/-deprecated/_border.scss | 33 ------------------- .../stylesheets/basscss/_color-borders.scss | 2 +- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 app/assets/stylesheets/-deprecated/_border.scss diff --git a/app/assets/stylesheets/-deprecated/_border.scss b/app/assets/stylesheets/-deprecated/_border.scss deleted file mode 100644 index fb91c03ad..000000000 --- a/app/assets/stylesheets/-deprecated/_border.scss +++ /dev/null @@ -1,33 +0,0 @@ -$border-color: $brand-border; - -// Borders - -.no-border { border: none } -.border { border: 1px solid $brand-border } -.border-top { border-top: 1px solid $brand-border } -.border-right { border-top: 1px solid $brand-border } -.border-bottom { border-bottom: 1px solid $brand-border } -.border-left { border-top: 1px solid $brand-border } - -// Border Radii - -.not-rounded { border-radius: 0 } -.rounded { border-radius: 3px } -.rounded-top { - border-top-left-radius: 3px; - border-top-right-radius: 3px; -} -.rounded-right { - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; -} -.rounded-bottom { - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; -} -.rounded-left { - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; -} - -.circle { border-radius: 50% } diff --git a/app/assets/stylesheets/basscss/_color-borders.scss b/app/assets/stylesheets/basscss/_color-borders.scss index ff598033b..2990e4756 100644 --- a/app/assets/stylesheets/basscss/_color-borders.scss +++ b/app/assets/stylesheets/basscss/_color-borders.scss @@ -1,7 +1,7 @@ // Converted Variables -$border-color: $gray-6; +$border-color: $brand-border; $border-width: 1px; $border-radius: 4px; From a9409fb39fc79d5b7e4782a1ec9bfefdcae7bd21 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sun, 12 Apr 2015 00:47:01 -0400 Subject: [PATCH 10/28] Remove .img-rounded --- app/assets/stylesheets/app/_main.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/assets/stylesheets/app/_main.scss b/app/assets/stylesheets/app/_main.scss index 73fe78694..70ed519e3 100644 --- a/app/assets/stylesheets/app/_main.scss +++ b/app/assets/stylesheets/app/_main.scss @@ -19,10 +19,6 @@ a:focus { white-space: nowrap; } -.img-rounded { - border-radius: $border-radius-base; -} - // -- code ---------------------- code { color: $red; From 67f439bc1c266cd384c9c17c201940eb6951cb8f Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sun, 12 Apr 2015 00:48:08 -0400 Subject: [PATCH 11/28] Clean up footer --- app/views/shared/_footer.html.erb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb index bfc948dfe..f819319f2 100644 --- a/app/views/shared/_footer.html.erb +++ b/app/views/shared/_footer.html.erb @@ -1,5 +1,3 @@ -
-
- <%= render 'shared/footer_nav' %> -
-
+
+ <%= render 'shared/footer_nav' %> +
From 472d9bc24ff30ce1bb83379708de568991b0c78b Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sun, 12 Apr 2015 00:52:31 -0400 Subject: [PATCH 12/28] Remove .play-button and .masthead-gradient --- app/assets/stylesheets/app/slop.scss | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/app/assets/stylesheets/app/slop.scss b/app/assets/stylesheets/app/slop.scss index 3b25065d2..dc981d774 100644 --- a/app/assets/stylesheets/app/slop.scss +++ b/app/assets/stylesheets/app/slop.scss @@ -27,31 +27,6 @@ $text-accent: #BC9454; margin-bottom: 24px; } -.play-button { - display: inline-block; - margin-top: $line-height-computed * 2; - margin-bottom: $line-height-computed * 2; - padding: ($line-height-computed * 2) ($grid-gutter-width * 2); - - &:hover { - background-color: rgba(black, 0.2); - } - - &:focus { - outline: none; - } -} - -.masthead-gradient { - @include gradient-vertical(rgb(34, 157, 171), rgb(16, 53, 97), 24%, 100%); - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - opacity: .7; -} - // TODO This was @chrislloyd's hack. To be replaced when more time is spent on the welcome banner. .welcome-banner-left { From ab182b53f36b9fe7d7d9c2fe89a4855434d2c420 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sun, 12 Apr 2015 00:52:51 -0400 Subject: [PATCH 13/28] Consistent quotes on app.scss --- app/assets/stylesheets/application.scss | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 3c9efc44c..c18fa9935 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -4,17 +4,17 @@ @import "constants"; // Libraries -@import 'bootstrap'; +@import "bootstrap"; -@import 'app/mixins/*'; +@import "app/mixins/*"; -@import 'basscss'; +@import "basscss"; -@import '_deprecated/basspluss'; -@import '_deprecated/utility'; -@import '_deprecated/nocss_vars'; -@import '_deprecated/nocss'; -@import '_deprecated/nocss_mq'; +@import "_deprecated/basspluss"; +@import "_deprecated/utility"; +@import "_deprecated/nocss_vars"; +@import "_deprecated/nocss"; +@import "_deprecated/nocss_mq"; @import "app/main"; @@ -24,4 +24,4 @@ @import "components/*"; @import "app/slop"; -@import 'c3/c3' +@import "c3/c3"; From 15deb9e8e0058e7068e3092ebbf914c49791c11e Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Mon, 13 Apr 2015 22:50:39 -0400 Subject: [PATCH 14/28] Fix border color --- app/assets/stylesheets/vars/_colors.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/vars/_colors.scss b/app/assets/stylesheets/vars/_colors.scss index 20b442e95..aa2f2c139 100644 --- a/app/assets/stylesheets/vars/_colors.scss +++ b/app/assets/stylesheets/vars/_colors.scss @@ -45,7 +45,7 @@ $brand-danger: $red; $brand-muted: $gray-1; $brand-bg: #FAFAFA; -$brand-border: darken($gray-6, 10%); +$brand-border: $gray-5; $brand-divider: darken($brand-bg, 5%); $brand-shadow: rgba(100, 100, 100, 0.2); From 967fde5d198d87a9a87e63f3c355ee09f036698f Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sat, 9 May 2015 14:59:30 -0400 Subject: [PATCH 15/28] Remove h7 --- app/assets/stylesheets/_deprecated/_nocss.scss | 5 ----- app/assets/stylesheets/app/components/apps.scss | 6 ------ app/assets/stylesheets/app/components/tile-grid.scss | 7 +------ app/assets/stylesheets/app/temp/style-guide-updates.scss | 5 ----- app/assets/stylesheets/email.scss | 3 +-- 5 files changed, 2 insertions(+), 24 deletions(-) diff --git a/app/assets/stylesheets/_deprecated/_nocss.scss b/app/assets/stylesheets/_deprecated/_nocss.scss index 37a6028ed..c72d1695c 100644 --- a/app/assets/stylesheets/_deprecated/_nocss.scss +++ b/app/assets/stylesheets/_deprecated/_nocss.scss @@ -1661,11 +1661,6 @@ $px4: 4px; @extend .#{$pre}fs1_1; @extend .#{$pre}lh1_7; } -.#{$pre}h7, .#{$pre}h7 h7, .#{$pre}h7 a, .#{$pre}h7 p { // 12/12 - @extend .#{$pre}fs1; - @extend .#{$pre}lh1; - @extend .#{$pre}caps; -} .#{$pre}text-1, .#{$pre}text-1 a, .#{$pre}text-1 p { // 20/28 @extend .#{$pre}fs1_7; diff --git a/app/assets/stylesheets/app/components/apps.scss b/app/assets/stylesheets/app/components/apps.scss index 6a1c74765..3859f34d9 100644 --- a/app/assets/stylesheets/app/components/apps.scss +++ b/app/assets/stylesheets/app/components/apps.scss @@ -48,12 +48,6 @@ &:hover { background: $gray-4; } - - .h7 { - margin-bottom: 0.25rem; - font-weight: bold; - opacity: 0.3; - } } .pill-gray { diff --git a/app/assets/stylesheets/app/components/tile-grid.scss b/app/assets/stylesheets/app/components/tile-grid.scss index 1e9106837..dcc3b9f6a 100644 --- a/app/assets/stylesheets/app/components/tile-grid.scss +++ b/app/assets/stylesheets/app/components/tile-grid.scss @@ -22,7 +22,7 @@ // -- Base Component ------------ .tile-grid { - + .footer { // bootstrap overwrite margin:0; @@ -157,11 +157,6 @@ &:hover { background: $gray-4; } - .h7 { - margin-bottom: 0.25rem; - font-weight: bold; - opacity: 0.3; - } } .float-item:last-child { display:none; diff --git a/app/assets/stylesheets/app/temp/style-guide-updates.scss b/app/assets/stylesheets/app/temp/style-guide-updates.scss index e3bb93e5c..1e8578f2a 100644 --- a/app/assets/stylesheets/app/temp/style-guide-updates.scss +++ b/app/assets/stylesheets/app/temp/style-guide-updates.scss @@ -26,11 +26,6 @@ h6, .h6 { font-size: 1.1rem; // 13/20 line-height: 1.7rem; } -.h7, .h7 a { - font-size: 1rem; // 12/12 - line-height: 1rem; - text-transform: uppercase; -} // General Copy diff --git a/app/assets/stylesheets/email.scss b/app/assets/stylesheets/email.scss index ee440da51..74bc318e5 100644 --- a/app/assets/stylesheets/email.scss +++ b/app/assets/stylesheets/email.scss @@ -29,7 +29,7 @@ a.underline-hover:hover { text-decoration: underline; } .callout { display:inline-block; padding-right:4px; padding-left:4px; line-height: 20px; background-color: #feffbc; text-decoration: none; } -.h1,.h2,.h3,.h4,.h5,.h6,.h7 { font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; font-weight:normal; margin-bottom:15px; color:#000; } +.h1,.h2,.h3,.h4,.h5,.h6 { font-family: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; font-weight:normal; margin-bottom:15px; color:#000; } .h1 small, .h2 small, .h3 small, .h4 small, .h5 small, .h6 small { font-size: 60%; color: #6f6f6f; line-height: 0; text-transform: none; } .h1 { font-size: 42px; mso-line-height-rule:exactly; line-height: 48px; } @@ -38,7 +38,6 @@ a.underline-hover:hover { text-decoration: underline; } .h4 { font-size: 18px; mso-line-height-rule:exactly; line-height: 22px; } .h5 { font-size: 15px; mso-line-height-rule:exactly; line-height: 20px; } .h6 { font-size: 13px; mso-line-height-rule:exactly; line-height: 20px; } -.h7 { font-size: 12px; mso-line-height-rule:exactly; line-height: 20px; } .text-1 { font-size: 20px; mso-line-height-rule:exactly; line-height: 28px; } .text-2 { font-size: 15px; mso-line-height-rule:exactly; line-height: 24px; } From 72f3a0984100934b85677da2cd9d254de2d090a0 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sat, 9 May 2015 15:00:57 -0400 Subject: [PATCH 16/28] Remove text-3 --- app/assets/stylesheets/_deprecated/_nocss.scss | 4 ---- app/assets/stylesheets/app/temp/style-guide-updates.scss | 4 ---- app/assets/stylesheets/email.scss | 1 - 3 files changed, 9 deletions(-) diff --git a/app/assets/stylesheets/_deprecated/_nocss.scss b/app/assets/stylesheets/_deprecated/_nocss.scss index c72d1695c..b82648167 100644 --- a/app/assets/stylesheets/_deprecated/_nocss.scss +++ b/app/assets/stylesheets/_deprecated/_nocss.scss @@ -1670,10 +1670,6 @@ $px4: 4px; @extend .#{$pre}fs1_3; @extend .#{$pre}lh2; } -.#{$pre}text-3, .#{$pre}text-3 a, .#{$pre}text-3 p { // 13/20 - @extend .#{$pre}fs1_1; - @extend .#{$pre}lh1_7; -} // ### Misc ### diff --git a/app/assets/stylesheets/app/temp/style-guide-updates.scss b/app/assets/stylesheets/app/temp/style-guide-updates.scss index 1e8578f2a..52558e91c 100644 --- a/app/assets/stylesheets/app/temp/style-guide-updates.scss +++ b/app/assets/stylesheets/app/temp/style-guide-updates.scss @@ -37,7 +37,3 @@ h6, .h6 { font-size: 1.3rem; line-height: 2rem; } -.text-3 { // 13/20 - font-size: 1.1rem; - line-height: 1.7rem; -} diff --git a/app/assets/stylesheets/email.scss b/app/assets/stylesheets/email.scss index 74bc318e5..f6f42acd1 100644 --- a/app/assets/stylesheets/email.scss +++ b/app/assets/stylesheets/email.scss @@ -41,7 +41,6 @@ a.underline-hover:hover { text-decoration: underline; } .text-1 { font-size: 20px; mso-line-height-rule:exactly; line-height: 28px; } .text-2 { font-size: 15px; mso-line-height-rule:exactly; line-height: 24px; } -.text-3 { font-size: 13px; mso-line-height-rule:exactly; line-height: 20px; } .lh_48 { mso-line-height-rule:exactly; line-height: 48px; } .lh_36 { mso-line-height-rule:exactly; line-height: 36px; } From e9dd0d8722ab64e1aa33b3a5c4469980c6f4a82d Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sat, 9 May 2015 15:01:46 -0400 Subject: [PATCH 17/28] Remove tranx --- .../stylesheets/_deprecated/_basspluss.scss | 22 ------------------- .../stylesheets/_deprecated/_nocss.scss | 20 ----------------- 2 files changed, 42 deletions(-) diff --git a/app/assets/stylesheets/_deprecated/_basspluss.scss b/app/assets/stylesheets/_deprecated/_basspluss.scss index ef013351e..b5a1bebdd 100644 --- a/app/assets/stylesheets/_deprecated/_basspluss.scss +++ b/app/assets/stylesheets/_deprecated/_basspluss.scss @@ -180,28 +180,6 @@ .pointer { cursor: pointer; } - -// ### transitions - -.tranx_fx { - -webkit-transition-duration: $transition-duration; - -webkit-transition-timing-function: $transition-function; - transition-duration: $transition-duration; - transition-timing-function: $transition-function; -} - -.tranx_m { - -webkit-transition-property: margin; - transition-property: margin; - @extend .tranx_fx; -} - -.tranx_p { - -webkit-transition-property: padding; - transition-property: padding; - @extend .tranx_fx; -} - // ### responsive // natively basscss has "sm, med, lg" prefixes for this, but we need more granular options // I propose the folowing standard .r###_selector diff --git a/app/assets/stylesheets/_deprecated/_nocss.scss b/app/assets/stylesheets/_deprecated/_nocss.scss index b82648167..a7877ef25 100644 --- a/app/assets/stylesheets/_deprecated/_nocss.scss +++ b/app/assets/stylesheets/_deprecated/_nocss.scss @@ -1676,23 +1676,3 @@ $px4: 4px; .#{$pre}open { max-height: 100%; } - -// ### Transitions ### -.#{$pre}tranx_fx { - -webkit-transition-duration: $transition-duration; - -webkit-transition-timing-function: $transition-function; - transition-duration: $transition-duration; - transition-timing-function: $transition-function; -} - -.#{$pre}tranx_m { - -webkit-transition-property: margin; - transition-property: margin; - // @extend .tranx_fx; -} - -.#{$pre}tranx_p { - -webkit-transition-property: padding; - transition-property: padding; - // @extend .tranx_fx; -} From 097f542855c394315b17c1cbff34dda4a7157c6a Mon Sep 17 00:00:00 2001 From: Lachlan Campbell Date: Sat, 9 May 2015 15:03:18 -0400 Subject: [PATCH 18/28] Remove .brand --- app/assets/stylesheets/app/components/brand.scss | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 app/assets/stylesheets/app/components/brand.scss diff --git a/app/assets/stylesheets/app/components/brand.scss b/app/assets/stylesheets/app/components/brand.scss deleted file mode 100644 index 75327c918..000000000 --- a/app/assets/stylesheets/app/components/brand.scss +++ /dev/null @@ -1,6 +0,0 @@ -.brand { - font-weight: 800; - letter-spacing: 1.5pt; - text-transform: uppercase; - line-height: inherit; -} From 47d95039cc457dbb66753439156123e1591365c7 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Sat, 9 May 2015 15:26:32 -0400 Subject: [PATCH 19/28] Continuing cruft excavation --- .../components/members_view.js.jsx | 2 +- .../components/ui/small_tile.js.jsx | 13 ----- .../stylesheets/app/components/apps.scss | 46 --------------- .../stylesheets/app/components/buttons.scss | 1 - .../stylesheets/app/components/card.scss | 5 -- .../stylesheets/app/components/chat.scss | 35 ------------ .../stylesheets/app/components/dashboard.scss | 10 +--- .../stylesheets/app/components/hero.scss | 40 ------------- .../stylesheets/app/components/jumbotron.scss | 1 - .../stylesheets/app/components/lightbox.scss | 56 ++++++------------- .../stylesheets/app/components/modals.scss | 12 ---- .../app/components/page_header.scss | 11 ---- .../app/components/tagged_input_group.scss | 3 - .../stylesheets/app/components/task_list.scss | 13 ----- .../stylesheets/app/components/tile.scss | 26 ++------- app/assets/stylesheets/email.scss | 2 - 16 files changed, 22 insertions(+), 254 deletions(-) delete mode 100644 app/assets/javascripts/components/ui/small_tile.js.jsx delete mode 100644 app/assets/stylesheets/app/components/tagged_input_group.scss diff --git a/app/assets/javascripts/components/members_view.js.jsx b/app/assets/javascripts/components/members_view.js.jsx index 1b93eb9ac..0819fc2bc 100644 --- a/app/assets/javascripts/components/members_view.js.jsx +++ b/app/assets/javascripts/components/members_view.js.jsx @@ -90,7 +90,7 @@ var OnlineUsersStore = require('../stores/online_users_store'); if (isMemberOnline(member)) { indicator = ( -
+
) } diff --git a/app/assets/javascripts/components/ui/small_tile.js.jsx b/app/assets/javascripts/components/ui/small_tile.js.jsx deleted file mode 100644 index 34feca3c3..000000000 --- a/app/assets/javascripts/components/ui/small_tile.js.jsx +++ /dev/null @@ -1,13 +0,0 @@ -var SmallTile = React.createClass({ - displayName: 'SmallTile', - - render: function() { - return ( -
- {this.props.children} -
- ); - } -}); - -module.exports = SmallTile; diff --git a/app/assets/stylesheets/app/components/apps.scss b/app/assets/stylesheets/app/components/apps.scss index 3859f34d9..ba1a96597 100644 --- a/app/assets/stylesheets/app/components/apps.scss +++ b/app/assets/stylesheets/app/components/apps.scss @@ -1,23 +1,3 @@ -// $app-top-height: 70px; -// -// .app-top { -// height: $app-top-height - 7; // sorry about the -7 -// } - -.app-main { - min-height: 15rem -} - -.app-logo { - // margin-top: -$app-top-height; - img { - width: 60px; - height: 60px; - background-color: $white; - border: solid 1px $gray-6; - } -} - .app-info { padding-left: 70px; } @@ -31,29 +11,3 @@ line-height: 1.2; font-size: 16px; } - -.app-tags { - line-height: 1.2; -} - -.big-block-button { - display: block; - margin: 1rem auto; - padding: 3rem 2rem; - text-align: center; - color:$gray-1; - font-size: 1.5rem; - background: $gray-5; - - &:hover { - background: $gray-4; - } -} - -.pill-gray { - background-color: $gray-3; - border-radius:1rem; - font-size:13px; - line-height:2rem; - padding: 0.2rem 1.5rem; -} diff --git a/app/assets/stylesheets/app/components/buttons.scss b/app/assets/stylesheets/app/components/buttons.scss index a1ef8f1cf..81b817658 100644 --- a/app/assets/stylesheets/app/components/buttons.scss +++ b/app/assets/stylesheets/app/components/buttons.scss @@ -1,4 +1,3 @@ - button, .button { padding: 0; } diff --git a/app/assets/stylesheets/app/components/card.scss b/app/assets/stylesheets/app/components/card.scss index 4823c0bfb..b478880f8 100644 --- a/app/assets/stylesheets/app/components/card.scss +++ b/app/assets/stylesheets/app/components/card.scss @@ -15,11 +15,6 @@ } } -.card-heading { - padding: 18px 24px; - border-bottom: 1px solid $brand-border; -} - .card-body { padding: 24px; } diff --git a/app/assets/stylesheets/app/components/chat.scss b/app/assets/stylesheets/app/components/chat.scss index 67c1c1a33..271fd3abe 100644 --- a/app/assets/stylesheets/app/components/chat.scss +++ b/app/assets/stylesheets/app/components/chat.scss @@ -1,26 +1,3 @@ -.chat-timeline { - margin-bottom: 0; -} - -.chat-actions { - padding-top: $padding-base-vertical + 2px; - padding-left: $grid-gutter-width * 1.5; - padding-right: $grid-gutter-width * 1.5; - - position: absolute; - bottom: 0; - left: 0; - right: 0; - background-color: white; - - border-top: 1px solid $brand-divider; - - &.is-fixed { - position: fixed; - bottom: 0; - } -} - .indicator { width: 8px; height: 8px; @@ -30,22 +7,10 @@ display: inline-block; } -.indicator-default { - background-color: $gray-5; -} - -.indicator-info { - background-color: $blue; -} - .indicator-success { background-color: $green; } -.indicator-danger { - background-color: $red; -} - .chat .markdown img { max-width: 100%; } diff --git a/app/assets/stylesheets/app/components/dashboard.scss b/app/assets/stylesheets/app/components/dashboard.scss index 31d19e835..ae5c6348e 100644 --- a/app/assets/stylesheets/app/components/dashboard.scss +++ b/app/assets/stylesheets/app/components/dashboard.scss @@ -3,7 +3,7 @@ /* -- HTML Pattern ---------------- -
+

Section Header Content

@@ -79,11 +79,3 @@ margin-bottom: 0; } } - -// -- Delta's ------------ -// -// http://assembly.com/about - -.dashboard-about { - // background-color: $gray-4; -} \ No newline at end of file diff --git a/app/assets/stylesheets/app/components/hero.scss b/app/assets/stylesheets/app/components/hero.scss index bce428699..75e3d942a 100644 --- a/app/assets/stylesheets/app/components/hero.scss +++ b/app/assets/stylesheets/app/components/hero.scss @@ -75,46 +75,6 @@ /* ^^^^^^^ about page */ } -// -- Delta's ------------ -// -// http://assembly.com/ideas -.hero-ideas { - padding-top: 5rem; - padding-bottom: 4rem; - color: $white; - background-image: url(../assets/ideas/ideas-header-bg.jpg); - background-position: top center; - @media screen and (min-width: 768px) { - background-image: url(../assets/ideas/ideas-header-bg-lg.jpg); - } - > .container { - @extend .text-2; - text-align: center; - // - > .main { - margin-bottom: 2.75rem; - } - } - h1 { - color: $white; - margin-top:0; - margin-bottom: 3rem; - } - a { - color: $white; - text-decoration:underline; - } - ._button { - margin:0 auto; - padding-left:3.25rem; - padding-right:3.25rem; - .title { - font-size:1.5rem; - line-height:2.75rem; - } - } -} - // For the about page .hero-about-top { padding-top: 6rem; diff --git a/app/assets/stylesheets/app/components/jumbotron.scss b/app/assets/stylesheets/app/components/jumbotron.scss index 660c7a768..b2291a617 100644 --- a/app/assets/stylesheets/app/components/jumbotron.scss +++ b/app/assets/stylesheets/app/components/jumbotron.scss @@ -7,5 +7,4 @@ background-size: cover; background-repeat: none; background-position: 50%; -// background: white; } diff --git a/app/assets/stylesheets/app/components/lightbox.scss b/app/assets/stylesheets/app/components/lightbox.scss index 979f4c033..cc4bcb010 100644 --- a/app/assets/stylesheets/app/components/lightbox.scss +++ b/app/assets/stylesheets/app/components/lightbox.scss @@ -36,47 +36,23 @@ body.lightbox-open, } .lightbox-dialog { - width: auto; - padding: 10px; - margin-right: auto; - margin-left: auto; - - .lightbox-header { - float: right; - .close { - margin-top: -2px; - } - } - - .lightbox-content { - position: relative; - background-color: #ffffff; - border: 1px solid #999999; - border: 1px solid rgba(0, 0, 0, 0.2); - border-radius: 6px; - outline: none; - -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); - box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); - background-clip: padding-box; - /**/ + width: auto; padding: 10px; - display: inline-block; - - .lightbox-caption { - position: absolute; - right: 8px; - bottom: 8px; - left: 10px; - padding: 2%; - font-size: 14px; - line-height: 18px; - color: white; - text-align: center; - text-shadow: 0 -1px 0 #000; - text-shadow: 0 -1px 0 rgba(0,0,0,0.3); - background: #000; - background: rgba(0,0,0,0.6); + margin-right: auto; + margin-left: auto; + + .lightbox-content { + position: relative; + background-color: #ffffff; + border: 1px solid #999999; + border: 1px solid rgba(0, 0, 0, 0.2); + border-radius: 6px; + outline: none; + -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); + box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5); + background-clip: padding-box; + padding: 10px; + display: inline-block; } } } -} diff --git a/app/assets/stylesheets/app/components/modals.scss b/app/assets/stylesheets/app/components/modals.scss index 39a87a926..f7a63384e 100644 --- a/app/assets/stylesheets/app/components/modals.scss +++ b/app/assets/stylesheets/app/components/modals.scss @@ -24,15 +24,3 @@ .modal-backdrop.fade { opacity: 0.5; } - -.modal-success { - background-color: $brand-success; -} - -.modal-warning { - background-color: rgba($brand-warning, 0.5); -} - -.modal-danger { - background-color: rgba($brand-danger, 0.5); -} diff --git a/app/assets/stylesheets/app/components/page_header.scss b/app/assets/stylesheets/app/components/page_header.scss index 7503e3a1f..a0162157d 100644 --- a/app/assets/stylesheets/app/components/page_header.scss +++ b/app/assets/stylesheets/app/components/page_header.scss @@ -7,14 +7,3 @@ margin-top: 0; } } - -// TODO Think about moving in with .summary -.page-header-meta { - margin-top: $line-height-computed / 4; - font-size: $font-size-small; - color: $brand-muted; - - > ul { - margin-bottom: 0; - } -} diff --git a/app/assets/stylesheets/app/components/tagged_input_group.scss b/app/assets/stylesheets/app/components/tagged_input_group.scss deleted file mode 100644 index 772115e09..000000000 --- a/app/assets/stylesheets/app/components/tagged_input_group.scss +++ /dev/null @@ -1,3 +0,0 @@ -.tagged-input-group { - -} diff --git a/app/assets/stylesheets/app/components/task_list.scss b/app/assets/stylesheets/app/components/task_list.scss index b03bbd052..2bb755910 100644 --- a/app/assets/stylesheets/app/components/task_list.scss +++ b/app/assets/stylesheets/app/components/task_list.scss @@ -76,10 +76,6 @@ $task-list-complete-bg: lighten($body-bg, 2%); .textcomplete-wrapper { width: 100%; } - - .list-meta { - margin-top: 4px; - } } &:first-child { @@ -164,15 +160,6 @@ $task-list-complete-bg: lighten($body-bg, 2%); } } -.task-list-item-remove { - background-color: #FCFDFD; - text-decoration: line-through; - - .list-meta { - display: none; - } -} - input[type="text"].task-list-entry { width: 100%; outline: none; diff --git a/app/assets/stylesheets/app/components/tile.scss b/app/assets/stylesheets/app/components/tile.scss index 476b2cdf3..115261377 100644 --- a/app/assets/stylesheets/app/components/tile.scss +++ b/app/assets/stylesheets/app/components/tile.scss @@ -56,12 +56,12 @@ .svg-icon-heart { width: 1.6rem; - // + .path1 { - fill:transparent; + fill: transparent; } .path2 { - fill:$gray-3; + fill: $gray-3; } } @@ -71,23 +71,5 @@ .svg-icon-share { width: 1.9rem; - fill:$gray-3; -} - -// -- Size Variations ------------ - -.tile-small { - min-height: 30.5rem; - margin-bottom: 0; // let the grid/container create margins - // - > .main { - height: 17rem; - overflow: hidden; - } - > .main a .content { - color: $gray-1; - } - .action-bar{ - margin-top: -1rem; - } + fill: $gray-3; } diff --git a/app/assets/stylesheets/email.scss b/app/assets/stylesheets/email.scss index f6f42acd1..58f0160d2 100644 --- a/app/assets/stylesheets/email.scss +++ b/app/assets/stylesheets/email.scss @@ -112,8 +112,6 @@ img { border: none; } .tile-item { border-bottom: 1px solid #ecedef; } .tile-header { max-width:600px; display:block; } -.nametag { margin-top:2px; font-size: 15px; line-height: 24px; font-weight: bold; color: #353941;} - .avatar-small { width:30px; height:30px; } .button { display:inline-block; text-align:center; border-radius:50px; background-color: #33d6a6; cursor:pointer; } From cf09ac9599b440a6d9fdd1db2bee5558649b44a4 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Thu, 14 May 2015 21:32:10 -0400 Subject: [PATCH 20/28] And I thought I was done --- .../javascripts/components/add_domain.js.jsx | 4 +- .../components/bounty_list_item.js.jsx | 6 +- .../javascripts/components/chat_entry.js.jsx | 2 +- .../components/financials_view.js.jsx | 2 +- .../javascripts/components/heart.js.jsx | 4 +- .../components/idea_progress_widget.js.jsx | 4 +- .../javascripts/components/info_modal.js.jsx | 4 +- .../components/invite_bounty_form.js.jsx | 2 +- .../javascripts/components/invite_list.js.jsx | 2 +- .../components/new_repository_preview.js.jsx | 2 +- ...news_feed_item_bounty_timeline_item.js.jsx | 2 +- .../news_feed/news_feed_item_post.js.jsx | 4 +- .../javascripts/components/people_view.js.jsx | 4 +- .../components/posts/posts_index.js.jsx | 6 +- .../components/products/metrics_charts.js.jsx | 4 +- .../products/product_activity.js.jsx | 2 +- app/assets/javascripts/components/tag.js.jsx | 2 +- .../javascripts/lib/bootstrap-lightbox.js | 10 +- .../stylesheets/_deprecated/_basspluss.scss | 305 --------- .../stylesheets/_deprecated/_nocss.scss | 588 +----------------- .../stylesheets/_deprecated/_nocss_mq.scss | 4 - .../stylesheets/_deprecated/_utility.scss | 14 - .../stylesheets/app/components/dashboard.scss | 81 --- .../stylesheets/app/components/lists.scss | 10 - .../stylesheets/app/components/markdown.scss | 4 +- .../stylesheets/app/components/modals.scss | 26 - .../app/components/progress_bars.scss | 3 +- .../stylesheets/app/components/square.scss | 2 - app/assets/stylesheets/app/slop.scss | 8 - .../stylesheets/basscss/_color-base.scss | 2 + .../activities/create_contract.mustache | 4 +- .../create_core_team_membership.mustache | 4 +- .../activities/destroy_contract.mustache | 4 +- .../activities/found_product.mustache | 4 +- app/templates/activities/git_push.mustache | 6 +- app/templates/activities/introduce.mustache | 6 +- app/templates/activities/launch.mustache | 6 +- .../activities/update_contract.mustache | 4 +- app/templates/events/closes/_close.mustache | 2 +- .../events/code_addeds/_code_added.mustache | 2 +- .../_comment_reference.mustache | 2 +- .../events/comments/_comment.mustache | 2 +- .../_commit_reference.mustache | 2 +- .../events/copy_addeds/_copy_added.mustache | 4 +- .../events/demotions/_demotion.mustache | 2 +- .../_design_deliverable.mustache | 2 +- .../events/promotions/_promotion.mustache | 2 +- .../_pull_request_reference.mustache | 2 +- app/templates/events/reopens/_reopen.mustache | 2 +- .../review_readies/_review_ready.mustache | 2 +- .../title_changes/_title_change.mustache | 2 +- .../events/type_changes/_type_change.mustache | 2 +- app/templates/events/wins/_win.mustache | 2 +- app/views/assets/_asset.html.erb | 2 +- app/views/assets/index.html.erb | 6 +- app/views/contracts/index.html.erb | 2 +- app/views/financials/_expense_modal.html.erb | 2 +- app/views/financials/index.html.erb | 2 +- app/views/layouts/product.html.erb | 2 +- app/views/pitch_week/_chip.html.erb | 2 +- app/views/playground/product_stage_1.html.erb | 8 +- app/views/post_mailer/created.html.erb | 2 +- app/views/post_mailer/mailing_list.html.erb | 2 +- app/views/products/chips/_greenlit.html.erb | 8 +- .../products/chips/_team_building.html.erb | 4 +- app/views/products/edit.html.erb | 16 +- app/views/products/welcome.html.erb | 24 +- app/views/projects/_milestone.html.erb | 4 +- app/views/projects/_project.html.erb | 16 +- app/views/projects/index.html.erb | 8 +- app/views/projects/show.html.erb | 10 +- app/views/repositories/index.html.erb | 2 +- app/views/shared/_footer_nav.html.erb | 10 +- app/views/users/balances/show.html.erb | 4 +- app/views/users/edit.html.erb | 2 +- app/views/users/passwords/new.html.erb | 4 +- app/views/users/registrations/new.html.erb | 2 +- app/views/users/sessions/new.html.erb | 2 +- 78 files changed, 158 insertions(+), 1171 deletions(-) delete mode 100644 app/assets/stylesheets/_deprecated/_nocss_mq.scss delete mode 100644 app/assets/stylesheets/_deprecated/_utility.scss delete mode 100644 app/assets/stylesheets/app/components/dashboard.scss delete mode 100644 app/assets/stylesheets/app/components/modals.scss diff --git a/app/assets/javascripts/components/add_domain.js.jsx b/app/assets/javascripts/components/add_domain.js.jsx index 0fff314ee..7de890077 100644 --- a/app/assets/javascripts/components/add_domain.js.jsx +++ b/app/assets/javascripts/components/add_domain.js.jsx @@ -80,7 +80,7 @@ var NewDomainTransfer = React.createClass({
-
+
@@ -122,7 +122,7 @@ var DomainPurchaseApplication = React.createClass({
-
+
diff --git a/app/assets/javascripts/components/bounty_list_item.js.jsx b/app/assets/javascripts/components/bounty_list_item.js.jsx index a3be69f90..2c6a62931 100644 --- a/app/assets/javascripts/components/bounty_list_item.js.jsx +++ b/app/assets/javascripts/components/bounty_list_item.js.jsx @@ -114,7 +114,7 @@ var BountyListItem = React.createClass({
-
+
{this.renderTitle()}
@@ -206,9 +206,9 @@ var BountyListItem = React.createClass({ return ( {bounty.title} {' '} - + #{bounty.number} - posted {moment(bounty.created_at).fromNow()} + posted {moment(bounty.created_at).fromNow()} ) diff --git a/app/assets/javascripts/components/chat_entry.js.jsx b/app/assets/javascripts/components/chat_entry.js.jsx index 0a5a5a78d..e6c1252c9 100644 --- a/app/assets/javascripts/components/chat_entry.js.jsx +++ b/app/assets/javascripts/components/chat_entry.js.jsx @@ -21,7 +21,7 @@
-
    +
    • diff --git a/app/assets/javascripts/components/financials_view.js.jsx b/app/assets/javascripts/components/financials_view.js.jsx index 72e149a94..444c01148 100644 --- a/app/assets/javascripts/components/financials_view.js.jsx +++ b/app/assets/javascripts/components/financials_view.js.jsx @@ -65,7 +65,7 @@ // TODO: Break out dl-inline styles into reusable SCSS components return (
      -
        +
        • Payout diff --git a/app/assets/javascripts/components/heart.js.jsx b/app/assets/javascripts/components/heart.js.jsx index c977114ae..1bff47ace 100644 --- a/app/assets/javascripts/components/heart.js.jsx +++ b/app/assets/javascripts/components/heart.js.jsx @@ -80,7 +80,7 @@ var Heart = React.createClass({
      return ( -       + {heartWithCount} ); @@ -147,7 +147,7 @@ var Heart = React.createClass({ return (
      -
      +
      {heartWithCount}
      diff --git a/app/assets/javascripts/components/idea_progress_widget.js.jsx b/app/assets/javascripts/components/idea_progress_widget.js.jsx index 2e9e66c53..855628938 100644 --- a/app/assets/javascripts/components/idea_progress_widget.js.jsx +++ b/app/assets/javascripts/components/idea_progress_widget.js.jsx @@ -66,11 +66,11 @@ const IdeaProgressWidget = React.createClass({ return (
      -
      +
      {this.state.stages[this.state.activeStage]['cta'] || this.state.stages[this.state.activeStage]['name']}
      -
      +
        {stages}
      diff --git a/app/assets/javascripts/components/info_modal.js.jsx b/app/assets/javascripts/components/info_modal.js.jsx index 34aecf873..0dfcc0604 100644 --- a/app/assets/javascripts/components/info_modal.js.jsx +++ b/app/assets/javascripts/components/info_modal.js.jsx @@ -48,7 +48,7 @@ }, logo: function() { - return ; + return ; }, render: function() { @@ -88,7 +88,7 @@ var product = this.props.product; return ( -
      +

      {product.name}

      {this.logo()}

      diff --git a/app/assets/javascripts/components/invite_bounty_form.js.jsx b/app/assets/javascripts/components/invite_bounty_form.js.jsx index 81b4e3005..cce662d56 100644 --- a/app/assets/javascripts/components/invite_bounty_form.js.jsx +++ b/app/assets/javascripts/components/invite_bounty_form.js.jsx @@ -25,7 +25,7 @@ var FormGroup = require('./form_group.js.jsx'); return (

      -

      Ask a friend

      +

      Ask a friend

      Know somebody who could help with this? Anybody can help out, all you need to do is ask.

      diff --git a/app/assets/javascripts/components/invite_list.js.jsx b/app/assets/javascripts/components/invite_list.js.jsx index 724de6a62..3a3bd00bb 100644 --- a/app/assets/javascripts/components/invite_list.js.jsx +++ b/app/assets/javascripts/components/invite_list.js.jsx @@ -10,7 +10,7 @@ var ReactCSSTransitionGroup = React.addons.CSSTransitionGroup; }) return (
      -
        +
          {inviteNodes} diff --git a/app/assets/javascripts/components/new_repository_preview.js.jsx b/app/assets/javascripts/components/new_repository_preview.js.jsx index fb21a2aa3..dba4bb4f7 100644 --- a/app/assets/javascripts/components/new_repository_preview.js.jsx +++ b/app/assets/javascripts/components/new_repository_preview.js.jsx @@ -116,7 +116,7 @@
      -
      +
      diff --git a/app/assets/javascripts/components/news_feed/news_feed_item_bounty_timeline_item.js.jsx b/app/assets/javascripts/components/news_feed/news_feed_item_bounty_timeline_item.js.jsx index 51396511c..b505f1941 100644 --- a/app/assets/javascripts/components/news_feed/news_feed_item_bounty_timeline_item.js.jsx +++ b/app/assets/javascripts/components/news_feed/news_feed_item_bounty_timeline_item.js.jsx @@ -58,7 +58,7 @@ module.exports = React.createClass({
      -
        +
        • diff --git a/app/assets/javascripts/components/news_feed/news_feed_item_post.js.jsx b/app/assets/javascripts/components/news_feed/news_feed_item_post.js.jsx index 4420d214e..edc09439e 100644 --- a/app/assets/javascripts/components/news_feed/news_feed_item_post.js.jsx +++ b/app/assets/javascripts/components/news_feed/news_feed_item_post.js.jsx @@ -27,7 +27,7 @@ module.exports = React.createClass({
          -
          +
          {this.props.title} @@ -35,7 +35,7 @@ module.exports = React.createClass({
          {this.renderSummary()}
          -
          +
          {this.renderReadMore()}
          diff --git a/app/assets/javascripts/components/people_view.js.jsx b/app/assets/javascripts/components/people_view.js.jsx index 42d19d9dc..be2c47284 100644 --- a/app/assets/javascripts/components/people_view.js.jsx +++ b/app/assets/javascripts/components/people_view.js.jsx @@ -130,8 +130,8 @@ return (
          -

          -

            +

            +

              {this.skills(member)}
            diff --git a/app/assets/javascripts/components/posts/posts_index.js.jsx b/app/assets/javascripts/components/posts/posts_index.js.jsx index 8a210128e..852dcdf98 100644 --- a/app/assets/javascripts/components/posts/posts_index.js.jsx +++ b/app/assets/javascripts/components/posts/posts_index.js.jsx @@ -98,19 +98,19 @@ var PostsIndex = React.createClass({ return [
          • - all posts + all posts
            • ,
          • - announcements + announcements
            • ,
          • - archived posts + archived posts
            • ]; diff --git a/app/assets/javascripts/components/products/metrics_charts.js.jsx b/app/assets/javascripts/components/products/metrics_charts.js.jsx index 053631d7d..a48b6f132 100644 --- a/app/assets/javascripts/components/products/metrics_charts.js.jsx +++ b/app/assets/javascripts/components/products/metrics_charts.js.jsx @@ -52,7 +52,7 @@ var MetricsCharts = React.createClass({ renderAddMetrics() { return this.blurredImage(() =>
            -

            +

            Metrics setup guide

            Configuring Assembly metrics integration allows you to see and show off your products success with the world.

            @@ -69,7 +69,7 @@ var MetricsCharts = React.createClass({ renderEmptyState() { return this.blurredImage(() =>
            -

            +

            No metrics collected yet

            Once {this.state.product.name} is up and running its metrics will appear here

            diff --git a/app/assets/javascripts/components/products/product_activity.js.jsx b/app/assets/javascripts/components/products/product_activity.js.jsx index 8c2c604aa..6aa27eb88 100644 --- a/app/assets/javascripts/components/products/product_activity.js.jsx +++ b/app/assets/javascripts/components/products/product_activity.js.jsx @@ -120,7 +120,7 @@ const ProductActivity = React.createClass({ return (
          • - {tag + ' posts'} + {tag + ' posts'}
            • ); diff --git a/app/assets/javascripts/components/tag.js.jsx b/app/assets/javascripts/components/tag.js.jsx index 2272ac520..ec9db4681 100644 --- a/app/assets/javascripts/components/tag.js.jsx +++ b/app/assets/javascripts/components/tag.js.jsx @@ -8,7 +8,7 @@ var Tag = React.createClass({ render: function() { var tag = this.props.tag; return ( - + #{this.props.tag.name} ); diff --git a/app/assets/javascripts/lib/bootstrap-lightbox.js b/app/assets/javascripts/lib/bootstrap-lightbox.js index 40a97b5af..39d28c48d 100755 --- a/app/assets/javascripts/lib/bootstrap-lightbox.js +++ b/app/assets/javascripts/lib/bootstrap-lightbox.js @@ -45,7 +45,7 @@ { that.backdrop(function () { - var transition = $.support.transition && that.$element.hasClass('fade'); + var transition = $.support.transition && that.$element.hasClass('muted'); if (!that.$element.parent().length) { @@ -100,7 +100,7 @@ .attr('aria-hidden', true) .off('click.dismiss.lightbox'); - $.support.transition && this.$element.hasClass('fade') ? + $.support.transition && this.$element.hasClass('muted') ? this.$element .one($.support.transition.end, $.proxy(this.hideModal(slide), this)) .emulateTransitionEnd(300) : @@ -150,12 +150,12 @@ Lightbox.prototype.backdrop = function (callback) { var that = this - var animate = this.$element.hasClass('fade') ? 'fade' : '' + var animate = this.$element.hasClass('muted') ? 'muted' : '' if (this.isShown && this.options.backdrop) { var doAnimate = $.support.transition && animate; - this.$backdrop = $('
            ') + this.$backdrop = $('
            ') .appendTo(document.body); this.$element.on('click.dismiss.lightbox', $.proxy(function (e) @@ -183,7 +183,7 @@ { this.$backdrop.removeClass('in'); - $.support.transition && this.$element.hasClass('fade')? + $.support.transition && this.$element.hasClass('muted')? this.$backdrop .one($.support.transition.end, callback) .emulateTransitionEnd(150) : diff --git a/app/assets/stylesheets/_deprecated/_basspluss.scss b/app/assets/stylesheets/_deprecated/_basspluss.scss index b5a1bebdd..0c29d5b34 100644 --- a/app/assets/stylesheets/_deprecated/_basspluss.scss +++ b/app/assets/stylesheets/_deprecated/_basspluss.scss @@ -1,12 +1,6 @@ // DO NOT USE - Phasing out this stylesheet - keep in remaining in play until below css can be sorted through & deprecated -// ### general - - -// TODO Replace with better responsive states -.none {display:none !important} - // TODO All of these could be removed by refactoring Assets // TODO Replace with beta BASS Helpers @@ -25,150 +19,16 @@ .z9 { z-index:9 } .z10 { z-index:10 } -.valign-top { vertical-align:top } -.valign-mid { vertical-align:middle } -.valign-btm { vertical-align:bottom } -.valign-pro { - top: 50%; - -webkit-transform: translateY(-50%); - transform: translateY(-50%); -} - - // padding - -.pt2 { padding-top: 1rem; } -.pb2 { padding-bottom: 1rem; } - - -// TODO Left in the create bounty dropdown -.pr7 { padding-right: 3.5rem; } - - - - - - .p0 { padding: 0 } -.px0 { padding-left: 0; padding-right: 0; } -.py0 { padding-top: 0; padding-bottom: 0; } - -.pt0 { padding-top: 0; } -.pt1 { padding-top: 0.5rem; } -.pt3 { padding-top: 1.5rem; } -.pt4 { padding-top: 2rem; } -.pt5 { padding-top: 2.5rem; } -.pt6 { padding-top: 3rem; } -.pt7 { padding-top: 3.5rem; } -.pt8 { padding-top: 4rem; } -.pt9 { padding-top: 4.5rem; } -.pt10 { padding-top: 5rem; } -.pt11 { padding-top: 5.5rem; } - -.pr0 { padding-right: 0; } -.pr1 { padding-right: 0.5rem; } -.pr2 { padding-right: 1rem; } -.pr3 { padding-right: 1.5rem; } -.pr4 { padding-right: 2rem; } -.pr5 { padding-right: 2.5rem; } -.pr6 { padding-right: 3rem; } -.pr8 { padding-right: 4rem; } -.pr9 { padding-right: 4.5rem; } -.pr10 { padding-right: 5rem; } -.pr11 { padding-right: 5.5rem; } - -.pb0 { padding-bottom: 0; } -.pb1 { padding-bottom: 0.5rem; } -.pb3 { padding-bottom: 1.5rem; } -.pb4 { padding-bottom: 2rem; } -.pb5 { padding-bottom: 2.5rem; } -.pb6 { padding-bottom: 3rem; } -.pb7 { padding-bottom: 3.5rem; } -.pb8 { padding-bottom: 4rem; } -.pb9 { padding-bottom: 4.5rem; } -.pb10 { padding-bottom: 5rem; } -.pb11 { padding-bottom: 5.5rem; } -// -.pb100p { padding-bottom:100%; } -.pb75p { padding-bottom:75%; } -.pb66p { padding-bottom:66.6666%; } -.pb50p { padding-bottom:50%; } -.pb33p { padding-bottom:33.3333%; } -.pb25p { padding-bottom:25%; } - -.pl0 { padding-left: 0; } -.pl1 { padding-left: 0.5rem; } -.pl2 { padding-left: 1rem; } -.pl3 { padding-left: 1.5rem; } -.pl4 { padding-left: 2rem; } -.pl5 { padding-left: 2.5rem; } -.pl6 { padding-left: 3rem; } -.pl7 { padding-left: 3.5rem; } -.pl8 { padding-left: 4rem; } -.pl9 { padding-left: 4.5rem; } -.pl10 { padding-left: 5rem; } -.pl11 { padding-left: 5.5rem; } - - -// margin - -.mright { margin-right: 0; margin-left: auto; } -.mcenter { margin-right: auto; margin-left: auto; } -.mleft { margin-right: auto; margin-left: 0; } - -.mb1_5 { margin-bottom:1.5rem } - -.mn1 { margin:-0.5rem } -.mn2 { margin:-1rem } -.mn3 { margin:-1.5rem } -.mn4 { margin:-2rem } -.mn5 { margin:-2.5rem } -.mn6 { margin:-3rem } -.mn7 { margin:-3.5rem } -.mn8 { margin:-4rem } -.mn9 { margin:-4.5rem } -.mn10 { margin:-5rem } -.mn11 { margin:-5.5rem } - -.mtn1 { margin-top:-0.5rem } -.mtn2 { margin-top:-1rem } -.mtn3 { margin-top:-1.5rem } -.mtn4 { margin-top:-2rem } -.mtn5 { margin-top:-2.5rem } - -.mrn1 { margin-right:-0.5rem } -.mrn2 { margin-right:-1rem } -.mrn3 { margin-right:-1.5rem } -.mrn4 { margin-right:-2rem } -.mrn5 { margin-right:-2.5rem } - -.mln1 { margin-left:-0.5rem } -.mln2 { margin-left:-1rem } -.mln3 { margin-left:-1.5rem } -.mln4 { margin-left:-2rem } -.mln5 { margin-left:-2.5rem } - -.mln5p { margin-left:-5% } - - -// ### table - -.table-fixed { table-layout:fixed } -.table-row { display:table-row } // ### typography -.fs1 { font-size:0.9rem; } -.fs2 { font-size:1rem; } .fs3 { font-size:1.1rem; } -.fs4 { font-size:1.25rem; } .fs5 { font-size:1.3rem; } -.fs6 { font-size:1.4rem; } .fw-200 { font-weight:200; } -.fw-500 { font-weight:500; } -.fw_600 { font-weight:600; } .lh0 { line-height:0 } .lh0_9 { line-height:0.9rem } @@ -179,168 +39,3 @@ // ### misc .pointer { cursor: pointer; } - -// ### responsive -// natively basscss has "sm, med, lg" prefixes for this, but we need more granular options -// I propose the folowing standard .r###_selector -@media screen and (min-width: 480px) { - .r480_block { - display:block !important; - } - .r480_w50p { - width:50% !important; - } -} - -@media screen and (min-width: 600px) { - .r600_none { - display:none !important; - } - .r600_width-auto { - width:auto !important; - } - .r600_float-right { - float:right !important; - } - .r600_float-left { - float:left !important; - } - .r600_right-align { - text-align:right !important; - } - .r600_block { - display:block !important; - } - .r600_w35 { - width: 17.5rem; - } - .r600_p0 { - padding:0 !important; - } - .r600_pt0 { - padding-top:0 !important; - } - .r600_pb0 { - padding-bottom:0 !important; - } - .r600_pl2 { - padding-left:1rem !important; - } - .r600_m0 { - margin:0 !important; - } - .r600_mx0 { - margin-left:0 !important; - margin-right:0 !important; - } - .r600_mr1 { - margin-right: .5rem !important; - } - .r600_mr2 { - margin-right: 1rem !important; - } - .r600_mb6 { - margin-bottom: 3rem !important; - } - .r600_table { - display: table !important; - table-layout:fixed !important; - } - .r600_table-cell { - display:table-cell !important; - } - .r600_left-align { - text-align: left !important; - } -} -@media screen and (min-width: 768px) { - .r768_none { - display:none !important; - } - .r768_block { - display:block !important; - } - .r768_inline-block { - display:inline-block !important; - } - .r768_w100p { - width:100% !important; - } - .r768_w50p { - width:50% !important; - } - .r768_w25p { - width:25% !important; - } - .r768_w35 { - width: 17.5rem !important; - } - .r768_mright { - margin-right: 0; - margin-left: auto; - } - .r768_mcenter { - margin-left: auto; margin-right: auto; - } - .r768_m0 { - margin: 0 !important; - } - .r768_ml0 { - margin-left:0 !important; - } - .r768_p0 { - padding:0 !important; - } - .r768_pr0 { - padding-right:0 !important; - } - .r768_pr4 { - padding-right:2rem !important; - } - .r768_pl1 { - padding-left:1rem !important; - } - .r768_pr1 { - padding-right:1rem !important; - } - .r768_pb0 { - padding-bottom:0 !important; - } - .r768_table { - display: table !important; - table-layout:fixed !important; - } - .r768_table-cell { - display:table-cell !important; - } - .r768_left-align { - text-align: left !important; - } - .r768_right-align { - text-align: right !important; - } - .r768_float-right { - float:right !important; - } -} - -@media screen and (min-width: 992px) { - .r992_inline-block { - display: inline-block !important; - } - .r992_w45 { - width: 22.5rem !important; - } -} - -@media screen and (min-width: 1024px) { - .r1024_block { - display: block !important; - } - .r1024_inline-block { - display: inline-block !important; - } - .r1024_w50p { - width:50% !important; - } -} diff --git a/app/assets/stylesheets/_deprecated/_nocss.scss b/app/assets/stylesheets/_deprecated/_nocss.scss index a7877ef25..535e80802 100644 --- a/app/assets/stylesheets/_deprecated/_nocss.scss +++ b/app/assets/stylesheets/_deprecated/_nocss.scss @@ -170,235 +170,17 @@ $px4: 4px; .#{$pre}z9 { z-index:9 } .#{$pre}z10 { z-index:10 } -// -- position -.#{$pre}pos-absolute { position:absolute } -.#{$pre}pos-fixed { position:fixed } -.#{$pre}pos-relative { position:relative } -.#{$pre}pos-static { position:static } - -// top -.#{$pre}pos-t0 { top:$r0 } -.#{$pre}pos-t0_25 { top:$r0_25 } -.#{$pre}pos-t0_5 { top:$r0_5 } -.#{$pre}pos-t0_75 { top:$r0_75 } -.#{$pre}pos-t1 { top:$r1 } -.#{$pre}pos-t1_25 { top:$r1 } -.#{$pre}pos-t1_5 { top:$r1_5 } -.#{$pre}pos-t1_75 { top:$r1_75 } -.#{$pre}pos-t2 { top:$r2 } -.#{$pre}pos-t2_25 { top:$r2_25 } -.#{$pre}pos-t2_5 { top:$r2_5 } -.#{$pre}pos-t2_75 { top:$r2_75 } -.#{$pre}pos-t3 { top:$r3 } -.#{$pre}pos-t3_25 { top:$r3_25 } -.#{$pre}pos-t3_5 { top:$r3_5 } -.#{$pre}pos-t3_75 { top:$r3_75 } -.#{$pre}pos-t4 { top:$r4 } -.#{$pre}pos-t4_25 { top:$r4_25 } -.#{$pre}pos-t4_5 { top:$r4_5 } -.#{$pre}pos-t4_75 { top:$r4_75 } -.#{$pre}pos-t5 { top:$r5 } -.#{$pre}pos-t5_25 { top:$r5_25 } -.#{$pre}pos-t5_5 { top:$r5_5 } -.#{$pre}pos-t5_75 { top:$r5_75 } - -.#{$pre}pos-tn0_25 { top:-$r0_25 } -.#{$pre}pos-tn0_5 { top:-$r0_5 } -.#{$pre}pos-tn0_75 { top:-$r0_75 } -.#{$pre}pos-tn1 { top:-$r1 } -.#{$pre}pos-tn1_25 { top:-$r1_25 } -.#{$pre}pos-tn1_5 { top:-$r1_5 } -.#{$pre}pos-tn1_75 { top:-$r1_75 } -.#{$pre}pos-tn2 { top:-$r2 } -.#{$pre}pos-tn2_25 { top:-$r2_25 } -.#{$pre}pos-tn2_5 { top:-$r2_5 } -.#{$pre}pos-tn2_75 { top:-$r2_75 } -.#{$pre}pos-tn3 { top:-$r3 } -.#{$pre}pos-tn3_25 { top:-$r3_25 } -.#{$pre}pos-tn3_5 { top:-$r3_5 } -.#{$pre}pos-tn3_75 { top:-$r3_75 } -.#{$pre}pos-tn4 { top:-$r4 } -.#{$pre}pos-tn4_25 { top:-$r4_25 } -.#{$pre}pos-tn4_5 { top:-$r4_5 } -.#{$pre}pos-tn4_75 { top:-$r4_75 } -.#{$pre}pos-tn5 { top:-$r5 } -.#{$pre}pos-tn5_25 { top:-$r5_25 } -.#{$pre}pos-tn5_5 { top:-$r5_5 } -.#{$pre}pos-tn5_75 { top:-$r5_75 } - -// right -.#{$pre}pos-r0 { right:$r0 } -.#{$pre}pos-r0_25 { right:$r0_25 } -.#{$pre}pos-r0_5 { right:$r0_5 } -.#{$pre}pos-r0_75 { right:$r0_75 } -.#{$pre}pos-r1 { right:$r1 } -.#{$pre}pos-r1_25 { right:$r1_25 } -.#{$pre}pos-r1_5 { right:$r1_5 } -.#{$pre}pos-r1_75 { right:$r1_75 } -.#{$pre}pos-r2 { right:$r2 } -.#{$pre}pos-r2_25 { right:$r2_25 } -.#{$pre}pos-r2_5 { right:$r2_5 } -.#{$pre}pos-r2_75 { right:$r2_75 } -.#{$pre}pos-r3 { right:$r3 } -.#{$pre}pos-r3_25 { right:$r3_25 } -.#{$pre}pos-r3_5 { right:$r3_5 } -.#{$pre}pos-r3_75 { right:$r3_75 } -.#{$pre}pos-r4 { right:$r4 } -.#{$pre}pos-r4_25 { right:$r4_25 } -.#{$pre}pos-r4_5 { right:$r4_5 } -.#{$pre}pos-r4_75 { right:$r4_75 } -.#{$pre}pos-r5 { right:$r5 } -.#{$pre}pos-r5_25 { right:$r5_25 } -.#{$pre}pos-r5_5 { right:$r5_5 } -.#{$pre}pos-r5_75 { right:$r5_75 } - -.#{$pre}pos-rn0_25 { right:-$r0_25 } -.#{$pre}pos-rn0_5 { right:-$r0_5 } -.#{$pre}pos-rn0_75 { right:-$r0_75 } -.#{$pre}pos-rn1 { right:-$r1 } -.#{$pre}pos-rn1_25 { right:-$r1_25 } -.#{$pre}pos-rn1_5 { right:-$r1_5 } -.#{$pre}pos-rn1_75 { right:-$r1_75 } -.#{$pre}pos-rn2 { right:-$r2 } -.#{$pre}pos-rn2_25 { right:-$r2_25 } -.#{$pre}pos-rn2_5 { right:-$r2_5 } -.#{$pre}pos-rn2_75 { right:-$r2_75 } -.#{$pre}pos-rn3 { right:-$r3 } -.#{$pre}pos-rn3_25 { right:-$r3_25 } -.#{$pre}pos-rn3_5 { right:-$r3_5 } -.#{$pre}pos-rn3_75 { right:-$r3_75 } -.#{$pre}pos-rn4 { right:-$r4 } -.#{$pre}pos-rn4_25 { right:-$r4_25 } -.#{$pre}pos-rn4_5 { right:-$r4_5 } -.#{$pre}pos-rn4_75 { right:-$r4_75 } -.#{$pre}pos-rn5 { right:-$r5 } -.#{$pre}pos-rn5_25 { right:-$r5_25 } -.#{$pre}pos-rn5_5 { right:-$r5_5 } -.#{$pre}pos-rn5_75 { right:-$r5_75 } - -// bottom -.#{$pre}pos-b0 { bottom:$r0 } -.#{$pre}pos-b0_25 { bottom:$r0_25 } -.#{$pre}pos-b0_5 { bottom:$r0_5 } -.#{$pre}pos-b0_75 { bottom:$r0_75 } -.#{$pre}pos-b1 { bottom:$r1 } -.#{$pre}pos-b1_25 { bottom:$r1_25 } -.#{$pre}pos-b1_5 { bottom:$r1_5 } -.#{$pre}pos-b1_75 { bottom:$r1_75 } -.#{$pre}pos-b2 { bottom:$r2 } -.#{$pre}pos-b2_25 { bottom:$r2_25 } -.#{$pre}pos-b2_5 { bottom:$r2_5 } -.#{$pre}pos-b2_75 { bottom:$r2_75 } -.#{$pre}pos-b3 { bottom:$r3 } -.#{$pre}pos-b3_25 { bottom:$r3_25 } -.#{$pre}pos-b3_5 { bottom:$r3_5 } -.#{$pre}pos-b3_75 { bottom:$r3_75 } -.#{$pre}pos-b4 { bottom:$r4 } -.#{$pre}pos-b4_25 { bottom:$r4_25 } -.#{$pre}pos-b4_5 { bottom:$r4_5 } -.#{$pre}pos-b4_75 { bottom:$r4_75 } -.#{$pre}pos-b5 { bottom:$r5 } -.#{$pre}pos-b5_25 { bottom:$r5_25 } -.#{$pre}pos-b5_5 { bottom:$r5_5 } -.#{$pre}pos-b5_75 { bottom:$r5_75 } - -.#{$pre}pos-bn0_25 { bottom:-$r0_25 } -.#{$pre}pos-bn0_5 { bottom:-$r0_5 } -.#{$pre}pos-bn0_75 { bottom:-$r0_75 } -.#{$pre}pos-bn1 { bottom:-$r1 } -.#{$pre}pos-bn1_25 { bottom:-$r1_25 } -.#{$pre}pos-bn1_5 { bottom:-$r1_5 } -.#{$pre}pos-bn1_75 { bottom:-$r1_75 } -.#{$pre}pos-bn2 { bottom:-$r2 } -.#{$pre}pos-bn2_25 { bottom:-$r2_25 } -.#{$pre}pos-bn2_5 { bottom:-$r2_5 } -.#{$pre}pos-bn2_75 { bottom:-$r2_75 } -.#{$pre}pos-bn3 { bottom:-$r3 } -.#{$pre}pos-bn3_25 { bottom:-$r3_25 } -.#{$pre}pos-bn3_5 { bottom:-$r3_5 } -.#{$pre}pos-bn3_75 { bottom:-$r3_75 } -.#{$pre}pos-bn4 { bottom:-$r4 } -.#{$pre}pos-bn4_25 { bottom:-$r4_25 } -.#{$pre}pos-bn4_5 { bottom:-$r4_5 } -.#{$pre}pos-bn4_75 { bottom:-$r4_75 } -.#{$pre}pos-bn5 { bottom:-$r5 } -.#{$pre}pos-bn5_25 { bottom:-$r5_25 } -.#{$pre}pos-bn5_5 { bottom:-$r5_5 } -.#{$pre}pos-bn5_75 { bottom:-$r5_75 } - -// left -.#{$pre}pos-l0 { left:$r0 } -.#{$pre}pos-l0_25 { left:$r0_25 } -.#{$pre}pos-l0_5 { left:$r0_5 } -.#{$pre}pos-l0_75 { left:$r0_75 } -.#{$pre}pos-l1 { left:$r1 } -.#{$pre}pos-l1_25 { left:$r1_25 } -.#{$pre}pos-l1_5 { left:$r1_5 } -.#{$pre}pos-l1_75 { left:$r1_75 } -.#{$pre}pos-l2 { left:$r2 } -.#{$pre}pos-l2_25 { left:$r2_25 } -.#{$pre}pos-l2_5 { left:$r2_5 } -.#{$pre}pos-l2_75 { left:$r2_75 } -.#{$pre}pos-l3 { left:$r3 } -.#{$pre}pos-l3_25 { left:$r3_25 } -.#{$pre}pos-l3_5 { left:$r3_5 } -.#{$pre}pos-l3_75 { left:$r3_75 } -.#{$pre}pos-l4 { left:$r4 } -.#{$pre}pos-l4_25 { left:$r4_25 } -.#{$pre}pos-l4_5 { left:$r4_5 } -.#{$pre}pos-l4_75 { left:$r4_75 } -.#{$pre}pos-l5 { left:$r5 } -.#{$pre}pos-l5_25 { left:$r5_25 } -.#{$pre}pos-l5_5 { left:$r5_5 } -.#{$pre}pos-l5_75 { left:$r5_75 } - -.#{$pre}pos-ln0_25 { left:-$r0_25 } -.#{$pre}pos-ln0_5 { left:-$r0_5 } -.#{$pre}pos-ln0_75 { left:-$r0_75 } -.#{$pre}pos-ln1 { left:-$r1 } -.#{$pre}pos-ln1_25 { left:-$r1_25 } -.#{$pre}pos-ln1_5 { left:-$r1_5 } -.#{$pre}pos-ln1_75 { left:-$r1_75 } -.#{$pre}pos-ln2 { left:-$r2 } -.#{$pre}pos-ln2_25 { left:-$r2_25 } -.#{$pre}pos-ln2_5 { left:-$r2_5 } -.#{$pre}pos-ln2_75 { left:-$r2_75 } -.#{$pre}pos-ln3 { left:-$r3 } -.#{$pre}pos-ln3_25 { left:-$r3_25 } -.#{$pre}pos-ln3_5 { left:-$r3_5 } -.#{$pre}pos-ln3_75 { left:-$r3_75 } -.#{$pre}pos-ln4 { left:-$r4 } -.#{$pre}pos-ln4_25 { left:-$r4_25 } -.#{$pre}pos-ln4_5 { left:-$r4_5 } -.#{$pre}pos-ln4_75 { left:-$r4_75 } -.#{$pre}pos-ln5 { left:-$r5 } -.#{$pre}pos-ln5_25 { left:-$r5_25 } -.#{$pre}pos-ln5_5 { left:-$r5_5 } -.#{$pre}pos-ln5_75 { left:-$r5_75 } - // -- floats & clears .#{$pre}float-left { float:left } .#{$pre}float-right { float:right } .#{$pre}float-none { float:none } -// -- alignment -.#{$pre}margin-align-right { margin-right:$r0; margin-left:auto; } -.#{$pre}margin-align-center { margin-right:auto; margin-left:auto; } -.#{$pre}margin-left-align { margin-right:auto; margin-left:$r0; } +// -- text alignment .#{$pre}text-align-right { text-align:right } .#{$pre}text-align-center { text-align:center } .#{$pre}text-left-align { text-align:left } -.#{$pre}valign-top { vertical-align:top } -.#{$pre}valign-middle { vertical-align:middle } -.#{$pre}valign-bottom { vertical-align:bottom } -.#{$pre}valign-pro { - top: $pc50; - -webkit-transform: translateY(-$pc50); - transform: translateY(-$pc50); -} - // ### Table ### .#{$pre}table { display:table } .#{$pre}table-fixed { table-layout:fixed } @@ -410,283 +192,6 @@ $px4: 4px; .#{$pre}list-inline > li { display:inline-block } .#{$pre}list-none > li { display:none } -.#{$pre}list-mr0 > li { margin-right:$r0 } -.#{$pre}list-mr0_25 > li { margin-right:$r0_25 } -.#{$pre}list-mr0_5 > li { margin-right:$r0_5 } -.#{$pre}list-mr0_75 > li { margin-right:$r0_75 } -.#{$pre}list-mr1 > li { margin-right:$r1 } -.#{$pre}list-mr1_25 > li { margin-right:$r1_25 } -.#{$pre}list-mr1_5 > li { margin-right:$r1_5 } -.#{$pre}list-mr1_75 > li { margin-right:$r1_75 } -.#{$pre}list-mr2 > li { margin-right:$r2 } -.#{$pre}list-mr2_25 > li { margin-right:$r2_25 } -.#{$pre}list-mr2_5 > li { margin-right:$r2_5 } -.#{$pre}list-mr2_75 > li { margin-right:$r2_75 } -.#{$pre}list-mr3 > li { margin-right:$r3 } -.#{$pre}list-mr3_25 > li { margin-right:$r3_25 } -.#{$pre}list-mr3_5 > li { margin-right:$r3_5 } -.#{$pre}list-mr3_75 > li { margin-right:$r3_75 } -.#{$pre}list-mr4 > li { margin-right:$r4 } -.#{$pre}list-mr4_25 > li { margin-right:$r4_25 } -.#{$pre}list-mr4_5 > li { margin-right:$r4_5 } -.#{$pre}list-mr4_75 > li { margin-right:$r4_75 } -.#{$pre}list-mr5 > li { margin-right:$r5 } -.#{$pre}list-mr5_25 > li { margin-right:$r5_25 } -.#{$pre}list-mr5_5 > li { margin-right:$r5_5 } -.#{$pre}list-mr5_75 > li { margin-right:$r5_75 } - -.#{$pre}list-ml0 > li { margin-left:$r0 } -.#{$pre}list-ml0_25 > li { margin-left:$r0_25 } -.#{$pre}list-ml0_5 > li { margin-left:$r0_5 } -.#{$pre}list-ml0_75 > li { margin-left:$r0_75 } -.#{$pre}list-ml1 > li { margin-left:$r1 } -.#{$pre}list-ml1_25 > li { margin-left:$r1_25 } -.#{$pre}list-ml1_5 > li { margin-left:$r1_5 } -.#{$pre}list-ml1_75 > li { margin-left:$r1_75 } -.#{$pre}list-ml2 > li { margin-left:$r2 } -.#{$pre}list-ml2_25 > li { margin-left:$r2_25 } -.#{$pre}list-ml2_5 > li { margin-left:$r2_5 } -.#{$pre}list-ml2_75 > li { margin-left:$r2_75 } -.#{$pre}list-ml3 > li { margin-left:$r3 } -.#{$pre}list-ml3_25 > li { margin-left:$r3_25 } -.#{$pre}list-ml3_5 > li { margin-left:$r3_5 } -.#{$pre}list-ml3_75 > li { margin-left:$r3_75 } -.#{$pre}list-ml4 > li { margin-left:$r4 } -.#{$pre}list-ml4_25 > li { margin-left:$r4_25 } -.#{$pre}list-ml4_5 > li { margin-left:$r4_5 } -.#{$pre}list-ml4_75 > li { margin-left:$r4_75 } -.#{$pre}list-ml5 > li { margin-left:$r5 } -.#{$pre}list-ml5_25 > li { margin-left:$r5_25 } -.#{$pre}list-ml5_5 > li { margin-left:$r5_5 } -.#{$pre}list-ml5_75 > li { margin-left:$r5_75 } - -// -- height -.#{$pre}ht100p { height:$pc100 } -.#{$pre}ht75p { height:$pc75 } -.#{$pre}ht66p { height:$pc66 } -.#{$pre}ht50p { height:$pc50 } -.#{$pre}ht33p { height:$pc33 } -.#{$pre}ht25p { height:$pc25 } - -.#{$pre}ht0 { height:$r0 } -.#{$pre}ht0_25 { height:$r0_25 } -.#{$pre}ht0_5 { height:$r0_5 } -.#{$pre}ht0_75 { height:$r0_75 } -.#{$pre}ht1 { height:$r1 } -.#{$pre}ht1_25 { height:$r1_25 } -.#{$pre}ht1_5 { height:$r1_5 } -.#{$pre}ht1_75 { height:$r1_75 } -.#{$pre}ht2 { height:$r2 } -.#{$pre}ht2_25 { height:$r2_25 } -.#{$pre}ht2_5 { height:$r2_5 } -.#{$pre}ht2_75 { height:$r2_75 } -.#{$pre}ht3 { height:$r3 } -.#{$pre}ht3_25 { height:$r3_25 } -.#{$pre}ht3_5 { height:$r3_5 } -.#{$pre}ht3_75 { height:$r3_75 } -.#{$pre}ht4 { height:$r4 } -.#{$pre}ht4_25 { height:$r4_25 } -.#{$pre}ht4_5 { height:$r4_5 } -.#{$pre}ht4_75 { height:$r4_75 } -.#{$pre}ht5 { height:$r5 } -.#{$pre}ht5_25 { height:$r5_25 } -.#{$pre}ht5_5 { height:$r5_5 } -.#{$pre}ht5_75 { height:$r5_75 } -.#{$pre}ht6 { height:$r6 } -.#{$pre}ht6_25 { height:$r6_25 } -.#{$pre}ht6_5 { height:$r6_5 } -.#{$pre}ht6_75 { height:$r6_75 } -.#{$pre}ht7 { height:$r7 } -.#{$pre}ht7_25 { height:$r7_25 } -.#{$pre}ht7_5 { height:$r7_5 } -.#{$pre}ht7_75 { height:$r7_75 } -.#{$pre}ht8 { height:$r8 } -.#{$pre}ht8_25 { height:$r8_25 } -.#{$pre}ht8_5 { height:$r8_5 } -.#{$pre}ht8_75 { height:$r8_75} -.#{$pre}ht9 { height:$r9 } -.#{$pre}ht9_25 { height:$r9_25 } -.#{$pre}ht9_5 { height:$r9_5 } -.#{$pre}ht9_75 { height:$r9_75 } -.#{$pre}ht10 { height:$r10 } -.#{$pre}ht10_25 { height:$r10_25 } -.#{$pre}ht10_5 { height:$r10_5 } -.#{$pre}ht10_75 { height:$r10_75 } -.#{$pre}ht11 { height:$r11 } -.#{$pre}ht11_25 { height:$r11_25 } -.#{$pre}ht11_5 { height:$r11_5 } -.#{$pre}ht11_75 { height:$r11_75 } -.#{$pre}ht12 { height:$r12 } -.#{$pre}ht12_25 { height:$r12_25 } -.#{$pre}ht12_5 { height:$r12_5 } -.#{$pre}ht12_75 { height:$r12_75 } -.#{$pre}ht13 { height:$r13 } -.#{$pre}ht13_25 { height:$r13_25 } -.#{$pre}ht13_5 { height:$r13_5 } -.#{$pre}ht13_75 { height:$r13_75 } -.#{$pre}ht14 { height:$r14 } -.#{$pre}ht14_25 { height:$r14_25 } -.#{$pre}ht14_5 { height:$r14_5 } -.#{$pre}ht14_75 { height:$r14_75 } -.#{$pre}ht15 { height:$r15 } -.#{$pre}ht15_25 { height:$r15_25 } -.#{$pre}ht15_5 { height:$r15_5 } -.#{$pre}ht15_75 { height:$r15_75 } -.#{$pre}ht16 { height:$r16 } -.#{$pre}ht16_25 { height:$r16_25 } -.#{$pre}ht16_5 { height:$r16_5 } -.#{$pre}ht16_75 { height:$r16_75 } -.#{$pre}ht17 { height:$r17 } -.#{$pre}ht17_25 { height:$r17_25 } -.#{$pre}ht17_5 { height:$r17_5 } -.#{$pre}ht17_75 { height:$r17_75 } -.#{$pre}ht18 { height:$r18 } -.#{$pre}ht18_25 { height:$r18_25 } -.#{$pre}ht18_5 { height:$r18_5 } -.#{$pre}ht18_75 { height:$r18_75 } -.#{$pre}ht19 { height:$r19 } -.#{$pre}ht19_25 { height:$r19_25 } -.#{$pre}ht19_5 { height:$r19_5 } -.#{$pre}ht19_75 { height:$r19_75 } -.#{$pre}ht20 { height:$r20 } -.#{$pre}ht20_25 { height:$r20_25 } -.#{$pre}ht20_5 { height:$r20_5 } -.#{$pre}ht20_75 { height:$r20_75 } -.#{$pre}ht21 { height:$r22 } -.#{$pre}ht21_25 { height:$r22_25 } -.#{$pre}ht21_5 { height:$r21_5 } -.#{$pre}ht21_75 { height:$r21_75 } -.#{$pre}ht22 { height:$r22 } -.#{$pre}ht22_25 { height:$r22_25 } -.#{$pre}ht22_5 { height:$r22_5 } -.#{$pre}ht22_75 { height:$r22_75 } -.#{$pre}ht23 { height:$r23 } -.#{$pre}ht23_25 { height:$r23_25 } -.#{$pre}ht23_5 { height:$r23_5 } -.#{$pre}ht23_75 { height:$r23_75 } -.#{$pre}ht24 { height:$r24 } -.#{$pre}ht24_25 { height:$r24_25 } -.#{$pre}ht24_5 { height:$r24_5 } -.#{$pre}ht24_75 { height:$r24_75 } -.#{$pre}ht25 { height:$r25 } -.#{$pre}ht25_25 { height:$r25_25 } -.#{$pre}ht25_5 { height:$r25_5 } // 300px -.#{$pre}ht25_75 { height:$r25_75 } - -// -- max-height -.#{$pre}mh110p { max-height:$pc110; } -.#{$pre}mh100p { max-height:$pc100; } -.#{$pre}mh75p { max-height:$pc75; } -.#{$pre}mh66p { max-height:$pc66; } -.#{$pre}mh50p { max-height:$pc50; } -.#{$pre}mh33p { max-height:$pc33; } -.#{$pre}mh25p { max-height:$pc25; } - -.#{$pre}mh0 { max-height:$r0 } -.#{$pre}mh0_25 { max-height:$r0_25 } -.#{$pre}mh0_5 { max-height:$r0_5 } -.#{$pre}mh0_75 { max-height:$r0_75 } -.#{$pre}mh1 { max-height:$r1 } -.#{$pre}mh1_25 { max-height:$r1_25 } -.#{$pre}mh1_5 { max-height:$r1_5 } -.#{$pre}mh1_75 { max-height:$r1_75 } -.#{$pre}mh2 { max-height:$r2 } -.#{$pre}mh2_25 { max-height:$r2_25 } -.#{$pre}mh2_5 { max-height:$r2_5 } -.#{$pre}mh2_75 { max-height:$r2_75 } -.#{$pre}mh3 { max-height:$r3 } -.#{$pre}mh3_25 { max-height:$r3_25 } -.#{$pre}mh3_5 { max-height:$r3_5 } -.#{$pre}mh3_75 { max-height:$r3_75 } -.#{$pre}mh4 { max-height:$r4 } -.#{$pre}mh4_25 { max-height:$r4_25 } -.#{$pre}mh4_5 { max-height:$r4_5 } -.#{$pre}mh4_75 { max-height:$r4_75 } -.#{$pre}mh5 { max-height:$r5 } -.#{$pre}mh5_25 { max-height:$r5_25 } -.#{$pre}mh5_5 { max-height:$r5_5 } -.#{$pre}mh5_75 { max-height:$r5_75 } -.#{$pre}mh6 { max-height:$r6 } -.#{$pre}mh6_25 { max-height:$r6_25 } -.#{$pre}mh6_5 { max-height:$r6_5 } -.#{$pre}mh6_75 { max-height:$r6_75 } -.#{$pre}mh7 { max-height:$r7 } -.#{$pre}mh7_25 { max-height:$r7_25 } -.#{$pre}mh7_5 { max-height:$r7_5 } -.#{$pre}mh7_75 { max-height:$r7_75 } -.#{$pre}mh8 { max-height:$r8 } -.#{$pre}mh8_25 { max-height:$r8_25 } -.#{$pre}mh8_5 { max-height:$r8_5 } -.#{$pre}mh8_75 { max-height:$r8_75} -.#{$pre}mh9 { max-height:$r9 } -.#{$pre}mh9_25 { max-height:$r9_25 } -.#{$pre}mh9_5 { max-height:$r9_5 } -.#{$pre}mh9_75 { max-height:$r9_75 } -.#{$pre}mh10 { max-height:$r10 } -.#{$pre}mh10_25 { max-height:$r10_25 } -.#{$pre}mh10_5 { max-height:$r10_5 } -.#{$pre}mh10_75 { max-height:$r10_75 } -.#{$pre}mh11 { max-height:$r11 } -.#{$pre}mh11_25 { max-height:$r11_25 } -.#{$pre}mh11_5 { max-height:$r11_5 } -.#{$pre}mh11_75 { max-height:$r11_75 } -.#{$pre}mh12 { max-height:$r12 } -.#{$pre}mh12_25 { max-height:$r12_25 } -.#{$pre}mh12_5 { max-height:$r12_5 } -.#{$pre}mh12_75 { max-height:$r12_75 } -.#{$pre}mh13 { max-height:$r13 } -.#{$pre}mh13_25 { max-height:$r13_25 } -.#{$pre}mh13_5 { max-height:$r13_5 } -.#{$pre}mh13_75 { max-height:$r13_75 } -.#{$pre}mh14 { max-height:$r14 } -.#{$pre}mh14_25 { max-height:$r14_25 } -.#{$pre}mh14_5 { max-height:$r14_5 } -.#{$pre}mh14_75 { max-height:$r14_75 } -.#{$pre}mh15 { max-height:$r15 } -.#{$pre}mh15_25 { max-height:$r15_25 } -.#{$pre}mh15_5 { max-height:$r15_5 } -.#{$pre}mh15_75 { max-height:$r15_75 } -.#{$pre}mh16 { max-height:$r16 } -.#{$pre}mh16_25 { max-height:$r16_25 } -.#{$pre}mh16_5 { max-height:$r16_5 } -.#{$pre}mh16_75 { max-height:$r16_75 } -.#{$pre}mh17 { max-height:$r17 } -.#{$pre}mh17_25 { max-height:$r17_25 } -.#{$pre}mh17_5 { max-height:$r17_5 } -.#{$pre}mh17_75 { max-height:$r17_75 } -.#{$pre}mh18 { max-height:$r18 } -.#{$pre}mh18_25 { max-height:$r18_25 } -.#{$pre}mh18_5 { max-height:$r18_5 } -.#{$pre}mh18_75 { max-height:$r18_75 } -.#{$pre}mh19 { max-height:$r19 } -.#{$pre}mh19_25 { max-height:$r19_25 } -.#{$pre}mh19_5 { max-height:$r19_5 } -.#{$pre}mh19_75 { max-height:$r19_75 } -.#{$pre}mh20 { max-height:$r20 } -.#{$pre}mh20_25 { max-height:$r20_25 } -.#{$pre}mh20_5 { max-height:$r20_5 } -.#{$pre}mh20_75 { max-height:$r20_75} -.#{$pre}mh21 { max-height:$r21 } -.#{$pre}mh21_25 { max-height:$r21_25 } -.#{$pre}mh21_5 { max-height:$r21_5 } -.#{$pre}mh21_75 { max-height:$r21_75 } -.#{$pre}mh22 { max-height:$r22 } -.#{$pre}mh22_25 { max-height:$r22_25 } -.#{$pre}mh22_5 { max-height:$r22_5 } -.#{$pre}mh22_75 { max-height:$r22_75 } -.#{$pre}mh23 { max-height:$r23 } -.#{$pre}mh23_25 { max-height:$r23_25 } -.#{$pre}mh23_5 { max-height:$r23_5 } -.#{$pre}mh23_75 { max-height:$r23_75 } -.#{$pre}mh24 { max-height:$r24 } -.#{$pre}mh24_25 { max-height:$r24_25 } -.#{$pre}mh24_5 { max-height:$r24_5 } -.#{$pre}mh24_75 { max-height:$r24_75 } -.#{$pre}mh25 { max-height:$r25 } -.#{$pre}mh25_25 { max-height:$r25_25 } -.#{$pre}mh25_5 { max-height:$r25_5 } // 300px -.#{$pre}mh25_75 { max-height:$r25_75 } - // -- width .#{$pre}w110p { width:$pc110; } .#{$pre}w100p { width:$pc100; } @@ -1020,10 +525,6 @@ $px4: 4px; .#{$pre}py7_75 { padding-top:$r7_75; padding-bottom:$r7_75 } // top -.#{$pre}pt0 { padding-top:$r0 } -.#{$pre}pt0_25 { padding-top:$r0_25 } -.#{$pre}pt0_5 { padding-top:$r0_5 } -.#{$pre}pt0_75 { padding-top:$r0_75 } .#{$pre}pt1 { padding-top:$r1 } .#{$pre}pt1_25 { padding-top:$r1_25 } .#{$pre}pt1_5 { padding-top:$r1_5 } @@ -1186,10 +687,6 @@ $px4: 4px; .#{$pre}m7_75 { margin:$r7_75 } // left & right -.#{$pre}mx0 { margin-left:$r0; margin-right:$r0 } -.#{$pre}mx0_25 { margin-left:$r0_25; margin-right:$r0_25 } -.#{$pre}mx0_5 { margin-left:$r0_5; margin-right:$r0_5 } -.#{$pre}mx0_75 { margin-left:$r0_75; margin-right:$r0_75 } .#{$pre}mx1 { margin-left:$r1; margin-right:$r1 } .#{$pre}mx1_25 { margin-left:$r1_25; margin-right:$r1_25 } .#{$pre}mx1_5 { margin-left:$r1_5; margin-right:$r1_5 } @@ -1252,10 +749,6 @@ $px4: 4px; .#{$pre}mxn7_75 { margin-left:-$r7_75; margin-right:-$r7_75 } // top & bottom -.#{$pre}my0 { margin-top:$r0; margin-bottom:$r0 } -.#{$pre}my0_25 { margin-top:$r0_25; margin-bottom:$r0_25 } -.#{$pre}my0_5 { margin-top:$r0_5; margin-bottom:$r0_5 } -.#{$pre}my0_75 { margin-top:$r0_75; margin-bottom:$r0_75 } .#{$pre}my1 { margin-top:$r1; margin-bottom:$r1 } .#{$pre}my1_25 { margin-top:$r1_25; margin-bottom:$r1_25 } .#{$pre}my1_5 { margin-top:$r1_5; margin-bottom:$r1_5 } @@ -1597,80 +1090,25 @@ $px4: 4px; .#{$pre}caps { text-transform: uppercase } .#{$pre}strong { font-weight:bold } -.#{$pre}fw-500 { font-weight:500 } -.#{$pre}fw-600 { font-weight:600 } .#{$pre}italic { font-style: italic } .#{$pre}fs0 { font-size:$r0 } .#{$pre}fs0_9 { font-size:$r0_9 } -.#{$pre}fs1 { font-size:$r1 } -.#{$pre}fs1_1 { font-size:$r1_1 } -.#{$pre}fs1_2 { font-size:$r1_2 } -.#{$pre}fs1_3 { font-size:$r1_3 } -.#{$pre}fs1_4 { font-size:$r1_4 } -.#{$pre}fs1_5 { font-size:$r1_5 } -.#{$pre}fs1_6 { font-size:$r1_6 } -.#{$pre}fs1_7 { font-size:$r1_7 } -.#{$pre}fs1_8 { font-size:$r1_8 } -.#{$pre}fs1_9 { font-size:$r1_9 } -.#{$pre}fs2 { font-size:$r2 } -.#{$pre}fs2_5 { font-size:$r2_5 } +.#{$pre}h5 { font-size:$r1 } +.#{$pre}h5_1 { font-size:$r1_1 } +.#{$pre}h5_2 { font-size:$r1_2 } +.#{$pre}h5_3 { font-size:$r1_3 } +.#{$pre}h5_4 { font-size:$r1_4 } +.#{$pre}h5_5 { font-size:$r1_5 } +.#{$pre}h5_6 { font-size:$r1_6 } +.#{$pre}h5_7 { font-size:$r1_7 } +.#{$pre}h5_8 { font-size:$r1_8 } +.#{$pre}h5_9 { font-size:$r1_9 } +.#{$pre}h4 { font-size:$r2 } +.#{$pre}h4_5 { font-size:$r2_5 } .#{$pre}fs3_5 { font-size:$r3_5 } -.#{$pre}lh0 { line-height:$r0 } -.#{$pre}lh0_9 { line-height:$r0_9 } -.#{$pre}lh1 { line-height:$r1 } -.#{$pre}lh1_1 { line-height:$r1_1 } -.#{$pre}lh1_2 { line-height:$r1_2 } -.#{$pre}lh1_3 { line-height:$r1_3 } -.#{$pre}lh1_4 { line-height:$r1_4 } -.#{$pre}lh1_5 { line-height:$r1_5 } -.#{$pre}lh1_6 { line-height:$r1_6 } -.#{$pre}lh1_7 { line-height:$r1_7 } -.#{$pre}lh1_8 { line-height:$r1_8 } -.#{$pre}lh1_9 { line-height:$r1_9 } -.#{$pre}lh2 { line-height:$r2 } -.#{$pre}lh2_25 { line-height:$r2_25 } -.#{$pre}lh2_5 { line-height:$r2_5 } -.#{$pre}lh2_75 { line-height:$r2_25 } -.#{$pre}lh3 { line-height:$r3 } -.#{$pre}lh4 { line-height:$r4 } - -.#{$pre}h1, .#{$pre}h1 h1, .#{$pre}h1 a, .#{$pre}h1 p { // 42/48 - @extend .#{$pre}fs3_5; - @extend .#{$pre}lh4; -} -.#{$pre}h2, .#{$pre}h2 h2, .#{$pre}h2 a, .#{$pre}h2 p { // 30/36 - @extend .#{$pre}fs2_5; - @extend .#{$pre}lh3; -} -.#{$pre}h3, .#{$pre}h3 h3, .#{$pre}h3 a, .#{$pre}h3 p { // 24/30 - @extend .#{$pre}fs2; - @extend .#{$pre}lh2_5; -} -.#{$pre}h4, .#{$pre}h4 h4, .#{$pre}h4 a, .#{$pre}h4 p { // 18/22 - @extend .#{$pre}fs1_5; - @extend .#{$pre}lh1_9; -} -.#{$pre}h5, .#{$pre}h5 h5, .#{$pre}h5 a, .#{$pre}h5 p { // 15/20 - @extend .#{$pre}fs1_3; - @extend .#{$pre}lh1_7; -} -.#{$pre}h6, .#{$pre}h6 h6, .#{$pre}h6 a, .#{$pre}h6 p { // 13/20 - @extend .#{$pre}fs1_1; - @extend .#{$pre}lh1_7; -} - -.#{$pre}text-1, .#{$pre}text-1 a, .#{$pre}text-1 p { // 20/28 - @extend .#{$pre}fs1_7; - @extend .#{$pre}lh2_25; -} -.#{$pre}text-2, .#{$pre}text-2 a, .#{$pre}text-2 p { // 15/24 - @extend .#{$pre}fs1_3; - @extend .#{$pre}lh2; -} - // ### Misc ### .#{$pre}open { diff --git a/app/assets/stylesheets/_deprecated/_nocss_mq.scss b/app/assets/stylesheets/_deprecated/_nocss_mq.scss deleted file mode 100644 index 7e1d565bf..000000000 --- a/app/assets/stylesheets/_deprecated/_nocss_mq.scss +++ /dev/null @@ -1,4 +0,0 @@ -@media screen and (min-width: 600px) { - $pre: "_mq-600_"; - @import '_deprecated/nocss'; -} diff --git a/app/assets/stylesheets/_deprecated/_utility.scss b/app/assets/stylesheets/_deprecated/_utility.scss deleted file mode 100644 index 1e9c9abfa..000000000 --- a/app/assets/stylesheets/_deprecated/_utility.scss +++ /dev/null @@ -1,14 +0,0 @@ -// Margins - -.mx0 { margin-left: 0; margin-right: 0 } -.my0 { margin-top: 0; margin-bottom: 0 } - -// Padding - -.pt0 { padding-top: 0 } -.pr0 { padding-right: 0 } -.pb0 { padding-bottom: 0 } -.pl0 { padding-left: 0 } - -// TODO Used in interests -.border-2 { border-style: solid; border-width: 2px } diff --git a/app/assets/stylesheets/app/components/dashboard.scss b/app/assets/stylesheets/app/components/dashboard.scss deleted file mode 100644 index ae5c6348e..000000000 --- a/app/assets/stylesheets/app/components/dashboard.scss +++ /dev/null @@ -1,81 +0,0 @@ -/* >> Dashboard Component >>>>>>>>>>>>>>>>>>>> -=========================================== */ - -/* --- HTML Pattern ---------------- -
            -
            -

            Section Header Content

            -
            -
            -

            Section Main Content

            -
            -
            -

            Section Footer Content

            -
            -
            -*/ - -// -- Base Component ------------ -.dashboard { - @import 'app/temp/style-guide-updates'; // < details: https://assembly.com/meta/bounties/1038 - // - position: relative; - padding-top: 3rem; - padding-bottom: 3rem; - background-color: $gray-6; - // - .footer { // bootstrap overwrite - margin:0; - padding:0; - border: none; - } - > .header, > .main, > .footer { - position: relative; - z-index: 5; - text-align: center; - @extend .text-2; - p { - @extend .text-2; - } - } -} -.dashboard.circle-stats { - padding-top: 4rem; - padding-bottom: 5rem; - text-align: center; - color: #3f434a; - @media screen and (min-width: 768px) { - padding-top: 5rem; - padding-bottom: 5.5rem; - } - // - .chart { - position: relative; - display: block; - margin-bottom: 1.25rem; - // - canvas { - display: block; - margin: 0 auto; - } - } - h3.data { - margin-top: 0.1rem; - margin-bottom: 0; - position: absolute; - top: 50%; - -webkit-transform: translateY(-50%); - -moz-transform: translateY(-50%); - transform: translateY(-50%); - width: 100%; - } - h4 { - margin-top: 0; - margin-bottom: 0.25rem; - } - p { - margin-top: 0; - margin-bottom: 0; - } -} diff --git a/app/assets/stylesheets/app/components/lists.scss b/app/assets/stylesheets/app/components/lists.scss index 8fcfcecdb..7ac77ba0a 100644 --- a/app/assets/stylesheets/app/components/lists.scss +++ b/app/assets/stylesheets/app/components/lists.scss @@ -127,13 +127,3 @@ } } } - -.list-inline { - > .alpha { - padding-left: 0; - } - - > .omega { - padding-right: 0; - } -} diff --git a/app/assets/stylesheets/app/components/markdown.scss b/app/assets/stylesheets/app/components/markdown.scss index b3c29d0cc..4317e8785 100644 --- a/app/assets/stylesheets/app/components/markdown.scss +++ b/app/assets/stylesheets/app/components/markdown.scss @@ -60,7 +60,5 @@ .shrink-images { img { max-width: 50%;} - .modal-content { - img { max-width: 100%; } - } + .modal-content img { max-width: 100%; } } diff --git a/app/assets/stylesheets/app/components/modals.scss b/app/assets/stylesheets/app/components/modals.scss deleted file mode 100644 index f7a63384e..000000000 --- a/app/assets/stylesheets/app/components/modals.scss +++ /dev/null @@ -1,26 +0,0 @@ -.modal-content { - // box-shadow: none; - overflow: hidden; -} - -.modal-header { - background-color: $modal-header-bg; -} - -.modal-footer { - padding: $modal-footer-padding; - background-color: $modal-footer-bg; -} - -.modal { - // Adds a slight vignette to the modal background - @include gradient-radial(rgba(black, 0) 60%, $brand-shadow); -} - -.modal-backdrop { - background-color: $black; -} - -.modal-backdrop.fade { - opacity: 0.5; -} diff --git a/app/assets/stylesheets/app/components/progress_bars.scss b/app/assets/stylesheets/app/components/progress_bars.scss index 5210ccda7..25b955cef 100644 --- a/app/assets/stylesheets/app/components/progress_bars.scss +++ b/app/assets/stylesheets/app/components/progress_bars.scss @@ -9,8 +9,7 @@ border-radius: 1rem; } -.progress-sm, -.progress-small { +.progress-sm { height: 6px; } diff --git a/app/assets/stylesheets/app/components/square.scss b/app/assets/stylesheets/app/components/square.scss index 898e85498..09e569d13 100644 --- a/app/assets/stylesheets/app/components/square.scss +++ b/app/assets/stylesheets/app/components/square.scss @@ -13,9 +13,7 @@ position: absolute; top: 0; right: 0; bottom: 0; left: 0; -} -.square-content { /* Vertical Centering */ -webkit-box-align: center; -webkit-align-items: center; diff --git a/app/assets/stylesheets/app/slop.scss b/app/assets/stylesheets/app/slop.scss index dc981d774..9f5144915 100644 --- a/app/assets/stylesheets/app/slop.scss +++ b/app/assets/stylesheets/app/slop.scss @@ -13,14 +13,6 @@ $text-accent: #BC9454; padding-top: 6rem; } -.alpha { - margin-top: 0 !important; -} - -.omega { - margin-bottom: 0 !important; -} - .sub-thingy { margin-top: -24px; padding-top: 12px; padding-bottom: 12px; border-bottom: 1px solid $brand-divider; diff --git a/app/assets/stylesheets/basscss/_color-base.scss b/app/assets/stylesheets/basscss/_color-base.scss index 732fe2117..b1188b7e9 100644 --- a/app/assets/stylesheets/basscss/_color-base.scss +++ b/app/assets/stylesheets/basscss/_color-base.scss @@ -16,3 +16,5 @@ hr { border-bottom-width: $border-width; border-bottom-color: $gray-6; } + +.muted { opacity: .5 } diff --git a/app/templates/activities/create_contract.mustache b/app/templates/activities/create_contract.mustache index 999686ad6..3928559f6 100644 --- a/app/templates/activities/create_contract.mustache +++ b/app/templates/activities/create_contract.mustache @@ -7,10 +7,10 @@
            -
            +
            -
              +
              • {{#actor}} {{username}} diff --git a/app/templates/activities/create_core_team_membership.mustache b/app/templates/activities/create_core_team_membership.mustache index 203bc0c78..21c1b8630 100644 --- a/app/templates/activities/create_core_team_membership.mustache +++ b/app/templates/activities/create_core_team_membership.mustache @@ -7,10 +7,10 @@
            -
            +
            -
              +
              • {{#actor}} {{username}} diff --git a/app/templates/activities/destroy_contract.mustache b/app/templates/activities/destroy_contract.mustache index 16ae0aa16..2262eb085 100644 --- a/app/templates/activities/destroy_contract.mustache +++ b/app/templates/activities/destroy_contract.mustache @@ -7,10 +7,10 @@
            -
            +
            -
              +
              • A contract for {{#actor}} diff --git a/app/templates/activities/found_product.mustache b/app/templates/activities/found_product.mustache index c82eb9774..3ceae7424 100644 --- a/app/templates/activities/found_product.mustache +++ b/app/templates/activities/found_product.mustache @@ -7,10 +7,10 @@
            -
            +
            -
              +
              • {{#actor}} {{username}} diff --git a/app/templates/activities/git_push.mustache b/app/templates/activities/git_push.mustache index 24dcde353..abcc5f0b5 100644 --- a/app/templates/activities/git_push.mustache +++ b/app/templates/activities/git_push.mustache @@ -7,10 +7,10 @@
            -
            +
            -
              + {{#subject}}{{#metadata}} -
              +
              {{message}} diff --git a/app/templates/activities/introduce.mustache b/app/templates/activities/introduce.mustache index 9747fab7a..3111e0134 100644 --- a/app/templates/activities/introduce.mustache +++ b/app/templates/activities/introduce.mustache @@ -6,10 +6,10 @@
              -
              +
              -
              {{#subject}}{{#bio}} -
              +
              {{bio}}
              {{/bio}}{{/subject}} diff --git a/app/templates/activities/launch.mustache b/app/templates/activities/launch.mustache index bf174d5d9..fd7bb7e1e 100644 --- a/app/templates/activities/launch.mustache +++ b/app/templates/activities/launch.mustache @@ -7,10 +7,10 @@
              -
              +
              -
                + {{#subject}} -
                +
                {{pitch}}
                {{/subject}} diff --git a/app/templates/activities/update_contract.mustache b/app/templates/activities/update_contract.mustache index d07beb91d..8f64e208e 100644 --- a/app/templates/activities/update_contract.mustache +++ b/app/templates/activities/update_contract.mustache @@ -7,10 +7,10 @@
                -
                +
                -
                  +
                  • A contract for {{#actor}} diff --git a/app/templates/events/closes/_close.mustache b/app/templates/events/closes/_close.mustache index 16a52bafa..66fa6bddc 100644 --- a/app/templates/events/closes/_close.mustache +++ b/app/templates/events/closes/_close.mustache @@ -7,7 +7,7 @@
                -
                +
                Closed by {{#actor}} diff --git a/app/templates/events/code_addeds/_code_added.mustache b/app/templates/events/code_addeds/_code_added.mustache index dd3058a8e..4dade7741 100644 --- a/app/templates/events/code_addeds/_code_added.mustache +++ b/app/templates/events/code_addeds/_code_added.mustache @@ -7,7 +7,7 @@
                -
                +
                {{#actor}} {{username}} {{/actor}} diff --git a/app/templates/events/comment_references/_comment_reference.mustache b/app/templates/events/comment_references/_comment_reference.mustache index 48811681d..f936d14b3 100644 --- a/app/templates/events/comment_references/_comment_reference.mustache +++ b/app/templates/events/comment_references/_comment_reference.mustache @@ -7,7 +7,7 @@
                -
                +
                {{#actor}} {{username}} {{/actor}} diff --git a/app/templates/events/comments/_comment.mustache b/app/templates/events/comments/_comment.mustache index a750b9895..984c4f365 100644 --- a/app/templates/events/comments/_comment.mustache +++ b/app/templates/events/comments/_comment.mustache @@ -12,7 +12,7 @@
                -
                  +
                  • diff --git a/app/templates/events/commit_references/_commit_reference.mustache b/app/templates/events/commit_references/_commit_reference.mustache index 48811681d..f936d14b3 100644 --- a/app/templates/events/commit_references/_commit_reference.mustache +++ b/app/templates/events/commit_references/_commit_reference.mustache @@ -7,7 +7,7 @@
                    -
                    +
                    {{#actor}} {{username}} {{/actor}} diff --git a/app/templates/events/copy_addeds/_copy_added.mustache b/app/templates/events/copy_addeds/_copy_added.mustache index 247cd9ac6..c1d7097e0 100644 --- a/app/templates/events/copy_addeds/_copy_added.mustache +++ b/app/templates/events/copy_addeds/_copy_added.mustache @@ -12,7 +12,7 @@
                    -
                      + -
                        +
                        • {{#actor}} diff --git a/app/templates/events/demotions/_demotion.mustache b/app/templates/events/demotions/_demotion.mustache index 94a26d324..6bb4f4d39 100644 --- a/app/templates/events/demotions/_demotion.mustache +++ b/app/templates/events/demotions/_demotion.mustache @@ -13,7 +13,7 @@ {{username}} {{/actor}} -
                            +
                            • diff --git a/app/templates/events/design_deliverables/_design_deliverable.mustache b/app/templates/events/design_deliverables/_design_deliverable.mustache index c94e7bbd7..758de8fec 100644 --- a/app/templates/events/design_deliverables/_design_deliverable.mustache +++ b/app/templates/events/design_deliverables/_design_deliverable.mustache @@ -14,7 +14,7 @@ added a design {{name}} -
                                +
                                • diff --git a/app/templates/events/promotions/_promotion.mustache b/app/templates/events/promotions/_promotion.mustache index 656f1597d..f9ad25eb9 100644 --- a/app/templates/events/promotions/_promotion.mustache +++ b/app/templates/events/promotions/_promotion.mustache @@ -13,7 +13,7 @@ {{username}} {{/actor}} -
                                    +
                                    • diff --git a/app/templates/events/pull_request_references/_pull_request_reference.mustache b/app/templates/events/pull_request_references/_pull_request_reference.mustache index 5037ccd7e..82b14f9ce 100644 --- a/app/templates/events/pull_request_references/_pull_request_reference.mustache +++ b/app/templates/events/pull_request_references/_pull_request_reference.mustache @@ -7,7 +7,7 @@
                                      -
                                      +
                                      {{#actor}} {{username}} {{/actor}} diff --git a/app/templates/events/reopens/_reopen.mustache b/app/templates/events/reopens/_reopen.mustache index 8f115f667..07ea3baf2 100644 --- a/app/templates/events/reopens/_reopen.mustache +++ b/app/templates/events/reopens/_reopen.mustache @@ -7,7 +7,7 @@
                                      -
                                      +
                                      Re-opened by {{#actor}} {{username}} diff --git a/app/templates/events/review_readies/_review_ready.mustache b/app/templates/events/review_readies/_review_ready.mustache index e71713ba6..8658e8542 100644 --- a/app/templates/events/review_readies/_review_ready.mustache +++ b/app/templates/events/review_readies/_review_ready.mustache @@ -18,7 +18,7 @@
                                      {{/award_url}} -
                                      +
                                      {{#actor}} {{username}} {{/actor}} diff --git a/app/templates/events/title_changes/_title_change.mustache b/app/templates/events/title_changes/_title_change.mustache index a1263c78c..67520e88d 100644 --- a/app/templates/events/title_changes/_title_change.mustache +++ b/app/templates/events/title_changes/_title_change.mustache @@ -7,7 +7,7 @@
                                      -
                                      +
                                      {{#actor}} {{username}} {{/actor}} diff --git a/app/templates/events/type_changes/_type_change.mustache b/app/templates/events/type_changes/_type_change.mustache index 6ed09409b..12cde7c73 100644 --- a/app/templates/events/type_changes/_type_change.mustache +++ b/app/templates/events/type_changes/_type_change.mustache @@ -7,7 +7,7 @@
                                      -
                                      +
                                      {{#actor}} {{username}} {{/actor}} diff --git a/app/templates/events/wins/_win.mustache b/app/templates/events/wins/_win.mustache index 50b9868ca..b0ce8840d 100644 --- a/app/templates/events/wins/_win.mustache +++ b/app/templates/events/wins/_win.mustache @@ -7,7 +7,7 @@
                                      -
                                      +
                                      {{#target}} {{username}} {{/target}} diff --git a/app/views/assets/_asset.html.erb b/app/views/assets/_asset.html.erb index b9e7ff299..d20b7b661 100644 --- a/app/views/assets/_asset.html.erb +++ b/app/views/assets/_asset.html.erb @@ -17,7 +17,7 @@
                                      -
                                      +
                                      <%= asset.name %> <% if asset.room %> #<%= asset.room.number %> diff --git a/app/views/assets/index.html.erb b/app/views/assets/index.html.erb index 9f8ac7aa7..bf9e9edee 100644 --- a/app/views/assets/index.html.erb +++ b/app/views/assets/index.html.erb @@ -3,9 +3,9 @@ <% activate_nav! :assets %> <% if @assets.empty? %> -
                                      -

                                      Share Assets

                                      -

                                      +

                                      +

                                      Share Assets

                                      +

                                      Upload images, zip files, PSDs with the rest of the team building <%= @product.name %>.

                                      diff --git a/app/views/contracts/index.html.erb b/app/views/contracts/index.html.erb index 7ec238017..2a20fd2d1 100644 --- a/app/views/contracts/index.html.erb +++ b/app/views/contracts/index.html.erb @@ -66,7 +66,7 @@
                                      -
                                      +
                                      diff --git a/app/views/financials/_expense_modal.html.erb b/app/views/financials/_expense_modal.html.erb index 9023296d7..66fc39b93 100644 --- a/app/views/financials/_expense_modal.html.erb +++ b/app/views/financials/_expense_modal.html.erb @@ -34,7 +34,7 @@ inputName: 'expense_claim[attachment_ids][]' }.to_json %>">
                                      -
                                      +
                                      diff --git a/app/views/financials/index.html.erb b/app/views/financials/index.html.erb index b812f4562..0558c87fd 100644 --- a/app/views/financials/index.html.erb +++ b/app/views/financials/index.html.erb @@ -9,7 +9,7 @@
                                      -

                                      +

                                      This product hasn't earned any revenue yet.

                                      diff --git a/app/views/layouts/product.html.erb b/app/views/layouts/product.html.erb index a33b8ade9..1bff27d41 100644 --- a/app/views/layouts/product.html.erb +++ b/app/views/layouts/product.html.erb @@ -78,7 +78,7 @@

                                      -
                                      +
                                      diff --git a/app/views/pitch_week/_chip.html.erb b/app/views/pitch_week/_chip.html.erb index d43c52d95..68e2ae6cb 100644 --- a/app/views/pitch_week/_chip.html.erb +++ b/app/views/pitch_week/_chip.html.erb @@ -4,7 +4,7 @@ <%= render 'products/mini_chip', product: product %>
                                      -
                                      +
                                      diff --git a/app/views/playground/product_stage_1.html.erb b/app/views/playground/product_stage_1.html.erb index bbe85ff02..993529dc2 100644 --- a/app/views/playground/product_stage_1.html.erb +++ b/app/views/playground/product_stage_1.html.erb @@ -66,7 +66,7 @@
                                      -
                                      Elsewhere
                                      +
                                      Elsewhere
                                      • Homepage
                                      • Twitter
                                        • @@ -83,9 +83,9 @@
                                        -
                                        Bounty
                                        -

                                        <%= bounty.title %>

                                        -

                                        +

                                        Bounty
                                        +

                                        <%= bounty.title %>

                                        +

                                        <%= product_markdown(bounty.product, truncate(bounty.description, length: 120)) %>

                                        diff --git a/app/views/post_mailer/created.html.erb b/app/views/post_mailer/created.html.erb index 6a4ca833e..7f279cd6c 100644 --- a/app/views/post_mailer/created.html.erb +++ b/app/views/post_mailer/created.html.erb @@ -21,7 +21,7 @@

                                        -

                                        <%= @post.title %>

                                        +

                                        <%= @post.title %>

                                        <%= product_markdown(@post.product, @post.body) %>
                                        diff --git a/app/views/post_mailer/mailing_list.html.erb b/app/views/post_mailer/mailing_list.html.erb index 6a4ca833e..7f279cd6c 100644 --- a/app/views/post_mailer/mailing_list.html.erb +++ b/app/views/post_mailer/mailing_list.html.erb @@ -21,7 +21,7 @@

                                        -

                                        <%= @post.title %>

                                        +

                                        <%= @post.title %>

                                        <%= product_markdown(@post.product, @post.body) %>
                                        diff --git a/app/views/products/chips/_greenlit.html.erb b/app/views/products/chips/_greenlit.html.erb index 0b68b0ef8..d691db896 100644 --- a/app/views/products/chips/_greenlit.html.erb +++ b/app/views/products/chips/_greenlit.html.erb @@ -5,11 +5,11 @@
                                        -

                                        <%= product.name %>

                                        -

                                        <%= product.pitch %>

                                        +

                                        <%= product.name %>

                                        +

                                        <%= product.pitch %>

                                        -
                                          +
                                            <% product.followers.limit(6).each do |user| %>
                                          • <%= avatar_tag(user, 18) %> @@ -19,7 +19,7 @@ + <%= product.followers.count %>
                                          -

                                          +

                                          Started <%= product.created_at.strftime("%B %d, %Y") %>

                                        diff --git a/app/views/products/chips/_team_building.html.erb b/app/views/products/chips/_team_building.html.erb index 4bdff2268..64eed2222 100644 --- a/app/views/products/chips/_team_building.html.erb +++ b/app/views/products/chips/_team_building.html.erb @@ -5,11 +5,11 @@
                                        -

                                        +

                                        <%= product.name %> by <%= product.user.username %>

                                        -

                                        <%= product.pitch %>

                                        +

                                        <%= product.pitch %>

                                        diff --git a/app/views/products/edit.html.erb b/app/views/products/edit.html.erb index c5f1faad5..20ce5b80c 100644 --- a/app/views/products/edit.html.erb +++ b/app/views/products/edit.html.erb @@ -104,7 +104,7 @@ <%= f.text_area :lead, class: 'form-control input-lg', rows: 2 %>
                                        -

                                        +

                                        Keep it short. How would you describe your product in a tweet?

                                        @@ -118,7 +118,7 @@ <%= f.text_area :description, class: 'form-control', rows: 2, data: { autosize: '', 'validate-length' => 2 } %>
                                        -

                                        +

                                        Dive into the details. How did you come up with the idea? What makes it great?

                                        @@ -145,7 +145,7 @@ <%= f.text_area :goals, class: 'form-control', data: { autosize: '' }, rows: 2 %>
                                        -

                                        +

                                        What problems are you trying to solve with the product? Setting goals early often helps align people's expectations later.

                                        @@ -159,7 +159,7 @@ <%= f.text_area :key_features, class: 'form-control', data: { autosize: '' }, rows: 2 %>
                                      -

                                      +

                                      What do you expect the key features of the product to be? What sets it apart from others?

                                      @@ -173,7 +173,7 @@ <%= f.text_area :target_audience, class: 'form-control', data: { autosize: '' }, rows: 2 %>
                                      -

                                      +

                                      Who are you solving problems for? What is unique about that market?

                                      @@ -187,7 +187,7 @@ <%= f.text_area :competing_products, class: 'form-control', data: { autosize: '' }, rows: 2 %>
                                      -

                                      +

                                      What do you consider is your biggest competition? For example, Facebook may consider MySpace their biggest competitor.

                                      @@ -201,7 +201,7 @@ <%= f.text_area :competitive_advantage, class: 'form-control', data: { autosize: '' }, rows: 2 %>
                                      -

                                      +

                                      What advantage do you have over these competitors that is uniquely yours?

                                      @@ -215,7 +215,7 @@ <%= f.text_area :monetization_strategy, class: 'form-control', data: { autosize: '' }, rows: 2 %>
                                      -

                                      +

                                      How should this product be monetized?

                                      diff --git a/app/views/products/welcome.html.erb b/app/views/products/welcome.html.erb index 8ca4c66e3..3721e65f0 100644 --- a/app/views/products/welcome.html.erb +++ b/app/views/products/welcome.html.erb @@ -2,8 +2,8 @@
                                      -
                                      Nice work!
                                      -

                                      You're almost there

                                      +
                                      Nice work!
                                      +

                                      You're almost there

                                      <%= @product.name %> is currently stealth, meaning it is only visible to people you share it with. Before you can start publicly building a team, you need to fill in some more details and submit your product for approval.

                                      @@ -15,8 +15,8 @@
                                      -
                                      Step 1
                                      -

                                      Define some work

                                      +
                                      Step 1
                                      +

                                      Define some work

                                      Bounties are how other people can get involved in your product. A great bounty clearly defines a goal and gives someone all the information they need to reach it.

                                      @@ -53,8 +53,8 @@
                                      -
                                      Step 2
                                      -

                                      Share your progress

                                      +
                                      Step 2
                                      +

                                      Share your progress

                                      Everybody is curious to see the progress of your product. Write updates to keep them in the loop with the product's progress. People love updates that are fun, short and have engaging visuals.

                                      Stuck for ideas? Introduce your product up to this point in a more personal way. Tell everybody your story.

                                      @@ -77,8 +77,8 @@
                                      -
                                      Step 3
                                      -

                                      Start building

                                      +
                                      Step 3
                                      +

                                      Start building

                                      People are much more likely to be excited about your product when they can see some evidence of progress. Create a repository so the design and development of your product can start.

                                      @@ -113,8 +113,8 @@
                                      -
                                      Final Step
                                      -

                                      Submitting for approval

                                      +
                                      Final Step
                                      +

                                      Submitting for approval

                                      @@ -149,7 +149,7 @@
                                      -
                                      We like
                                      +
                                      We like
                                      • Interesting new ideas
                                      • Spelling & grammar
                                        • @@ -158,7 +158,7 @@
                                      -
                                      We dislike
                                      +
                                      We dislike
                                      • People looking for free work
                                      • Jerks
                                        • diff --git a/app/views/projects/_milestone.html.erb b/app/views/projects/_milestone.html.erb index b1808a5c0..172cc0a2d 100644 --- a/app/views/projects/_milestone.html.erb +++ b/app/views/projects/_milestone.html.erb @@ -9,7 +9,7 @@
                                        -
                                        +
                                        @@ -18,7 +18,7 @@ <%= milestone.wip.title %>
                                        -

                                        +

                                        <% if milestone.tasks.count.zero? %> No tasks added <% else %> diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb index 5f4b8b72c..017fc040f 100644 --- a/app/views/projects/_project.html.erb +++ b/app/views/projects/_project.html.erb @@ -2,17 +2,17 @@

                                        -

                                        <%= project.title %>

                                        +

                                        <%= project.title %>

                                        -
                                        @@ -40,19 +40,19 @@
                                        -
                                        +
                                        -
                                        +
                                        <%= number_to_percentage milestone.progress * 100, precision: 0 %> Progress
                                        -
                                          +
                                          • <%= milestone.tasks.open.count %> Bounties remaining @@ -70,7 +70,7 @@
                                            Contributors
                                        -
                                          +
                                            <% milestone.wip.contributors.each do |contributor| %>
                                          • <%= avatar_tag(contributor, 24) %> @@ -102,7 +102,7 @@ <% end %>
                                          -

                                          Designs added to tasks in this project will be displayed here

                                          +

                                          Designs added to tasks in this project will be displayed here

                                        diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index 51929fa50..5bea08d28 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -4,9 +4,9 @@ <% if @milestones.empty? %>
                                        -
                                        -

                                        Organize your work into Projects

                                        -

                                        +

                                        +

                                        Organize your work into Projects

                                        +

                                        Projects give you a great way to organize tasks. For example, you could make projects for the main screens in <%= @product.name %>. This helps people quickly grasp the vision.

                                        @@ -36,7 +36,7 @@ -
                                        +
                                        <% if milestone.progress > 0 %> <%= number_to_percentage(milestone.progress * 100, precision: 0) %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 919a272a4..38f1bcaaa 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -28,19 +28,19 @@
                                        -
                                        +
                                        -
                                        +
                                        <%= number_to_percentage @milestone.progress * 100, precision: 0 %> Progress
                                        -
                                          +
                                          • <%= @milestone.tasks.open.count %> Bounties remaining @@ -58,7 +58,7 @@
                                            Contributors
                                        -
                                          +
                                            <% @milestone.wip.contributors.each do |contributor| %>
                                          • <%= avatar_tag(contributor, 24) %> @@ -92,7 +92,7 @@ <% end %>
                                          -

                                          Designs added to tasks in this project will be displayed here

                                          +

                                          Designs added to tasks in this project will be displayed here

                                        diff --git a/app/views/repositories/index.html.erb b/app/views/repositories/index.html.erb index c649eec44..4db842fcb 100644 --- a/app/views/repositories/index.html.erb +++ b/app/views/repositories/index.html.erb @@ -17,7 +17,7 @@
                                        -

                                        +

                                        <%= @product.name %> uses GitHub repositories to manage the product's development process. Repos give a clear history of every change to the codebase — even changes to PNGs! Not sure what a repo is? Not to worry diff --git a/app/views/shared/_footer_nav.html.erb b/app/views/shared/_footer_nav.html.erb index 40595aa25..c9ec3900a 100644 --- a/app/views/shared/_footer_nav.html.erb +++ b/app/views/shared/_footer_nav.html.erb @@ -7,7 +7,7 @@

                                        -
                                        Assembly
                                        +
                                        Assembly
                                        -
                                        Help
                                        +
                                        Help
                                        -
                                        Discover
                                        +
                                        Discover
                                        -
                                        Start
                                        +
                                        Start
                                        -
                                        Say hello!
                                        +
                                        Say hello!
                                        • Twitter
                                        • Facebook
                                          • diff --git a/app/views/users/balances/show.html.erb b/app/views/users/balances/show.html.erb index fae1468cf..e89604ce2 100644 --- a/app/views/users/balances/show.html.erb +++ b/app/views/users/balances/show.html.erb @@ -54,8 +54,8 @@ <% else %>
                                          -
                                          -

                                          +

                                          +

                                          You will earn a balance once you've worked on a profitable product

                                          diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 0b68afa65..8b9a70763 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -186,7 +186,7 @@
                                          -

                                          +

                                          You will earn a balance once you've worked on a profitable product

                                          diff --git a/app/views/users/passwords/new.html.erb b/app/views/users/passwords/new.html.erb index cd7aaee18..c27ae49c2 100644 --- a/app/views/users/passwords/new.html.erb +++ b/app/views/users/passwords/new.html.erb @@ -7,7 +7,7 @@
                                          -

                                          Reset your Assembly password

                                          +

                                          Reset your Assembly password


                                          @@ -21,7 +21,7 @@
                                          <% if f.object.errors[:email].any? %> -

                                          <%= f.object.errors[:email].to_sentence %>

                                          +

                                          <%= f.object.errors[:email].to_sentence %>

                                          <% end %> <%= f.label :email, 'Email', class: 'control-label' %> <%= f.email_field :email, autofocus: true, class: 'form-control input-lg', placeholder: 'jane@example.com' %> diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb index 715fd1328..cef5238d5 100644 --- a/app/views/users/registrations/new.html.erb +++ b/app/views/users/registrations/new.html.erb @@ -33,7 +33,7 @@
                                          Using Facebook account: -

                                          <%= f.object.name %>

                                          +

                                          <%= f.object.name %>

                                          diff --git a/app/views/users/sessions/new.html.erb b/app/views/users/sessions/new.html.erb index ede817565..4bbfec306 100644 --- a/app/views/users/sessions/new.html.erb +++ b/app/views/users/sessions/new.html.erb @@ -9,7 +9,7 @@
                                          -

                                          Welcome back to Assembly!

                                          +

                                          Welcome back to Assembly!

                                          Don't have an account?

                                          From 9296e08f2f0f0fc56272c4a0cfdfe28b7c7c5d69 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Thu, 14 May 2015 21:36:40 -0400 Subject: [PATCH 21/28] Removing _deprecated for good MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This may break a few things, but they’ll get fixed soon enough. We’re paying an immense cost to have all this unused CSS. --- .../stylesheets/_deprecated/_basspluss.scss | 41 ------------------- .../stylesheets/_deprecated/_nocss_vars.scss | 2 - app/assets/stylesheets/application.scss | 6 --- .../stylesheets/utilities/_accesibility.scss | 4 ++ .../stylesheets/utilities/_white_space.scss | 4 ++ 5 files changed, 8 insertions(+), 49 deletions(-) delete mode 100644 app/assets/stylesheets/_deprecated/_basspluss.scss delete mode 100644 app/assets/stylesheets/_deprecated/_nocss_vars.scss diff --git a/app/assets/stylesheets/_deprecated/_basspluss.scss b/app/assets/stylesheets/_deprecated/_basspluss.scss deleted file mode 100644 index 0c29d5b34..000000000 --- a/app/assets/stylesheets/_deprecated/_basspluss.scss +++ /dev/null @@ -1,41 +0,0 @@ - -// DO NOT USE - Phasing out this stylesheet - keep in remaining in play until below css can be sorted through & deprecated - -// TODO All of these could be removed by refactoring Assets - -// TODO Replace with beta BASS Helpers -.bg-size-cover {background-size: cover} -.bg-repeat-none {background-repeat: no-repeat} -.bg-position-center {background-position: center} - -.z1 { z-index:1 } -.z2 { z-index:2 } -.z3 { z-index:3 } -.z4 { z-index:4 } -.z5 { z-index:5 } -.z6 { z-index:6 } -.z7 { z-index:7 } -.z8 { z-index:8 } -.z9 { z-index:9 } -.z10 { z-index:10 } - -// padding - -.p0 { padding: 0 } - -// ### typography - -.fs3 { font-size:1.1rem; } -.fs5 { font-size:1.3rem; } - -.fw-200 { font-weight:200; } - -.lh0 { line-height:0 } -.lh0_9 { line-height:0.9rem } -.lh1 { line-height:1rem } -.lh1_5 { line-height:1.5rem } -.lh2 { line-height:2rem } - -// ### misc - -.pointer { cursor: pointer; } diff --git a/app/assets/stylesheets/_deprecated/_nocss_vars.scss b/app/assets/stylesheets/_deprecated/_nocss_vars.scss deleted file mode 100644 index c2a7b521e..000000000 --- a/app/assets/stylesheets/_deprecated/_nocss_vars.scss +++ /dev/null @@ -1,2 +0,0 @@ -// Vars -$pre: "_" !default; // default prefix diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index c18fa9935..47c8f884f 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -10,12 +10,6 @@ @import "basscss"; -@import "_deprecated/basspluss"; -@import "_deprecated/utility"; -@import "_deprecated/nocss_vars"; -@import "_deprecated/nocss"; -@import "_deprecated/nocss_mq"; - @import "app/main"; @import "base/*"; diff --git a/app/assets/stylesheets/utilities/_accesibility.scss b/app/assets/stylesheets/utilities/_accesibility.scss index 4a82caf5d..d0b0824ea 100644 --- a/app/assets/stylesheets/utilities/_accesibility.scss +++ b/app/assets/stylesheets/utilities/_accesibility.scss @@ -1,3 +1,7 @@ .sr-only { display: none; } + +.pointer { + cursor: pointer; +} diff --git a/app/assets/stylesheets/utilities/_white_space.scss b/app/assets/stylesheets/utilities/_white_space.scss index 36bd71170..1d744faa2 100644 --- a/app/assets/stylesheets/utilities/_white_space.scss +++ b/app/assets/stylesheets/utilities/_white_space.scss @@ -1,3 +1,7 @@ +.p0 { + padding: 0; +} + $breakpoints: ( "sm": $breakpoint-sm, "md": $breakpoint-md, From ff3efd5fb11d7eca115fddc33600e1d0cc58f201 Mon Sep 17 00:00:00 2001 From: Lachlan Campbell Date: Thu, 14 May 2015 21:44:23 -0400 Subject: [PATCH 22/28] Delete _nocss.scss --- .../stylesheets/_deprecated/_nocss.scss | 1116 ----------------- 1 file changed, 1116 deletions(-) delete mode 100644 app/assets/stylesheets/_deprecated/_nocss.scss diff --git a/app/assets/stylesheets/_deprecated/_nocss.scss b/app/assets/stylesheets/_deprecated/_nocss.scss deleted file mode 100644 index 535e80802..000000000 --- a/app/assets/stylesheets/_deprecated/_nocss.scss +++ /dev/null @@ -1,1116 +0,0 @@ -// current rem is base 12 -// -// 1rem = 12px, -// 0.25rem = 3px | 0.5rem = 6px | 0.75rem = 9px | etc - -///////////////////////// - -// -$r0: 0rem; $r0_25: 0.25rem; $r0_5: 0.5rem; $r0_75: 0.75rem; -$r1: 1rem; $r1_25: 1.25rem; $r1_5: 1.5rem; $r1_75: 1.75rem; -$r2: 2rem; $r2_25: 2.25rem; $r2_5: 2.5rem; $r2_75: 2.75rem; -$r3: 3rem; $r3_25: 3.25rem; $r3_5: 3.5rem; $r3_75: 3.75rem; -$r4: 4rem; $r4_25: 4.25rem; $r4_5: 4.5rem; $r4_75: 4.75rem; -$r5: 5rem; $r5_25: 5.25rem; $r5_5: 5.5rem; $r5_75: 5.75rem; -$r6: 6rem; $r6_25: 6.25rem; $r6_5: 6.5rem; $r6_75: 6.75rem; -$r7: 7rem; $r7_25: 7.25rem; $r7_5: 7.5rem; $r7_75: 7.75rem; -$r8: 8rem; $r8_25: 8.25rem; $r8_5: 8.5rem; $r8_75: 8.75rem; -$r9: 4rem; $r9_25: 4.25rem; $r9_5: 4.5rem; $r9_75: 4.75rem; -$r10: 10rem; $r10_25: 10.25rem; $r10_5: 10.5rem; $r10_75: 10.75rem; -$r11: 11rem; $r11_25: 11.25rem; $r11_5: 11.5rem; $r11_75: 11.75rem; -$r12: 12rem; $r12_25: 12.25rem; $r12_5: 12.5rem; $r12_75: 12.75rem; -$r13: 13rem; $r13_25: 13.25rem; $r13_5: 13.5rem; $r13_75: 13.75rem; -$r14: 14rem; $r14_25: 14.25rem; $r14_5: 14.5rem; $r14_75: 14.75rem; -$r15: 15rem; $r15_25: 15.25rem; $r15_5: 15.5rem; $r15_75: 15.75rem; -$r16: 16rem; $r16_25: 16.25rem; $r16_5: 16.5rem; $r16_75: 16.75rem; -$r17: 17rem; $r17_25: 17.25rem; $r17_5: 17.5rem; $r17_75: 17.75rem; -$r18: 18rem; $r18_25: 18.25rem; $r18_5: 18.5rem; $r18_75: 18.75rem; -$r19: 19rem; $r19_25: 19.25rem; $r19_5: 19.5rem; $r19_75: 19.75rem; -$r20: 20rem; $r20_25: 20.25rem; $r20_5: 20.5rem; $r20_75: 20.75rem; -$r21: 21rem; $r21_25: 21.25rem; $r21_5: 21.5rem; $r21_75: 21.75rem; -$r22: 22rem; $r22_25: 22.25rem; $r22_5: 22.5rem; $r22_75: 22.75rem; -$r23: 23rem; $r23_25: 23.25rem; $r23_5: 23.5rem; $r23_75: 23.75rem; -$r24: 24rem; $r24_25: 24.25rem; $r24_5: 24.5rem; $r24_75: 24.75rem; -$r25: 25rem; $r25_25: 25.25rem; $r25_5: 25.5rem; $r25_75: 25.75rem; -// -$r0_05: 0.05rem; -$r0_1: 0.1rem; -$r0_3: 0.3333rem; -$r0_6: 0.6666rem; -$r0_9: 0.9999rem; -$r1_1: 1.1rem; -$r1_2: 1.2rem; -$r1_3: 1.3rem; -$r1_4: 1.4rem; -$r1_6: 1.6rem; -$r1_7: 1.7rem; -$r1_8: 1.8rem; -$r1_9: 1.9rem; -// -$pc0: 0%; -$pc10: 10%; -$pc20: 20%; $pc25: 25%; -$pc30: 30%; $pc33: 33.3333%; -$pc40: 40%; -$pc50: 50%; -$pc60: 60%; $pc66: 66.6666%; -$pc70: 70%; $pc75: 75%; -$pc80: 80%; -$pc90: 90%; -$pc100: 100%; -$pc110: 110%; -$pc120: 120%; $pc125: 125%; - -$px0: 0px; -$px1: 1px; -$px2: 2px; -$px3: 3px; -$px4: 4px; - -// ### General ### - -// -- display -.#{$pre}none { display:none } -.#{$pre}block { display:block } -.#{$pre}inline-block { display:inline-block } -.#{$pre}clearfix:after { content:""; display:table; clear:both; } -.#{$pre}overflow-hidden { overflow:hidden } -.#{$pre}overflow-scroll { overflow:scroll } -.#{$pre}overflow-x-hidden { overflow-x:hidden } -.#{$pre}overflow-y-hidden { overflow-y:hidden } -.#{$pre}overflow-x-scroll { overflow-x:scroll } -.#{$pre}overflow-y-scroll { overflow-y:scroll } - -// -- anchors -.#{$pre}pointer { cursor: pointer; } -.#{$pre}hover-toggle { - // @extend .#{$pre}pointer; - // - &:hover { - // - .#{$pre}hover-toggle-item-block { - display:block; - } - .#{$pre}hover-toggle-item-inline-block { - display:inline-block; - } - } -} - -// -- img -.#{$pre}img-circle { border-radius:$pc50; } - -// -- background -.#{$pre}bg-size-cover { background-size:cover } -.#{$pre}bg-repeat-none { background-repeat:no-repeat } -.#{$pre}bg-position-center { background-position:center } - -// -- border -.#{$pre}border-none { border-width:$r0; } -.#{$pre}border1px { border-style: solid; border-width:$px1; } -.#{$pre}border2px { border-style: solid; border-width:$px2; } -.#{$pre}border0_25 { border-style: solid; border-width:$r0_25; } -.#{$pre}border0_3 { border-style: solid; border-width:$r0_3; } -.#{$pre}border0_5 { border-style: solid; border-width:$r0_5; } -.#{$pre}border0_75 { border-style: solid; border-width:$r0_75; } -.#{$pre}border1 { border-style: solid; border-width:$r1; } - -.#{$pre}border-top1px { border-top-style: solid; border-top-width:$px1; } -.#{$pre}border-top2px { border-top-style: solid; border-top-width:$px2; } -.#{$pre}border-top0_25 { border-top-style: solid; border-top-width:$r0_25; } -.#{$pre}border-top0_3 { border-top-style: solid; border-top-width:$r0_3; } -.#{$pre}border-top0_5 { border-top-style: solid; border-top-width:$r0_5; } -.#{$pre}border-top0_75 { border-top-style: solid; border-top-width:$r0_75; } -.#{$pre}border-top1 { border-top-style: solid; border-top-width:$r1; } - -.#{$pre}border-right1px { border-right-style: solid; border-right-width:$px1; } -.#{$pre}border-right2px { border-right-style: solid; border-right-width:$px2; } -.#{$pre}border-right0_25 { border-right-style: solid; border-right-width:$r0_25; } -.#{$pre}border-right0_3 { border-right-style: solid; border-right-width:$r0_3; } -.#{$pre}border-right0_5 { border-right-style: solid; border-right-width:$r0_5; } -.#{$pre}border-right0_75 { border-right-style: solid; border-right-width:$r0_75; } -.#{$pre}border-right1 { border-right-style: solid; border-right-width:$r1; } - -.#{$pre}border-bottom1px { border-bottom-style: solid; border-bottom-width:$px1; } -.#{$pre}border-bottom2px { border-bottom-style: solid; border-bottom-width:$px2; } -.#{$pre}border-bottom0_25 { border-bottom-style: solid; border-bottom-width:$r0_25; } -.#{$pre}border-bottom0_3 { border-bottom-style: solid; border-bottom-width:$r0_3; } -.#{$pre}border-bottom0_5 { border-bottom-style: solid; border-bottom-width:$r0_5; } -.#{$pre}border-bottom0_75 { border-bottom-style: solid; border-bottom-width:$r0_75; } -.#{$pre}border-bottom1 { border-bottom-style: solid; border-bottom-width:$r1; } - -.#{$pre}border-left1px { border-left-style: solid; border-left-width:$px1; } -.#{$pre}border-left2px { border-left-style: solid; border-left-width:$px2; } -.#{$pre}border-left0_25 { border-left-style: solid; border-left-width:$r0_25; } -.#{$pre}border-left0_3 { border-left-style: solid; border-left-width:$r0_3; } -.#{$pre}border-left0_5 { border-left-style: solid; border-left-width:$r0_5; } -.#{$pre}border-left0_75 { border-left-style: solid; border-left-width:$r0_75; } -.#{$pre}border-left1 { border-left-style: solid; border-left-width:$r1; } - -.#{$pre}border-rad0_25 { border-style: solid; border-radius:$r0_25; } -.#{$pre}border-rad0_5 { border-style: solid; border-radius:$r0_5; } -.#{$pre}border-rad0_75 { border-style: solid; border-radius:$r0_75; } -.#{$pre}border-rad1 { border-style: solid; border-radius:$r1; } - -// ### Forms ### - -.#{$pre}resize-none { resize:none } - -// ### Layout ### - -// -- z-index -.#{$pre}z1 { z-index:1 } -.#{$pre}z2 { z-index:2 } -.#{$pre}z3 { z-index:3 } -.#{$pre}z4 { z-index:4 } -.#{$pre}z5 { z-index:5 } -.#{$pre}z6 { z-index:6 } -.#{$pre}z7 { z-index:7 } -.#{$pre}z8 { z-index:8 } -.#{$pre}z9 { z-index:9 } -.#{$pre}z10 { z-index:10 } - -// -- floats & clears -.#{$pre}float-left { float:left } -.#{$pre}float-right { float:right } -.#{$pre}float-none { float:none } - -// -- text alignment - -.#{$pre}text-align-right { text-align:right } -.#{$pre}text-align-center { text-align:center } -.#{$pre}text-left-align { text-align:left } - -// ### Table ### -.#{$pre}table { display:table } -.#{$pre}table-fixed { table-layout:fixed } -.#{$pre}table-row { display:table-row } -.#{$pre}table-cell { display:table-cell } - -// ### Lists ### -.#{$pre}list-reset { list-style: none; padding-left:$r0 } -.#{$pre}list-inline > li { display:inline-block } -.#{$pre}list-none > li { display:none } - -// -- width -.#{$pre}w110p { width:$pc110; } -.#{$pre}w100p { width:$pc100; } -.#{$pre}w75p { width:$pc75; } -.#{$pre}w66p { width:$pc66; } -.#{$pre}w50p { width:$pc50; } -.#{$pre}w33p { width:$pc33; } -.#{$pre}w25p { width:$pc25; } - -.#{$pre}w0 { width:$r0 } -.#{$pre}w0_25 { width:$r0_25 } -.#{$pre}w0_5 { width:$r0_5 } -.#{$pre}w0_75 { width:$r0_75 } -.#{$pre}w1 { width:$r1 } -.#{$pre}w1_25 { width:$r1_25 } -.#{$pre}w1_5 { width:$r1_5 } -.#{$pre}w1_75 { width:$r1_75 } -.#{$pre}w2 { width:$r2 } -.#{$pre}w2_25 { width:$r2_25 } -.#{$pre}w2_5 { width:$r2_5 } -.#{$pre}w2_75 { width:$r2_75 } -.#{$pre}w3 { width:$r3 } -.#{$pre}w3_25 { width:$r3_25 } -.#{$pre}w3_5 { width:$r3_5 } -.#{$pre}w3_75 { width:$r3_75 } -.#{$pre}w4 { width:$r4 } -.#{$pre}w4_25 { width:$r4_25 } -.#{$pre}w4_5 { width:$r4_5 } -.#{$pre}w4_75 { width:$r4_75 } -.#{$pre}w5 { width:$r5 } -.#{$pre}w5_25 { width:$r5_25 } -.#{$pre}w5_5 { width:$r5_5 } -.#{$pre}w5_75 { width:$r5_75 } -.#{$pre}w6 { width:$r6 } -.#{$pre}w6_25 { width:$r6_25 } -.#{$pre}w6_5 { width:$r6_5 } -.#{$pre}w6_75 { width:$r6_75 } -.#{$pre}w7 { width:$r7 } -.#{$pre}w7_25 { width:$r7_25 } -.#{$pre}w7_5 { width:$r7_5 } -.#{$pre}w7_75 { width:$r7_75 } -.#{$pre}w8 { width:$r8 } -.#{$pre}w8_25 { width:$r8_25 } -.#{$pre}w8_5 { width:$r8_5 } -.#{$pre}w8_75 { width:$r8_75} -.#{$pre}w9 { width:$r9 } -.#{$pre}w9_25 { width:$r9_25 } -.#{$pre}w9_5 { width:$r9_5 } -.#{$pre}w9_75 { width:$r9_75 } -.#{$pre}w10 { width:$r10 } -.#{$pre}w10_25 { width:$r10_25 } -.#{$pre}w10_5 { width:$r10_5 } -.#{$pre}w10_75 { width:$r10_75 } -.#{$pre}w11 { width:$r11 } -.#{$pre}w11_25 { width:$r11_25 } -.#{$pre}w11_5 { width:$r11_5 } -.#{$pre}w11_75 { width:$r11_75 } -.#{$pre}w12 { width:$r12 } -.#{$pre}w12_25 { width:$r12_25 } -.#{$pre}w12_5 { width:$r12_5 } -.#{$pre}w12_75 { width:$r12_75 } -.#{$pre}w13 { width:$r13 } -.#{$pre}w13_25 { width:$r13_25 } -.#{$pre}w13_5 { width:$r13_5 } -.#{$pre}w13_75 { width:$r13_75 } -.#{$pre}w14 { width:$r14 } -.#{$pre}w14_25 { width:$r14_25 } -.#{$pre}w14_5 { width:$r14_5 } -.#{$pre}w14_75 { width:$r14_75 } -.#{$pre}w15 { width:$r15 } -.#{$pre}w15_25 { width:$r15_25 } -.#{$pre}w15_5 { width:$r15_5 } -.#{$pre}w15_75 { width:$r15_75 } -.#{$pre}w16 { width:$r16 } -.#{$pre}w16_25 { width:$r16_25 } -.#{$pre}w16_5 { width:$r16_5 } -.#{$pre}w16_75 { width:$r16_75 } -.#{$pre}w17 { width:$r17 } -.#{$pre}w17_25 { width:$r17_25 } -.#{$pre}w17_5 { width:$r17_5 } -.#{$pre}w17_75 { width:$r17_75 } -.#{$pre}w18 { width:$r18 } -.#{$pre}w18_25 { width:$r18_25 } -.#{$pre}w18_5 { width:$r18_5 } -.#{$pre}w18_75 { width:$r18_75 } -.#{$pre}w19 { width:$r19 } -.#{$pre}w19_25 { width:$r19_25 } -.#{$pre}w19_5 { width:$r19_5 } -.#{$pre}w19_75 { width:$r19_75 } -.#{$pre}w20 { width:$r20 } -.#{$pre}w20_25 { width:$r20_25 } -.#{$pre}w20_5 { width:$r20_5 } -.#{$pre}w20_75 { width:$r20_75} -.#{$pre}w21 { width:$r21 } -.#{$pre}w21_25 { width:$r21_25 } -.#{$pre}w21_5 { width:$r21_5 } -.#{$pre}w21_75 { width:$r21_75 } -.#{$pre}w22 { width:$r22 } -.#{$pre}w22_25 { width:$r22_25 } -.#{$pre}w22_5 { width:$r22_5 } -.#{$pre}w22_75 { width:$r22_75 } -.#{$pre}w23 { width:$r23 } -.#{$pre}w23_25 { width:$r23_25 } -.#{$pre}w23_5 { width:$r23_5 } -.#{$pre}w23_75 { width:$r23_75 } -.#{$pre}w24 { width:$r24 } -.#{$pre}w24_25 { width:$r24_25 } -.#{$pre}w24_5 { width:$r24_5 } -.#{$pre}w24_75 { width:$r24_75 } -.#{$pre}w25 { width:$r25 } -.#{$pre}w25_25 { width:$r25_25 } -.#{$pre}w25_5 { width:$r25_5 } // 300px -.#{$pre}w25_75 { width:$r25_75 } - -// -- max-width -.#{$pre}mw110p { max-width:$pc110; } -.#{$pre}mw100p { max-width:$pc100; } -.#{$pre}mw75p { max-width:$pc75; } -.#{$pre}mw66p { max-width:$pc66; } -.#{$pre}mw50p { max-width:$pc50; } -.#{$pre}mw33p { max-width:$pc33; } -.#{$pre}mw25p { max-width:$pc25; } - -.#{$pre}mw-site { max-width:88.5rem; } // 1062px - -.#{$pre}mw0 { max-width:$r0 } -.#{$pre}mw0_25 { max-width:$r0_25 } -.#{$pre}mw0_5 { max-width:$r0_5 } -.#{$pre}mw0_75 { max-width:$r0_75 } -.#{$pre}mw1 { max-width:$r1 } -.#{$pre}mw1_25 { max-width:$r1_25 } -.#{$pre}mw1_5 { max-width:$r1_5 } -.#{$pre}mw1_75 { max-width:$r1_75 } -.#{$pre}mw2 { max-width:$r2 } -.#{$pre}mw2_25 { max-width:$r2_25 } -.#{$pre}mw2_5 { max-width:$r2_5 } -.#{$pre}mw2_75 { max-width:$r2_75 } -.#{$pre}mw3 { max-width:$r3 } -.#{$pre}mw3_25 { max-width:$r3_25 } -.#{$pre}mw3_5 { max-width:$r3_5 } -.#{$pre}mw3_75 { max-width:$r3_75 } -.#{$pre}mw4 { max-width:$r4 } -.#{$pre}mw4_25 { max-width:$r4_25 } -.#{$pre}mw4_5 { max-width:$r4_5 } -.#{$pre}mw4_75 { max-width:$r4_75 } -.#{$pre}mw5 { max-width:$r5 } -.#{$pre}mw5_25 { max-width:$r5_25 } -.#{$pre}mw5_5 { max-width:$r5_5 } -.#{$pre}mw5_75 { max-width:$r5_75 } -.#{$pre}mw6 { max-width:$r6 } -.#{$pre}mw6_25 { max-width:$r6_25 } -.#{$pre}mw6_5 { max-width:$r6_5 } -.#{$pre}mw6_75 { max-width:$r6_75 } -.#{$pre}mw7 { max-width:$r7 } -.#{$pre}mw7_25 { max-width:$r7_25 } -.#{$pre}mw7_5 { max-width:$r7_5 } -.#{$pre}mw7_75 { max-width:$r7_75 } -.#{$pre}mw8 { max-width:$r8 } -.#{$pre}mw8_25 { max-width:$r8_25 } -.#{$pre}mw8_5 { max-width:$r8_5 } -.#{$pre}mw8_75 { max-width:$r8_75} -.#{$pre}mw9 { max-width:$r9 } -.#{$pre}mw9_25 { max-width:$r9_25 } -.#{$pre}mw9_5 { max-width:$r9_5 } -.#{$pre}mw9_75 { max-width:$r9_75 } -.#{$pre}mw10 { max-width:$r10 } -.#{$pre}mw10_25 { max-width:$r10_25 } -.#{$pre}mw10_5 { max-width:$r10_5 } -.#{$pre}mw10_75 { max-width:$r10_75 } -.#{$pre}mw11 { max-width:$r11 } -.#{$pre}mw11_25 { max-width:$r11_25 } -.#{$pre}mw11_5 { max-width:$r11_5 } -.#{$pre}mw11_75 { max-width:$r11_75 } -.#{$pre}mw12 { max-width:$r12 } -.#{$pre}mw12_25 { max-width:$r12_25 } -.#{$pre}mw12_5 { max-width:$r12_5 } -.#{$pre}mw12_75 { max-width:$r12_75 } -.#{$pre}mw13 { max-width:$r13 } -.#{$pre}mw13_25 { max-width:$r13_25 } -.#{$pre}mw13_5 { max-width:$r13_5 } -.#{$pre}mw13_75 { max-width:$r13_75 } -.#{$pre}mw14 { max-width:$r14 } -.#{$pre}mw14_25 { max-width:$r14_25 } -.#{$pre}mw14_5 { max-width:$r14_5 } -.#{$pre}mw14_75 { max-width:$r14_75 } -.#{$pre}mw15 { max-width:$r15 } -.#{$pre}mw15_25 { max-width:$r15_25 } -.#{$pre}mw15_5 { max-width:$r15_5 } -.#{$pre}mw15_75 { max-width:$r15_75 } -.#{$pre}mw16 { max-width:$r16 } -.#{$pre}mw16_25 { max-width:$r16_25 } -.#{$pre}mw16_5 { max-width:$r16_5 } -.#{$pre}mw16_75 { max-width:$r16_75 } -.#{$pre}mw17 { max-width:$r17 } -.#{$pre}mw17_25 { max-width:$r17_25 } -.#{$pre}mw17_5 { max-width:$r17_5 } -.#{$pre}mw17_75 { max-width:$r17_75 } -.#{$pre}mw18 { max-width:$r18 } -.#{$pre}mw18_25 { max-width:$r18_25 } -.#{$pre}mw18_5 { max-width:$r18_5 } -.#{$pre}mw18_75 { max-width:$r18_75 } -.#{$pre}mw19 { max-width:$r19 } -.#{$pre}mw19_25 { max-width:$r19_25 } -.#{$pre}mw19_5 { max-width:$r19_5 } -.#{$pre}mw19_75 { max-width:$r19_75 } -.#{$pre}mw20 { max-width:$r20 } -.#{$pre}mw20_25 { max-width:$r20_25 } -.#{$pre}mw20_5 { max-width:$r20_5 } -.#{$pre}mw20_75 { max-width:$r20_75} -.#{$pre}mw21 { max-width:$r21 } -.#{$pre}mw21_25 { max-width:$r21_25 } -.#{$pre}mw21_5 { max-width:$r21_5 } -.#{$pre}mw21_75 { max-width:$r21_75 } -.#{$pre}mw22 { max-width:$r22 } -.#{$pre}mw22_25 { max-width:$r22_25 } -.#{$pre}mw22_5 { max-width:$r22_5 } -.#{$pre}mw22_75 { max-width:$r22_75 } -.#{$pre}mw23 { max-width:$r23 } -.#{$pre}mw23_25 { max-width:$r23_25 } -.#{$pre}mw23_5 { max-width:$r23_5 } -.#{$pre}mw23_75 { max-width:$r23_75 } -.#{$pre}mw24 { max-width:$r24 } -.#{$pre}mw24_25 { max-width:$r24_25 } -.#{$pre}mw24_5 { max-width:$r24_5 } -.#{$pre}mw24_75 { max-width:$r24_75 } -.#{$pre}mw25 { max-width:$r25 } -.#{$pre}mw25_25 { max-width:$r25_25 } -.#{$pre}mw25_5 { max-width:$r25_5 } // 300px -.#{$pre}mw25_75 { max-width:$r25_75 } - -// -- padding -.#{$pre}p0 { padding:$r0 } -.#{$pre}p0_25 { padding:$r0_25 } -.#{$pre}p0_5 { padding:$r0_5 } -.#{$pre}p0_75 { padding:$r0_75 } -.#{$pre}p1 { padding:$r1 } -.#{$pre}p1_25 { padding:$r1_25 } -.#{$pre}p1_5 { padding:$r1_5 } -.#{$pre}p1_75 { padding:$r1_75 } -.#{$pre}p2 { padding:$r2 } -.#{$pre}p2_25 { padding:$r2_25 } -.#{$pre}p2_5 { padding:$r2_5 } -.#{$pre}p2_75 { padding:$r2_75 } -.#{$pre}p3 { padding:$r3 } -.#{$pre}p3_25 { padding:$r3_25 } -.#{$pre}p3_5 { padding:$r3_5 } -.#{$pre}p3_75 { padding:$r3_75 } -.#{$pre}p4 { padding:$r4 } -.#{$pre}p4_25 { padding:$r4_25 } -.#{$pre}p4_5 { padding:$r4_5 } -.#{$pre}p4_75 { padding:$r4_75 } -.#{$pre}p5 { padding:$r5 } -.#{$pre}p5_25 { padding:$r5_25 } -.#{$pre}p5_5 { padding:$r5_5 } -.#{$pre}p5_75 { padding:$r5_75 } -.#{$pre}p6 { padding:$r6 } -.#{$pre}p6_25 { padding:$r6_25 } -.#{$pre}p6_5 { padding:$r6_5 } -.#{$pre}p6_75 { padding:$r6_75 } -.#{$pre}p7 { padding:$r7 } -.#{$pre}p7_25 { padding:$r7_25 } -.#{$pre}p7_5 { padding:$r7_5 } -.#{$pre}p7_75 { padding:$r7_75 } - -// left & right -.#{$pre}px0 { padding-left:$r0; padding-right:$r0 } -.#{$pre}px0_25 { padding-left:$r0_25; padding-right:$r0_25 } -.#{$pre}px0_5 { padding-left:$r0_5; padding-right:$r0_5 } -.#{$pre}px0_75 { padding-left:$r0_75; padding-right:$r0_75 } -.#{$pre}px1 { padding-left:$r1; padding-right:$r1 } -.#{$pre}px1_25 { padding-left:$r1_25; padding-right:$r1_25 } -.#{$pre}px1_5 { padding-left:$r1_5; padding-right:$r1_5 } -.#{$pre}px1_75 { padding-left:$r1_75; padding-right:$r1_75 } -.#{$pre}px2 { padding-left:$r2; padding-right:$r2 } -.#{$pre}px2_25 { padding-left:$r2_25; padding-right:$r2_25 } -.#{$pre}px2_5 { padding-left:$r2_5; padding-right:$r2_5 } -.#{$pre}px2_75 { padding-left:$r2_75; padding-right:$r2_75 } -.#{$pre}px3 { padding-left:$r3; padding-right:$r3 } -.#{$pre}px3_25 { padding-left:$r3_25; padding-right:$r3_25 } -.#{$pre}px3_5 { padding-left:$r3_5; padding-right:$r3_5 } -.#{$pre}px3_75 { padding-left:$r3_75; padding-right:$r3_75 } -.#{$pre}px4 { padding-left:$r4; padding-right:$r4 } -.#{$pre}px4_25 { padding-left:$r4_25; padding-right:$r4_25 } -.#{$pre}px4_5 { padding-left:$r4_5; padding-right:$r4_5 } -.#{$pre}px4_75 { padding-left:$r4_75; padding-right:$r4_75 } -.#{$pre}px5 { padding-left:$r5; padding-right:$r5 } -.#{$pre}px5_25 { padding-left:$r5_25; padding-right:$r5_25 } -.#{$pre}px5_5 { padding-left:$r5_5; padding-right:$r5_5 } -.#{$pre}px5_75 { padding-left:$r5_75; padding-right:$r5_75 } -.#{$pre}px6 { padding-left:$r6; padding-right:$r6 } -.#{$pre}px6_25 { padding-left:$r6_25; padding-right:$r6_25 } -.#{$pre}px6_5 { padding-left:$r6_5; padding-right:$r6_5 } -.#{$pre}px6_75 { padding-left:$r6_75; padding-right:$r6_75 } -.#{$pre}px7 { padding-left:$r7; padding-right:$r7 } -.#{$pre}px7_25 { padding-left:$r7_25; padding-right:$r7_25 } -.#{$pre}px7_5 { padding-left:$r7_5; padding-right:$r7_5 } -.#{$pre}px7_75 { padding-left:$r7_75; padding-right:$r7_75 } - -// top & bottom -.#{$pre}py0 { padding-top:$r0; padding-bottom:$r0 } -.#{$pre}py0_25 { padding-top:$r0_25; padding-bottom:$r0_25 } -.#{$pre}py0_5 { padding-top:$r0_5; padding-bottom:$r0_5 } -.#{$pre}py0_75 { padding-top:$r0_75; padding-bottom:$r0_75 } -.#{$pre}py1 { padding-top:$r1; padding-bottom:$r1 } -.#{$pre}py1_25 { padding-top:$r1_25; padding-bottom:$r1_25 } -.#{$pre}py1_5 { padding-top:$r1_5; padding-bottom:$r1_5 } -.#{$pre}py1_75 { padding-top:$r1_75; padding-bottom:$r1_75 } -.#{$pre}py2 { padding-top:$r2; padding-bottom:$r2 } -.#{$pre}py2_25 { padding-top:$r2_25; padding-bottom:$r2_25 } -.#{$pre}py2_5 { padding-top:$r2_5; padding-bottom:$r2_5 } -.#{$pre}py2_75 { padding-top:$r2_75; padding-bottom:$r2_75 } -.#{$pre}py3 { padding-top:$r3; padding-bottom:$r3 } -.#{$pre}py3_25 { padding-top:$r3_25; padding-bottom:$r3_25 } -.#{$pre}py3_5 { padding-top:$r3_5; padding-bottom:$r3_5 } -.#{$pre}py3_75 { padding-top:$r3_75; padding-bottom:$r3_75 } -.#{$pre}py4 { padding-top:$r4; padding-bottom:$r4 } -.#{$pre}py4_25 { padding-top:$r4_25; padding-bottom:$r4_25 } -.#{$pre}py4_5 { padding-top:$r4_5; padding-bottom:$r4_5 } -.#{$pre}py4_75 { padding-top:$r4_75; padding-bottom:$r4_75 } -.#{$pre}py5 { padding-top:$r5; padding-bottom:$r5 } -.#{$pre}py5_25 { padding-top:$r5_25; padding-bottom:$r5_25 } -.#{$pre}py5_5 { padding-top:$r5_5; padding-bottom:$r5_5 } -.#{$pre}py5_75 { padding-top:$r5_75; padding-bottom:$r5_75 } -.#{$pre}py6 { padding-top:$r6; padding-bottom:$r6 } -.#{$pre}py6_25 { padding-top:$r6_25; padding-bottom:$r6_25 } -.#{$pre}py6_5 { padding-top:$r6_5; padding-bottom:$r6_5 } -.#{$pre}py6_75 { padding-top:$r6_75; padding-bottom:$r6_75 } -.#{$pre}py7 { padding-top:$r7; padding-bottom:$r7 } -.#{$pre}py7_25 { padding-top:$r7_25; padding-bottom:$r7_25 } -.#{$pre}py7_5 { padding-top:$r7_5; padding-bottom:$r7_5 } -.#{$pre}py7_75 { padding-top:$r7_75; padding-bottom:$r7_75 } - -// top -.#{$pre}pt1 { padding-top:$r1 } -.#{$pre}pt1_25 { padding-top:$r1_25 } -.#{$pre}pt1_5 { padding-top:$r1_5 } -.#{$pre}pt1_75 { padding-top:$r1_75 } -.#{$pre}pt2 { padding-top:$r2 } -.#{$pre}pt2_25 { padding-top:$r2_25 } -.#{$pre}pt2_5 { padding-top:$r2_5 } -.#{$pre}pt2_75 { padding-top:$r2_75 } -.#{$pre}pt3 { padding-top:$r3 } -.#{$pre}pt3_25 { padding-top:$r3_25 } -.#{$pre}pt3_5 { padding-top:$r3_5 } -.#{$pre}pt3_75 { padding-top:$r3_75 } -.#{$pre}pt4 { padding-top:$r4 } -.#{$pre}pt4_25 { padding-top:$r4_25 } -.#{$pre}pt4_5 { padding-top:$r4_5 } -.#{$pre}pt4_75 { padding-top:$r4_75 } -.#{$pre}pt5 { padding-top:$r5 } -.#{$pre}pt5_25 { padding-top:$r5_25 } -.#{$pre}pt5_5 { padding-top:$r5_5 } -.#{$pre}pt5_75 { padding-top:$r5_75 } -.#{$pre}pt6 { padding-top:$r6 } -.#{$pre}pt6_25 { padding-top:$r6_25 } -.#{$pre}pt6_5 { padding-top:$r6_5 } -.#{$pre}pt6_75 { padding-top:$r6_75 } -.#{$pre}pt7 { padding-top:$r7 } -.#{$pre}pt7_25 { padding-top:$r7_25 } -.#{$pre}pt7_5 { padding-top:$r7_5 } -.#{$pre}pt7_75 { padding-top:$r7_75 } - -// right -.#{$pre}pr0 { padding-right:$r0 } -.#{$pre}pr0_25 { padding-right:$r0_25 } -.#{$pre}pr0_5 { padding-right:$r0_5 } -.#{$pre}pr0_75 { padding-right:$r0_75 } -.#{$pre}pr1 { padding-right:$r1 } -.#{$pre}pr1_25 { padding-right:$r1_25 } -.#{$pre}pr1_5 { padding-right:$r1_5 } -.#{$pre}pr1_75 { padding-right:$r1_75 } -.#{$pre}pr2 { padding-right:$r2 } -.#{$pre}pr2_25 { padding-right:$r2_25 } -.#{$pre}pr2_5 { padding-right:$r2_5 } -.#{$pre}pr2_75 { padding-right:$r2_75 } -.#{$pre}pr3 { padding-right:$r3 } -.#{$pre}pr3_25 { padding-right:$r3_25 } -.#{$pre}pr3_5 { padding-right:$r3_5 } -.#{$pre}pr3_75 { padding-right:$r3_75 } -.#{$pre}pr4 { padding-right:$r4 } -.#{$pre}pr4_25 { padding-right:$r4_25 } -.#{$pre}pr4_5 { padding-right:$r4_5 } -.#{$pre}pr4_75 { padding-right:$r4_75 } -.#{$pre}pr5 { padding-right:$r5 } -.#{$pre}pr5_25 { padding-right:$r5_25 } -.#{$pre}pr5_5 { padding-right:$r5_5 } -.#{$pre}pr5_75 { padding-right:$r5_75 } -.#{$pre}pr6 { padding-right:$r6 } -.#{$pre}pr6_25 { padding-right:$r6_25 } -.#{$pre}pr6_5 { padding-right:$r6_5 } -.#{$pre}pr6_75 { padding-right:$r6_75 } -.#{$pre}pr7 { padding-right:$r6 } -.#{$pre}pr7_25 { padding-right:$r6_25 } -.#{$pre}pr7_5 { padding-right:$r6_5 } -.#{$pre}pr7_75 { padding-right:$r6_75 } - -// bottom -.#{$pre}pb0 { padding-bottom:$r0 } -.#{$pre}pb0_25 { padding-bottom:$r0_25 } -.#{$pre}pb0_5 { padding-bottom:$r0_5 } -.#{$pre}pb0_75 { padding-bottom:$r0_75 } -.#{$pre}pb1 { padding-bottom:$r1 } -.#{$pre}pb1_25 { padding-bottom:$r1_25 } -.#{$pre}pb1_5 { padding-bottom:$r1_5 } -.#{$pre}pb1_75 { padding-bottom:$r1_75 } -.#{$pre}pb2 { padding-bottom:$r2 } -.#{$pre}pb2_25 { padding-bottom:$r2_25 } -.#{$pre}pb2_5 { padding-bottom:$r2_5 } -.#{$pre}pb2_75 { padding-bottom:$r2_75 } -.#{$pre}pb3 { padding-bottom:$r3 } -.#{$pre}pb3_25 { padding-bottom:$r3_25 } -.#{$pre}pb3_5 { padding-bottom:$r3_5 } -.#{$pre}pb3_75 { padding-bottom:$r3_75 } -.#{$pre}pb4 { padding-bottom:$r4 } -.#{$pre}pb4_25 { padding-bottom:$r4_25 } -.#{$pre}pb4_5 { padding-bottom:$r4_5 } -.#{$pre}pb4_75 { padding-bottom:$r4_75 } -.#{$pre}pb5 { padding-bottom:$r5 } -.#{$pre}pb5_25 { padding-bottom:$r5_25 } -.#{$pre}pb5_5 { padding-bottom:$r5_5 } -.#{$pre}pb5_75 { padding-bottom:$r5_75 } -.#{$pre}pb6 { padding-bottom:$r7 } -.#{$pre}pb6_25 { padding-bottom:$r7_25 } -.#{$pre}pb6_5 { padding-bottom:$r7_5 } -.#{$pre}pb6_75 { padding-bottom:$r7_75 } - -// left -.#{$pre}pl0 { padding-left:$r0 } -.#{$pre}pl0_25 { padding-left:$r0_25 } -.#{$pre}pl0_5 { padding-left:$r0_5 } -.#{$pre}pl0_75 { padding-left:$r0_75 } -.#{$pre}pl1 { padding-left:$r1 } -.#{$pre}pl1_25 { padding-left:$r1_25 } -.#{$pre}pl1_5 { padding-left:$r1_5 } -.#{$pre}pl1_75 { padding-left:$r1_75 } -.#{$pre}pl2 { padding-left:$r2 } -.#{$pre}pl2_25 { padding-left:$r2_25 } -.#{$pre}pl2_5 { padding-left:$r2_5 } -.#{$pre}pl2_75 { padding-left:$r2_75 } -.#{$pre}pl3 { padding-left:$r3 } -.#{$pre}pl3_25 { padding-left:$r3_25 } -.#{$pre}pl3_5 { padding-left:$r3_5 } -.#{$pre}pl3_75 { padding-left:$r3_75 } -.#{$pre}pl4 { padding-left:$r4 } -.#{$pre}pl4_25 { padding-left:$r4_25 } -.#{$pre}pl4_5 { padding-left:$r4_5 } -.#{$pre}pl4_75 { padding-left:$r4_75 } -.#{$pre}pl5 { padding-left:$r5 } -.#{$pre}pl5_25 { padding-left:$r5_25 } -.#{$pre}pl5_5 { padding-left:$r5_5 } -.#{$pre}pl5_75 { padding-left:$r5_75 } -.#{$pre}pl6 { padding-left:$r6 } -.#{$pre}pl6_25 { padding-left:$r6_25 } -.#{$pre}pl6_5 { padding-left:$r6_5 } -.#{$pre}pl6_75 { padding-left:$r6_75 } -.#{$pre}pl7 { padding-left:$r7 } -.#{$pre}pl7_25 { padding-left:$r7_25 } -.#{$pre}pl7_5 { padding-left:$r7_5 } -.#{$pre}pl7_75 { padding-left:$r7_75 } - -// -- margin -.#{$pre}m0 { margin:$r0 } -.#{$pre}m0_25 { margin:$r0_25 } -.#{$pre}m0_5 { margin:$r0_5 } -.#{$pre}m0_75 { margin:$r0_75 } -.#{$pre}m1 { margin:$r1 } -.#{$pre}m1_25 { margin:$r1_25 } -.#{$pre}m1_5 { margin:$r1_5 } -.#{$pre}m1_75 { margin:$r1_75 } -.#{$pre}m2 { margin:$r2 } -.#{$pre}m2_25 { margin:$r2_25 } -.#{$pre}m2_5 { margin:$r2_5 } -.#{$pre}m2_75 { margin:$r2_75 } -.#{$pre}m3 { margin:$r3 } -.#{$pre}m3_25 { margin:$r3_25 } -.#{$pre}m3_5 { margin:$r3_5 } -.#{$pre}m3_75 { margin:$r3_75 } -.#{$pre}m4 { margin:$r4 } -.#{$pre}m4_25 { margin:$r4_25 } -.#{$pre}m4_5 { margin:$r4_5 } -.#{$pre}m4_75 { margin:$r4_75 } -.#{$pre}m5 { margin:$r5 } -.#{$pre}m5_25 { margin:$r5_25 } -.#{$pre}m5_5 { margin:$r5_5 } -.#{$pre}m5_75 { margin:$r5_75 } -.#{$pre}m6 { margin:$r6 } -.#{$pre}m6_25 { margin:$r6_25 } -.#{$pre}m6_5 { margin:$r6_5 } -.#{$pre}m6_75 { margin:$r6_75 } -.#{$pre}m7 { margin:$r7 } -.#{$pre}m7_25 { margin:$r7_25 } -.#{$pre}m7_5 { margin:$r7_5 } -.#{$pre}m7_75 { margin:$r7_75 } - -// left & right -.#{$pre}mx1 { margin-left:$r1; margin-right:$r1 } -.#{$pre}mx1_25 { margin-left:$r1_25; margin-right:$r1_25 } -.#{$pre}mx1_5 { margin-left:$r1_5; margin-right:$r1_5 } -.#{$pre}mx1_75 { margin-left:$r1_75; margin-right:$r1_75 } -.#{$pre}mx2 { margin-left:$r2; margin-right:$r2 } -.#{$pre}mx2_25 { margin-left:$r2_25; margin-right:$r2_25 } -.#{$pre}mx2_5 { margin-left:$r2_5; margin-right:$r2_5 } -.#{$pre}mx2_75 { margin-left:$r2_75; margin-right:$r2_75 } -.#{$pre}mx3 { margin-left:$r3; margin-right:$r3 } -.#{$pre}mx3_25 { margin-left:$r3_25; margin-right:$r3_25 } -.#{$pre}mx3_5 { margin-left:$r3_5; margin-right:$r3_5 } -.#{$pre}mx3_75 { margin-left:$r3_75; margin-right:$r3_75 } -.#{$pre}mx4 { margin-left:$r4; margin-right:$r4 } -.#{$pre}mx4_25 { margin-left:$r4_25; margin-right:$r4_25 } -.#{$pre}mx4_5 { margin-left:$r4_5; margin-right:$r4_5 } -.#{$pre}mx4_75 { margin-left:$r4_75; margin-right:$r4_75 } -.#{$pre}mx5 { margin-left:$r5; margin-right:$r5 } -.#{$pre}mx5_25 { margin-left:$r5_25; margin-right:$r5_25 } -.#{$pre}mx5_5 { margin-left:$r5_5; margin-right:$r5_5 } -.#{$pre}mx5_75 { margin-left:$r5_75; margin-right:$r5_75 } -.#{$pre}mx6 { margin-left:$r6; margin-right:$r6 } -.#{$pre}mx6_25 { margin-left:$r6_25; margin-right:$r6_25 } -.#{$pre}mx6_5 { margin-left:$r6_5; margin-right:$r6_5 } -.#{$pre}mx6_75 { margin-left:$r6_75; margin-right:$r6_75 } -.#{$pre}mx7 { margin-left:$r7; margin-right:$r7 } -.#{$pre}mx7_25 { margin-left:$r7_25; margin-right:$r7_25 } -.#{$pre}mx7_5 { margin-left:$r7_5; margin-right:$r7_5 } -.#{$pre}mx7_75 { margin-left:$r7_75; margin-right:$r7_75 } - -.#{$pre}mxn0_25 { margin-left:-$r0_25; margin-right:-$r0_25 } -.#{$pre}mxn0_5 { margin-left:-$r0_5; margin-right:-$r0_5 } -.#{$pre}mxn0_75 { margin-left:-$r0_75; margin-right:-$r0_75 } -.#{$pre}mxn1 { margin-left:-$r1; margin-right:-$r1 } -.#{$pre}mxn1_25 { margin-left:-$r1_25; margin-right:-$r1_25 } -.#{$pre}mxn1_5 { margin-left:-$r1_5; margin-right:-$r1_5 } -.#{$pre}mxn1_75 { margin-left:-$r1_75; margin-right:-$r1_75 } -.#{$pre}mxn2 { margin-left:-$r2; margin-right:-$r2 } -.#{$pre}mxn2_25 { margin-left:-$r2_25; margin-right:-$r2_25 } -.#{$pre}mxn2_5 { margin-left:-$r2_5; margin-right:-$r2_5 } -.#{$pre}mxn2_75 { margin-left:-$r2_75; margin-right:-$r2_75 } -.#{$pre}mxn3 { margin-left:-$r3; margin-right:-$r3 } -.#{$pre}mxn3_25 { margin-left:-$r3_25; margin-right:-$r3_25 } -.#{$pre}mxn3_5 { margin-left:-$r3_5; margin-right:-$r3_5 } -.#{$pre}mxn3_75 { margin-left:-$r3_75; margin-right:-$r3_75 } -.#{$pre}mxn4 { margin-left:-$r4; margin-right:-$r4 } -.#{$pre}mxn4_25 { margin-left:-$r4_25; margin-right:-$r4_25 } -.#{$pre}mxn4_5 { margin-left:-$r4_5; margin-right:-$r4_5 } -.#{$pre}mxn4_75 { margin-left:-$r4_75; margin-right:-$r4_75 } -.#{$pre}mxn5 { margin-left:-$r5; margin-right:-$r5 } -.#{$pre}mxn5_25 { margin-left:-$r5_25; margin-right:-$r5_25 } -.#{$pre}mxn5_5 { margin-left:-$r5_5; margin-right:-$r5_5 } -.#{$pre}mxn5_75 { margin-left:-$r5_75; margin-right:-$r5_75 } -.#{$pre}mxn6 { margin-left:-$r6; margin-right:-$r6 } -.#{$pre}mxn6_25 { margin-left:-$r6_25; margin-right:-$r6_25 } -.#{$pre}mxn6_5 { margin-left:-$r6_5; margin-right:-$r6_5 } -.#{$pre}mxn6_75 { margin-left:-$r6_75; margin-right:-$r6_75 } -.#{$pre}mxn7 { margin-left:-$r7; margin-right:-$r7 } -.#{$pre}mxn7_25 { margin-left:-$r7_25; margin-right:-$r7_25 } -.#{$pre}mxn7_5 { margin-left:-$r7_5; margin-right:-$r7_5 } -.#{$pre}mxn7_75 { margin-left:-$r7_75; margin-right:-$r7_75 } - -// top & bottom -.#{$pre}my1 { margin-top:$r1; margin-bottom:$r1 } -.#{$pre}my1_25 { margin-top:$r1_25; margin-bottom:$r1_25 } -.#{$pre}my1_5 { margin-top:$r1_5; margin-bottom:$r1_5 } -.#{$pre}my1_75 { margin-top:$r1_75; margin-bottom:$r1_75 } -.#{$pre}my2 { margin-top:$r2; margin-bottom:$r2 } -.#{$pre}my2_25 { margin-top:$r2_25; margin-bottom:$r2_25 } -.#{$pre}my2_5 { margin-top:$r2_5; margin-bottom:$r2_5 } -.#{$pre}my2_75 { margin-top:$r2_75; margin-bottom:$r2_75 } -.#{$pre}my3 { margin-top:$r3; margin-bottom:$r3 } -.#{$pre}my3_25 { margin-top:$r3_25; margin-bottom:$r3_25 } -.#{$pre}my3_5 { margin-top:$r3_5; margin-bottom:$r3_5 } -.#{$pre}my3_75 { margin-top:$r3_75; margin-bottom:$r3_75 } -.#{$pre}my4 { margin-top:$r4; margin-bottom:$r4 } -.#{$pre}my4_25 { margin-top:$r4_25; margin-bottom:$r4_25 } -.#{$pre}my4_5 { margin-top:$r4_5; margin-bottom:$r4_5 } -.#{$pre}my4_75 { margin-top:$r4_75; margin-bottom:$r4_75 } -.#{$pre}my5 { margin-top:$r5; margin-bottom:$r5 } -.#{$pre}my5_25 { margin-top:$r5_25; margin-bottom:$r5_25 } -.#{$pre}my5_5 { margin-top:$r5_5; margin-bottom:$r5_5 } -.#{$pre}my5_75 { margin-top:$r5_75; margin-bottom:$r5_75 } -.#{$pre}my6 { margin-top:$r6; margin-bottom:$r6 } -.#{$pre}my6_25 { margin-top:$r6_25; margin-bottom:$r6_25 } -.#{$pre}my6_5 { margin-top:$r6_5; margin-bottom:$r6_5 } -.#{$pre}my6_75 { margin-top:$r6_75; margin-bottom:$r6_75 } -.#{$pre}my7 { margin-top:$r7; margin-bottom:$r7 } -.#{$pre}my7_25 { margin-top:$r7_25; margin-bottom:$r7_25 } -.#{$pre}my7_5 { margin-top:$r7_5; margin-bottom:$r7_5 } -.#{$pre}my7_75 { margin-top:$r7_75; margin-bottom:$r7_75 } - -.#{$pre}myn0_25 { margin-top:-$r0_25; margin-bottom:-$r0_25 } -.#{$pre}myn0_5 { margin-top:-$r0_5; margin-bottom:-$r0_5 } -.#{$pre}myn0_75 { margin-top:-$r0_75; margin-bottom:-$r0_75 } -.#{$pre}myn1 { margin-top:-$r1; margin-bottom:-$r1 } -.#{$pre}myn1_25 { margin-top:-$r1_25; margin-bottom:-$r1_25 } -.#{$pre}myn1_5 { margin-top:-$r1_5; margin-bottom:-$r1_5 } -.#{$pre}myn1_75 { margin-top:-$r1_75; margin-bottom:-$r1_75 } -.#{$pre}myn2 { margin-top:-$r2; margin-bottom:-$r2 } -.#{$pre}myn2_25 { margin-top:-$r2_25; margin-bottom:-$r2_25 } -.#{$pre}myn2_5 { margin-top:-$r2_5; margin-bottom:-$r2_5 } -.#{$pre}myn2_75 { margin-top:-$r2_75; margin-bottom:-$r2_75 } -.#{$pre}myn3 { margin-top:-$r3; margin-bottom:-$r3 } -.#{$pre}myn3_25 { margin-top:-$r3_25; margin-bottom:-$r3_25 } -.#{$pre}myn3_5 { margin-top:-$r3_5; margin-bottom:-$r3_5 } -.#{$pre}myn3_75 { margin-top:-$r3_75; margin-bottom:-$r3_75 } -.#{$pre}myn4 { margin-top:-$r4; margin-bottom:-$r4 } -.#{$pre}myn4_25 { margin-top:-$r4_25; margin-bottom:-$r4_25 } -.#{$pre}myn4_5 { margin-top:-$r4_5; margin-bottom:-$r4_5 } -.#{$pre}myn4_75 { margin-top:-$r4_75; margin-bottom:-$r4_75 } -.#{$pre}myn5 { margin-top:-$r5; margin-bottom:-$r5 } -.#{$pre}myn5_25 { margin-top:-$r5_25; margin-bottom:-$r5_25 } -.#{$pre}myn5_5 { margin-top:-$r5_5; margin-bottom:-$r5_5 } -.#{$pre}myn5_75 { margin-top:-$r5_75; margin-bottom:-$r5_75 } -.#{$pre}myn6 { margin-top:-$r6; margin-bottom:-$r6 } -.#{$pre}myn6_25 { margin-top:-$r6_25; margin-bottom:-$r6_25 } -.#{$pre}myn6_5 { margin-top:-$r6_5; margin-bottom:-$r6_5 } -.#{$pre}myn6_75 { margin-top:-$r6_75; margin-bottom:-$r6_75 } -.#{$pre}myn7 { margin-top:-$r7; margin-bottom:-$r7 } -.#{$pre}myn7_25 { margin-top:-$r7_25; margin-bottom:-$r7_25 } -.#{$pre}myn7_5 { margin-top:-$r7_5; margin-bottom:-$r7_5 } -.#{$pre}myn7_75 { margin-top:-$r7_75; margin-bottom:-$r7_75 } - -// top -.#{$pre}mt0 { margin-top:$r0 } -.#{$pre}mt0_05 { margin-top:$r0_05 } -.#{$pre}mt0_1 { margin-top:$r0_1 } -.#{$pre}mt0_25 { margin-top:$r0_25 } -.#{$pre}mt0_5 { margin-top:$r0_5 } -.#{$pre}mt0_75 { margin-top:$r0_75 } -.#{$pre}mt1 { margin-top:$r1 } -.#{$pre}mt1_25 { margin-top:$r1_25 } -.#{$pre}mt1_5 { margin-top:$r1_5 } -.#{$pre}mt1_75 { margin-top:$r1_75 } -.#{$pre}mt2 { margin-top:$r2 } -.#{$pre}mt2_25 { margin-top:$r2_25 } -.#{$pre}mt2_5 { margin-top:$r2_5 } -.#{$pre}mt2_75 { margin-top:$r2_75 } -.#{$pre}mt3 { margin-top:$r3 } -.#{$pre}mt3_25 { margin-top:$r3_25 } -.#{$pre}mt3_5 { margin-top:$r3_5 } -.#{$pre}mt3_75 { margin-top:$r3_75 } -.#{$pre}mt4 { margin-top:$r4 } -.#{$pre}mt4_25 { margin-top:$r4_25 } -.#{$pre}mt4_5 { margin-top:$r4_5 } -.#{$pre}mt4_75 { margin-top:$r4_75 } -.#{$pre}mt5 { margin-top:$r5 } -.#{$pre}mt5_25 { margin-top:$r5_25 } -.#{$pre}mt5_5 { margin-top:$r5_5 } -.#{$pre}mt5_75 { margin-top:$r5_75 } -.#{$pre}mt6 { margin-top:$r6 } -.#{$pre}mt6_25 { margin-top:$r6_25 } -.#{$pre}mt6_5 { margin-top:$r6_5 } -.#{$pre}mt6_75 { margin-top:$r6_75 } -.#{$pre}mt7 { margin-top:$r7 } -.#{$pre}mt7_25 { margin-top:$r7_25 } -.#{$pre}mt7_5 { margin-top:$r7_5 } -.#{$pre}mt7_75 { margin-top:$r7_75 } - -.#{$pre}mtn0_05 { margin-top:-$r0_05 } -.#{$pre}mtn0_1 { margin-top:-$r0_1 } -.#{$pre}mtn0_25 { margin-top:-$r0_25 } -.#{$pre}mtn0_5 { margin-top:-$r0_5 } -.#{$pre}mtn0_75 { margin-top:-$r0_75 } -.#{$pre}mtn1 { margin-top:-$r1 } -.#{$pre}mtn1_25 { margin-top:-$r1_25 } -.#{$pre}mtn1_5 { margin-top:-$r1_5 } -.#{$pre}mtn1_75 { margin-top:-$r1_75 } -.#{$pre}mtn2 { margin-top:-$r2 } -.#{$pre}mtn2_25 { margin-top:-$r2_25 } -.#{$pre}mtn2_5 { margin-top:-$r2_5 } -.#{$pre}mtn2_75 { margin-top:-$r2_75 } -.#{$pre}mtn3 { margin-top:-$r3 } -.#{$pre}mtn3_25 { margin-top:-$r3_25 } -.#{$pre}mtn3_5 { margin-top:-$r3_5 } -.#{$pre}mtn3_75 { margin-top:-$r3_75 } -.#{$pre}mtn4 { margin-top:-$r4 } -.#{$pre}mtn4_25 { margin-top:-$r4_25 } -.#{$pre}mtn4_5 { margin-top:-$r4_5 } -.#{$pre}mtn4_75 { margin-top:-$r4_75 } -.#{$pre}mtn5 { margin-top:-$r5 } -.#{$pre}mtn5_25 { margin-top:-$r5_25 } -.#{$pre}mtn5_5 { margin-top:-$r5_5 } -.#{$pre}mtn5_75 { margin-top:-$r5_75 } -.#{$pre}mtn7 { margin-top:-$r7 } -.#{$pre}mtn7_25 { margin-top:-$r7_25 } -.#{$pre}mtn7_5 { margin-top:-$r7_5 } -.#{$pre}mtn7_75 { margin-top:-$r7_75 } - -// right ._mr0 -.#{$pre}mr0 { margin-right:$r0 } -.#{$pre}mr0_05 { margin-right:$r0_05 } -.#{$pre}mr0_1 { margin-right:$r0_1 } -.#{$pre}mr0_25 { margin-right:$r0_25 } -.#{$pre}mr0_5 { margin-right:$r0_5 } -.#{$pre}mr0_75 { margin-right:$r0_75 } -.#{$pre}mr1 { margin-right:$r1 } -.#{$pre}mr1_25 { margin-right:$r1_25 } -.#{$pre}mr1_5 { margin-right:$r1_5 } -.#{$pre}mr1_75 { margin-right:$r1_75 } -.#{$pre}mr2 { margin-right:$r2 } -.#{$pre}mr2_25 { margin-right:$r2_25 } -.#{$pre}mr2_5 { margin-right:$r2_5 } -.#{$pre}mr2_75 { margin-right:$r2_75 } -.#{$pre}mr3 { margin-right:$r3 } -.#{$pre}mr3_25 { margin-right:$r3_25 } -.#{$pre}mr3_5 { margin-right:$r3_5 } -.#{$pre}mr3_75 { margin-right:$r3_75 } -.#{$pre}mr4 { margin-right:$r4 } -.#{$pre}mr4_25 { margin-right:$r4_25 } -.#{$pre}mr4_5 { margin-right:$r4_5 } -.#{$pre}mr4_75 { margin-right:$r4_75 } -.#{$pre}mr5 { margin-right:$r5 } -.#{$pre}mr5_25 { margin-right:$r5_25 } -.#{$pre}mr5_5 { margin-right:$r5_5 } -.#{$pre}mr5_75 { margin-right:$r5_75 } -.#{$pre}mr6 { margin-right:$r6 } -.#{$pre}mr6_25 { margin-right:$r6_25 } -.#{$pre}mr6_5 { margin-right:$r6_5 } -.#{$pre}mr6_75 { margin-right:$r6_75 } -.#{$pre}mr7 { margin-right:$r7 } -.#{$pre}mr7_25 { margin-right:$r7_25 } -.#{$pre}mr7_5 { margin-right:$r7_5 } -.#{$pre}mr7_75 { margin-right:$r7_75 } -// -.#{$pre}mrn0_05 { margin-right:-$r0_05 } -.#{$pre}mrn0_1 { margin-right:-$r0_1 } -.#{$pre}mrn0_25 { margin-right:-$r0_25 } -.#{$pre}mrn0_5 { margin-right:-$r0_5 } -.#{$pre}mrn0_75 { margin-right:-$r0_75 } -.#{$pre}mrn1 { margin-right:-$r1 } -.#{$pre}mrn1_25 { margin-right:-$r1_25 } -.#{$pre}mrn1_5 { margin-right:-$r1_5 } -.#{$pre}mrn1_75 { margin-right:-$r1_75 } -.#{$pre}mrn2 { margin-right:-$r2 } -.#{$pre}mrn2_25 { margin-right:-$r2_25 } -.#{$pre}mrn2_5 { margin-right:-$r2_5 } -.#{$pre}mrn2_75 { margin-right:-$r2_75 } -.#{$pre}mrn3 { margin-right:-$r3 } -.#{$pre}mrn3_25 { margin-right:-$r3_25 } -.#{$pre}mrn3_5 { margin-right:-$r3_5 } -.#{$pre}mrn3_75 { margin-right:-$r3_75 } -.#{$pre}mrn4 { margin-right:-$r4 } -.#{$pre}mrn4_25 { margin-right:-$r4_25 } -.#{$pre}mrn4_5 { margin-right:-$r4_5 } -.#{$pre}mrn4_75 { margin-right:-$r4_75 } -.#{$pre}mrn6 { margin-right:-$r6 } -.#{$pre}mrn6_25 { margin-right:-$r6_25 } -.#{$pre}mrn6_5 { margin-right:-$r6_5 } -.#{$pre}mrn6_75 { margin-right:-$r6_75 } -.#{$pre}mrn7 { margin-right:-$r7 } -.#{$pre}mrn7_25 { margin-right:-$r7_25 } -.#{$pre}mrn7_5 { margin-right:-$r7_5 } -.#{$pre}mrn7_75 { margin-right:-$r7_75 } - -// bottom ._mb0 -.#{$pre}mb0 { margin-bottom:$r0 } -.#{$pre}mb0_05 { margin-bottom:$r0_05 } -.#{$pre}mb0_1 { margin-bottom:$r0_1 } -.#{$pre}mb0_25 { margin-bottom:$r0_25 } -.#{$pre}mb0_5 { margin-bottom:$r0_5 } -.#{$pre}mb0_75 { margin-bottom:$r0_75 } -.#{$pre}mb1 { margin-bottom:$r1 } -.#{$pre}mb1_25 { margin-bottom:$r1_25 } -.#{$pre}mb1_5 { margin-bottom:$r1_5 } -.#{$pre}mb1_75 { margin-bottom:$r1_75 } -.#{$pre}mb2 { margin-bottom:$r2 } -.#{$pre}mb2_25 { margin-bottom:$r2_25 } -.#{$pre}mb2_5 { margin-bottom:$r2_5 } -.#{$pre}mb2_75 { margin-bottom:$r2_75 } -.#{$pre}mb3 { margin-bottom:$r3 } -.#{$pre}mb3_25 { margin-bottom:$r3_25 } -.#{$pre}mb3_5 { margin-bottom:$r3_5 } -.#{$pre}mb3_75 { margin-bottom:$r3_75 } -.#{$pre}mb4 { margin-bottom:$r4 } -.#{$pre}mb4_25 { margin-bottom:$r4_25 } -.#{$pre}mb4_5 { margin-bottom:$r4_5 } -.#{$pre}mb4_75 { margin-bottom:$r4_75 } -.#{$pre}mb5 { margin-bottom:$r5 } -.#{$pre}mb5_25 { margin-bottom:$r5_25 } -.#{$pre}mb5_5 { margin-bottom:$r5_5 } -.#{$pre}mb5_75 { margin-bottom:$r5_75 } -.#{$pre}mb6 { margin-bottom:$r6 } -.#{$pre}mb6_25 { margin-bottom:$r6_25 } -.#{$pre}mb6_5 { margin-bottom:$r6_5 } -.#{$pre}mb6_75 { margin-bottom:$r6_75 } -.#{$pre}mb7 { margin-bottom:$r7 } -.#{$pre}mb7_25 { margin-bottom:$r7_25 } -.#{$pre}mb7_5 { margin-bottom:$r7_5 } -.#{$pre}mb7_75 { margin-bottom:$r7_75 } - -.#{$pre}mbn0_05 { margin-bottom:-$r0_05 } -.#{$pre}mbn0_1 { margin-bottom:-$r0_1 } -.#{$pre}mbn0_25 { margin-bottom:-$r0_25 } -.#{$pre}mbn0_5 { margin-bottom:-$r0_5 } -.#{$pre}mbn0_75 { margin-bottom:-$r0_75 } -.#{$pre}mbn1 { margin-bottom:-$r1 } -.#{$pre}mbn1_25 { margin-bottom:-$r1_25 } -.#{$pre}mbn1_5 { margin-bottom:-$r1_5 } -.#{$pre}mbn1_75 { margin-bottom:-$r1_75 } -.#{$pre}mbn2 { margin-bottom:-$r2 } -.#{$pre}mbn2_25 { margin-bottom:-$r2_25 } -.#{$pre}mbn2_5 { margin-bottom:-$r2_5 } -.#{$pre}mbn2_75 { margin-bottom:-$r2_75 } -.#{$pre}mbn3 { margin-bottom:-$r3 } -.#{$pre}mbn3_25 { margin-bottom:-$r3_25 } -.#{$pre}mbn3_5 { margin-bottom:-$r3_5 } -.#{$pre}mbn3_75 { margin-bottom:-$r3_75 } -.#{$pre}mbn4 { margin-bottom:-$r4 } -.#{$pre}mbn4_25 { margin-bottom:-$r4_25 } -.#{$pre}mbn4_5 { margin-bottom:-$r4_5 } -.#{$pre}mbn4_75 { margin-bottom:-$r4_75 } -.#{$pre}mbn5 { margin-bottom:-$r5 } -.#{$pre}mbn5_25 { margin-bottom:-$r5_25 } -.#{$pre}mbn5_5 { margin-bottom:-$r5_5 } -.#{$pre}mbn5_75 { margin-bottom:-$r5_75 } -.#{$pre}mbn6 { margin-bottom:-$r6 } -.#{$pre}mbn6_25 { margin-bottom:-$r6_25 } -.#{$pre}mbn6_5 { margin-bottom:-$r6_5 } -.#{$pre}mbn6_75 { margin-bottom:-$r6_75 } -.#{$pre}mbn7 { margin-bottom:-$r7 } -.#{$pre}mbn7_25 { margin-bottom:-$r7_25 } -.#{$pre}mbn7_5 { margin-bottom:-$r7_5 } -.#{$pre}mbn7_75 { margin-bottom:-$r7_75 } - -// left -.#{$pre}ml0 { margin-left:$r0 } -.#{$pre}ml0_05 { margin-left:$r0_05 } -.#{$pre}ml0_1 { margin-left:$r0_1 } -.#{$pre}ml0_25 { margin-left:$r0_25 } -.#{$pre}ml0_5 { margin-left:$r0_5 } -.#{$pre}ml0_75 { margin-left:$r0_75 } -.#{$pre}ml1 { margin-left:$r1 } -.#{$pre}ml1_25 { margin-left:$r1_25 } -.#{$pre}ml1_5 { margin-left:$r1_5 } -.#{$pre}ml1_75 { margin-left:$r1_75 } -.#{$pre}ml2 { margin-left:$r2 } -.#{$pre}ml2_25 { margin-left:$r2_25 } -.#{$pre}ml2_5 { margin-left:$r2_5 } -.#{$pre}ml2_75 { margin-left:$r2_75 } -.#{$pre}ml3 { margin-left:$r3 } -.#{$pre}ml3_25 { margin-left:$r3_25 } -.#{$pre}ml3_5 { margin-left:$r3_5 } -.#{$pre}ml3_75 { margin-left:$r3_75 } -.#{$pre}ml4 { margin-left:$r4 } -.#{$pre}ml4_25 { margin-left:$r4_25 } -.#{$pre}ml4_5 { margin-left:$r4_5 } -.#{$pre}ml4_75 { margin-left:$r4_75 } -.#{$pre}ml5 { margin-left:$r5 } -.#{$pre}ml5_25 { margin-left:$r5_25 } -.#{$pre}ml5_5 { margin-left:$r5_5 } -.#{$pre}ml5_75 { margin-left:$r5_75 } -.#{$pre}ml6 { margin-left:$r6 } -.#{$pre}ml6_25 { margin-left:$r6_25 } -.#{$pre}ml6_5 { margin-left:$r6_5 } -.#{$pre}ml6_75 { margin-left:$r6_75 } -.#{$pre}ml7 { margin-left:$r7 } -.#{$pre}ml7_25 { margin-left:$r7_25 } -.#{$pre}ml7_5 { margin-left:$r7_5 } -.#{$pre}ml7_75 { margin-left:$r7_75 } - -.#{$pre}mln0_05 { margin-left:-$r0_05 } -.#{$pre}mln0_1 { margin-left:-$r0_1 } -.#{$pre}mln0_25 { margin-left:-$r0_25 } -.#{$pre}mln0_5 { margin-left:-$r0_5 } -.#{$pre}mln0_75 { margin-left:-$r0_75 } -.#{$pre}mln1 { margin-left:-$r1 } -.#{$pre}mln1_25 { margin-left:-$r1_25 } -.#{$pre}mln1_5 { margin-left:-$r1_5 } -.#{$pre}mln1_75 { margin-left:-$r1_75 } -.#{$pre}mln2 { margin-left:-$r2 } -.#{$pre}mln2_25 { margin-left:-$r2_25 } -.#{$pre}mln2_5 { margin-left:-$r2_5 } -.#{$pre}mln2_75 { margin-left:-$r2_75 } -.#{$pre}mln3 { margin-left:-$r3 } -.#{$pre}mln3_25 { margin-left:-$r3_25 } -.#{$pre}mln3_5 { margin-left:-$r3_5 } -.#{$pre}mln3_75 { margin-left:-$r3_75 } -.#{$pre}mln4 { margin-left:-$r4 } -.#{$pre}mln4_25 { margin-left:-$r4_25 } -.#{$pre}mln4_5 { margin-left:-$r4_5 } -.#{$pre}mln4_75 { margin-left:-$r4_75 } -.#{$pre}mln5 { margin-left:-$r5 } -.#{$pre}mln5_25 { margin-left:-$r5_25 } -.#{$pre}mln5_5 { margin-left:-$r5_5 } -.#{$pre}mln5_75 { margin-left:-$r5_75 } -.#{$pre}mln6 { margin-left:-$r6 } -.#{$pre}mln6_25 { margin-left:-$r6_25 } -.#{$pre}mln6_5 { margin-left:-$r6_5 } -.#{$pre}mln6_75 { margin-left:-$r6_75 } -.#{$pre}mln7 { margin-left:-$r7 } -.#{$pre}mln7_25 { margin-left:-$r7_25 } -.#{$pre}mln7_5 { margin-left:-$r7_5 } -.#{$pre}mln7_75 { margin-left:-$r7_75 } - -.#{$pre}mln5p { margin-left:-5% } - -// ### Typography ### -.#{$pre}no-wrap { white-space: nowrap } -.#{$pre}break-word { word-break: break-word } -.#{$pre}caps { text-transform: uppercase } - -.#{$pre}strong { font-weight:bold } - -.#{$pre}italic { font-style: italic } - -.#{$pre}fs0 { font-size:$r0 } -.#{$pre}fs0_9 { font-size:$r0_9 } -.#{$pre}h5 { font-size:$r1 } -.#{$pre}h5_1 { font-size:$r1_1 } -.#{$pre}h5_2 { font-size:$r1_2 } -.#{$pre}h5_3 { font-size:$r1_3 } -.#{$pre}h5_4 { font-size:$r1_4 } -.#{$pre}h5_5 { font-size:$r1_5 } -.#{$pre}h5_6 { font-size:$r1_6 } -.#{$pre}h5_7 { font-size:$r1_7 } -.#{$pre}h5_8 { font-size:$r1_8 } -.#{$pre}h5_9 { font-size:$r1_9 } -.#{$pre}h4 { font-size:$r2 } -.#{$pre}h4_5 { font-size:$r2_5 } -.#{$pre}fs3_5 { font-size:$r3_5 } - -// ### Misc ### - -.#{$pre}open { - max-height: 100%; -} From c3d527fb3a1559d560598da35ad821addb589868 Mon Sep 17 00:00:00 2001 From: Lachlan Campbell Date: Fri, 15 May 2015 08:14:58 -0400 Subject: [PATCH 23/28] Cleanup for Hound --- app/assets/javascripts/lib/bootstrap-lightbox.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/lib/bootstrap-lightbox.js b/app/assets/javascripts/lib/bootstrap-lightbox.js index 39d28c48d..749aff30d 100755 --- a/app/assets/javascripts/lib/bootstrap-lightbox.js +++ b/app/assets/javascripts/lib/bootstrap-lightbox.js @@ -100,7 +100,7 @@ .attr('aria-hidden', true) .off('click.dismiss.lightbox'); - $.support.transition && this.$element.hasClass('muted') ? + $.support.transition && this.$element.hasClass("muted") ? this.$element .one($.support.transition.end, $.proxy(this.hideModal(slide), this)) .emulateTransitionEnd(300) : @@ -150,13 +150,12 @@ Lightbox.prototype.backdrop = function (callback) { var that = this - var animate = this.$element.hasClass('muted') ? 'muted' : '' + var animate = this.$element.hasClass("muted") ? "muted" : ""; if (this.isShown && this.options.backdrop) { var doAnimate = $.support.transition && animate; - this.$backdrop = $('
                                          ') - .appendTo(document.body); + this.$backdrop = $("
                                          ").appendTo(document.body); this.$element.on('click.dismiss.lightbox', $.proxy(function (e) { From 80fc03028ee5103c015bc23f3c016bf91f417d97 Mon Sep 17 00:00:00 2001 From: Lachlan Campbell Date: Fri, 15 May 2015 08:17:23 -0400 Subject: [PATCH 24/28] Clean up whitespace on lightbox js --- .../javascripts/lib/bootstrap-lightbox.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/lib/bootstrap-lightbox.js b/app/assets/javascripts/lib/bootstrap-lightbox.js index 749aff30d..fe95bd6ef 100755 --- a/app/assets/javascripts/lib/bootstrap-lightbox.js +++ b/app/assets/javascripts/lib/bootstrap-lightbox.js @@ -41,22 +41,18 @@ // This bit is added since we don't display until we have the size // which prevents image jumping - this.preloadSize(function() - { - that.backdrop(function () - { - var transition = $.support.transition && that.$element.hasClass('muted'); + this.preloadSize(function() { + that.backdrop(function () { + var transition = $.support.transition && that.$element.hasClass("muted"); - if (!that.$element.parent().length) - { - that.$element.appendTo(document.body); // don't move modals dom position + if (!that.$element.parent().length) { + that.$element.appendTo(document.body); // don't move modals dom position } that.$element.show(); - if (transition) - { - that.$element[0].offsetWidth; // force reflow + if (transition) { + that.$element[0].offsetWidth; // force reflow } that.$element From cbeb49409a61017c88651786cf65ef45c35fa3d2 Mon Sep 17 00:00:00 2001 From: lachlanjc Date: Tue, 26 May 2015 17:45:53 -0400 Subject: [PATCH 25/28] =?UTF-8?q?=F0=9F=9A=9A=F0=9F=92=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/admin/admin_withholding.js.jsx | 31 ++ .../javascripts/components/bounty.js.jsx | 3 + .../components/bounty_breakdown.js.jsx | 184 ++++++----- .../components/bounty_valuation.js.jsx | 4 +- .../javascripts/components/chat_entry.js.jsx | 4 +- .../components/custom_bounty_offer.js.jsx | 296 +++++++++--------- .../dashboard/dashboard_index.js.jsx | 3 + .../javascripts/components/form_group.js.jsx | 2 +- .../components/ideas/idea_form.js.jsx | 11 +- .../components/invite_bounty_form.js.jsx | 2 +- .../news_feed/news_feed_item.js.jsx | 2 +- ...news_feed_item_bounty_timeline_item.js.jsx | 8 +- .../news_feed/news_feed_item_comments.js.jsx | 15 +- .../components/pages/badge_page.js.jsx | 2 +- .../components/pagination_links.js.jsx | 4 +- .../components/products/product_bounty.js.jsx | 22 +- .../components/products/video.js.jsx | 2 +- .../components/signup/signup_form.js.jsx | 2 +- .../javascripts/components/start_page.js.jsx | 2 +- .../javascripts/components/update.js.jsx | 2 +- .../user/profile_bounties_awarded.js.jsx | 2 +- .../components/vote_bounty_offer.js.jsx | 3 +- app/assets/javascripts/constants/index.js | 1 + .../javascripts/routes/products_handlers.js | 6 + app/assets/javascripts/stores/bounty_store.js | 6 + .../stylesheets/app/components/callout.scss | 8 - .../stylesheets/app/components/card.scss | 25 -- .../stylesheets/app/components/chat.scss | 17 - .../stylesheets/app/components/counter.scss | 4 - .../app/components/deprecated_card.scss | 2 +- .../stylesheets/app/components/dropdown.scss | 4 - .../stylesheets/app/components/forms.scss | 12 +- .../{search_result.scss => highlight.scss} | 2 +- .../stylesheets/app/components/icons.scss | 6 +- .../stylesheets/app/components/marker.scss | 34 -- .../stylesheets/app/components/media.scss | 1 + .../components/{page.scss => page_alert.scss} | 10 - .../app/components/page_header.scss | 9 - .../stylesheets/components/_page_header.scss | 2 +- app/assets/stylesheets/vars/_base.scss | 4 +- .../admin/withdrawals_controller.rb | 10 +- app/controllers/posts_controller.rb | 4 +- app/controllers/tasks_controller.rb | 7 +- app/mailers/base_mailer.rb | 4 + app/mailers/comment_mailer.rb | 16 +- app/models/email_campaigns/hearts_received.rb | 3 +- app/models/invite.rb | 1 + app/models/stream_events/allocate_task.rb | 2 +- app/models/stream_events/close_discussion.rb | 2 +- app/models/stream_events/close_task.rb | 2 +- app/models/stream_events/create_comment.rb | 2 +- app/models/stream_events/create_discussion.rb | 2 +- app/models/stream_events/create_product.rb | 2 +- app/models/stream_events/create_task.rb | 2 +- app/models/stream_events/demote_task.rb | 2 +- .../stream_events/promote_discussion.rb | 2 +- app/models/stream_events/promote_task.rb | 2 +- app/models/stream_events/reviewable_task.rb | 2 +- app/models/stream_events/win_win.rb | 2 +- app/models/stream_events/work_code_added.rb | 2 +- app/models/stream_events/work_copy_added.rb | 2 +- .../stream_events/work_design_deliverable.rb | 2 +- app/models/stream_events/work_work.rb | 2 +- app/models/user/withdrawal.rb | 8 +- app/models/wip_contracts.rb | 2 +- app/serializers/app_serializer.rb | 2 +- app/serializers/product_serializer.rb | 2 +- .../activities/create_contract.mustache | 2 +- .../create_core_team_membership.mustache | 2 +- .../activities/destroy_contract.mustache | 2 +- .../activities/found_product.mustache | 2 +- app/templates/activities/git_push.mustache | 2 +- app/templates/activities/introduce.mustache | 2 +- app/templates/activities/launch.mustache | 2 +- .../activities/update_contract.mustache | 2 +- app/templates/events/closes/_close.mustache | 2 +- .../events/code_addeds/_code_added.mustache | 2 +- .../_comment_reference.mustache | 2 +- .../events/comments/_comment.mustache | 8 +- .../_commit_reference.mustache | 2 +- .../events/copy_addeds/_copy_added.mustache | 10 +- .../events/demotions/_demotion.mustache | 6 +- .../_design_deliverable.mustache | 6 +- .../events/promotions/_promotion.mustache | 6 +- .../_pull_request_reference.mustache | 2 +- .../events/rejections/_rejection.mustache | 2 +- app/templates/events/reopens/_reopen.mustache | 2 +- .../review_readies/_review_ready.mustache | 2 +- .../title_changes/_title_change.mustache | 2 +- .../events/type_changes/_type_change.mustache | 2 +- app/templates/events/wins/_win.mustache | 2 +- app/views/admin/withdrawals/index.html.erb | 3 +- app/views/layouts/admin.html.erb | 2 +- app/views/layouts/product.html.erb | 2 +- app/views/pages/about.html.erb | 2 +- app/views/pages/tos.html.erb | 4 +- app/views/payments/index.html.erb | 2 +- app/views/playground/product_stage_1.html.erb | 16 +- app/views/posts/edit.html.erb | 6 +- app/views/products/edit.html.erb | 24 +- app/views/projects/_header.html.erb | 6 +- app/views/projects/_project.html.erb | 2 +- app/views/projects/edit.html.erb | 4 +- app/views/projects/new.html.erb | 4 +- app/views/repositories/index.html.erb | 4 +- app/views/resources/index.html.erb | 4 +- .../unread_mailer/unread_content.html.erb | 5 +- .../user/withdrawals/_withdrawal.html.erb | 4 +- app/views/users/_assets.html.erb | 2 +- app/views/users/_card.html.erb | 4 +- app/views/users/_karma.html.erb | 2 +- app/views/users/assets.html.erb | 2 +- app/views/users/balances/show.html.erb | 6 +- app/views/users/karma.html | 2 +- app/views/users/passwords/new.html.erb | 2 +- .../payment_options/_bitcoin_fields.html.erb | 2 +- app/views/users/payment_options/show.html.erb | 6 +- app/views/users/registrations/new.html.erb | 8 +- app/views/users/sessions/new.html.erb | 2 +- app/views/users/show.html.erb | 2 +- .../users/tax_infos/_w8ben_fields.html.erb | 20 +- app/views/users/tax_infos/_w9_fields.html.erb | 12 +- app/views/users/tax_infos/show.html.erb | 6 +- app/views/wips/edit.html.erb | 4 +- app/views/wips/new.html.erb | 4 +- app/workers/delete_user_account.rb | 7 +- config/routes.rb | 3 +- lib/mailgun/rails.rb | 3 +- 128 files changed, 538 insertions(+), 579 deletions(-) create mode 100644 app/assets/javascripts/components/admin/admin_withholding.js.jsx delete mode 100644 app/assets/stylesheets/app/components/callout.scss delete mode 100644 app/assets/stylesheets/app/components/card.scss delete mode 100644 app/assets/stylesheets/app/components/counter.scss rename app/assets/stylesheets/app/components/{search_result.scss => highlight.scss} (96%) rename app/assets/stylesheets/app/components/{page.scss => page_alert.scss} (50%) delete mode 100644 app/assets/stylesheets/app/components/page_header.scss diff --git a/app/assets/javascripts/components/admin/admin_withholding.js.jsx b/app/assets/javascripts/components/admin/admin_withholding.js.jsx new file mode 100644 index 000000000..3ecfaaaf0 --- /dev/null +++ b/app/assets/javascripts/components/admin/admin_withholding.js.jsx @@ -0,0 +1,31 @@ +var AdminWithholding = React.createClass({ + render() { + return ( + + Adjust withholding + + ) + }, + + handleClick() { + var amount = prompt('New withholding amount', this.props.amount_withheld / 100) + if (amount) { + $.ajax({ + type: "PATCH", + url: `/admin/withdrawals/${this.props.id}`, + dataType: 'json', + data: { + amount_withheld: amount + }, + success: this.amountUpdated + }) + } + }, + + amountUpdated() { + window.location.reload() + return true + } +}) + +module.exports = window.AdminWithholding = AdminWithholding diff --git a/app/assets/javascripts/components/bounty.js.jsx b/app/assets/javascripts/components/bounty.js.jsx index cd9956984..778b3120f 100644 --- a/app/assets/javascripts/components/bounty.js.jsx +++ b/app/assets/javascripts/components/bounty.js.jsx @@ -107,6 +107,9 @@ let Bounty = React.createClass({ }, getBounty() { + if (!this.isMounted()) { + return + } let bounty = BountyStore.getBounty(); this.setState({ diff --git a/app/assets/javascripts/components/bounty_breakdown.js.jsx b/app/assets/javascripts/components/bounty_breakdown.js.jsx index ead52b88d..5a56de918 100644 --- a/app/assets/javascripts/components/bounty_breakdown.js.jsx +++ b/app/assets/javascripts/components/bounty_breakdown.js.jsx @@ -1,106 +1,100 @@ -(function() { - var Lightbox = require('./lightbox.js.jsx') - var SimpleBountyOffer = require('./simple_bounty_offer.js.jsx') - var UserStore = require('../stores/user_store') - - var BountyBreakdown = React.createClass({ - mixins: [React.addons.LinkedStateMixin], - - getInitialState: function() { - return { - offers: this.props.offers, - offer: this.props.steps[2], - currentUser: UserStore.getUser() - }; - }, - - render: function() { - return ( - -
                                          - - - Close - - -
                                          - How many coins is this bounty worth? -
                                          +'use strict'; + +var Lightbox = require('./lightbox.js.jsx') +var SimpleBountyOffer = require('./simple_bounty_offer.js.jsx') +var UserStore = require('../stores/user_store') + +var BountyBreakdown = React.createClass({ + mixins: [React.addons.LinkedStateMixin], + + getInitialState: function() { + return { + offers: this.props.offers, + offer: this.props.steps[2], + currentUser: UserStore.getUser() + }; + }, + + render: function() { + return ( + +
                                          + + + Close + + +
                                          + How many coins is this bounty worth?
                                          +
                                          -
                                          - {this.state.currentUser ? this.renderNewOffer() : null} -
                                          +
                                          + {this.state.currentUser ? this.renderNewOffer() : null} +
                                          - {this.state.currentUser ? this.renderActions() : null} -                                           - ) - }, + {this.state.currentUser ? this.renderActions() : null} + + ) + }, - componentDidMount: function() { - var modal = $(this.getDOMNode()).modal({ show: true }) - modal.on('hidden.bs.modal', this.props.onHidden) + componentDidMount: function() { + var modal = $(this.getDOMNode()).modal({ show: true }) + modal.on('hidden.bs.modal', this.props.onHidden) - var product = app.currentAnalyticsProduct(); + var product = app.currentAnalyticsProduct(); + + if (product) { + analytics.track('bounty.valuation.view', { product: app.currentAnalyticsProduct().get('product_slug') }); + } else { + analytics.track('bounty.valuation.view'); + } + }, + + renderNewOffer: function() { + return ; + }, + + renderActions: function() { + return
                                          +
                                          + + {' '} + {numeral(this.state.offer).format('0,0')} +
                                          - if (product) { - analytics.track('bounty.valuation.view', { product: app.currentAnalyticsProduct().get('product_slug') }); - } else { - analytics.track('bounty.valuation.view'); + +
                                          + }, + + handleOfferChanged: function(event) { + this.setState({ + offer: event.target.value + }) + }, + + handleOfferClicked: function() { + window.xhr.post( + this.props.offers_url, + { earnable: this.state.offer }, + function(data) { + window.location.reload() } - }, - - renderNewOffer: function() { - return VoteBountyOffer( - _.extend({}, this.props, { - onChange: this.handleOfferChanged, - user: this.state.currentUser - }) - ); - }, - - renderActions: function() { - return
                                          -
                                          - - {' '} - {numeral(this.state.offer).format('0,0')} -
                                          + ) - -
                                          - }, - - handleOfferChanged: function(event) { - this.setState({ - offer: event.target.value - }) - }, - - handleOfferClicked: function() { - window.xhr.post( - this.props.offers_url, - { earnable: this.state.offer }, - function(data) { - window.location.reload() - } - ) - - return false - }, - - handleShowDetailsClicked: function() { - this.setState({ - showingDetails: !this.state.showingDetails - }) - - return false - } - }); + return false + }, + + handleShowDetailsClicked: function() { + this.setState({ + showingDetails: !this.state.showingDetails + }) - if (typeof module !== 'undefined') { - module.exports = BountyBreakdown; + return false } +}); - window.BountyBreakdown = BountyBreakdown; -})(); +module.exports = window.BountyBreakdown = BountyBreakdown; diff --git a/app/assets/javascripts/components/bounty_valuation.js.jsx b/app/assets/javascripts/components/bounty_valuation.js.jsx index 3ff4a141b..b67f598ba 100644 --- a/app/assets/javascripts/components/bounty_valuation.js.jsx +++ b/app/assets/javascripts/components/bounty_valuation.js.jsx @@ -24,7 +24,9 @@ var BountyValuation = React.createClass({ renderLightbox: function() { if (this.state.shown) { - return + return } }, diff --git a/app/assets/javascripts/components/chat_entry.js.jsx b/app/assets/javascripts/components/chat_entry.js.jsx index e6c1252c9..9419b6d75 100644 --- a/app/assets/javascripts/components/chat_entry.js.jsx +++ b/app/assets/javascripts/components/chat_entry.js.jsx @@ -30,13 +30,13 @@
                                          • - + Permalink
                                          • - + Create bounty
                                            • diff --git a/app/assets/javascripts/components/custom_bounty_offer.js.jsx b/app/assets/javascripts/components/custom_bounty_offer.js.jsx index 76e120b4d..424cfaad1 100644 --- a/app/assets/javascripts/components/custom_bounty_offer.js.jsx +++ b/app/assets/javascripts/components/custom_bounty_offer.js.jsx @@ -1,164 +1,166 @@ -(function() { - var CustomBountyOffer = React.createClass({ - getInitialState: function() { - var value = this.props.steps[2] - - if(this.props.onChange) { - this.props.onChange({ target: { value: value }}) - } - - return { - value: value - } - }, - - renderOwnership: function() { - var value = this.state.value - var ownership = value / (value + this.props.coinsMinted) * 100; - - if(ownership < 0.001) { - return "< 0.001%" - } else if(ownership < 1) { - var roundedOwnership = Math.floor(ownership * 1000) / 1000 - return roundedOwnership + "%" - } else if(ownership < 10) { - var roundedOwnership = Math.floor(ownership * 100) / 100 - return roundedOwnership + "%" - } else { - var roundedOwnership = Math.floor(ownership) - return roundedOwnership + "%" - } - }, - - renderSellingPrice: function() { - var value = this.state.value - var ownership = value / (value + this.props.coinsMinted); - - var sellingPrice = Math.round(ownership * 1000000); - - return "$" + sellingPrice - }, - - renderPayout: function() { - var value = this.state.value - var ownership = value / (value + this.props.coinsMinted); - - var profitLastMonth = Math.round(this.props.profitLastMonth / 100) - var payout = Math.round(ownership * (profitLastMonth || 20000)); - - return "$" + payout - }, - - renderProfitLastMonth: function() { - var profitLastMonth = Math.round(this.props.profitLastMonth / 100) - - if(profitLastMonth) { - return "each month out
                                            of $" + profitLastMonth + "/mo" - } else { - return "each month if you
                                            made $20,000/mo" - } - }, - - renderAverage: function() { - var average = this.state.value / this.props.averageBounty - - if(average < 0.001) { - return "< 0.001x" - } else if(average < 1) { - var roundedAverage = Math.floor(average * 1000) / 1000 - return roundedAverage + 'x' - } else if(average < 10) { - var roundedAverage = Math.floor(average * 100) / 100 - return roundedAverage + 'x' - } else { - var roundedAverage = Math.floor(average) - return roundedAverage + 'x' - } - }, - - renderStats: function() { - if(this.props.profitLastMonth) { - return( -
                                            -
                                            -
                                            - {this.renderOwnership()} -
                                            -
                                            - ownership
                                            - in {this.props.product.name} -
                                            + +var CustomBountyOffer = React.createClass({ + propTypes: { + product: React.PropTypes.shape({ + average_bounty: React.PropTypes.number.isRequired, + coins_minted: React.PropTypes.number.isRequired + }) + }, + + getInitialState: function() { + var value = this.props.steps[2] + + if (this.props.onChange) { + this.props.onChange({ target: { value: value }}) + } + + return { + value: value + } + }, + + renderOwnership: function() { + var value = this.state.value + var ownership = value / (value + this.props.product.coins_minted) * 100; + + if (ownership < 0.001) { + return "< 0.001%" + } else if(ownership < 1) { + var roundedOwnership = Math.floor(ownership * 1000) / 1000 + return roundedOwnership + "%" + } else if(ownership < 10) { + var roundedOwnership = Math.floor(ownership * 100) / 100 + return roundedOwnership + "%" + } else { + var roundedOwnership = Math.floor(ownership) + return roundedOwnership + "%" + } + }, + + renderSellingPrice: function() { + var value = this.state.value + var ownership = value / (value + this.props.coinsMinted); + + var sellingPrice = Math.round(ownership * 1000000); + + return "$" + sellingPrice + }, + + renderPayout: function() { + var value = this.state.value + var ownership = value / (value + this.props.coinsMinted); + + var profitLastMonth = Math.round(this.props.profitLastMonth / 100) + var payout = Math.round(ownership * (profitLastMonth || 20000)); + + return "$" + payout + }, + + renderProfitLastMonth: function() { + var profitLastMonth = Math.round(this.props.profitLastMonth / 100) + + if(profitLastMonth) { + return "each month out
                                            of $" + profitLastMonth + "/mo" + } else { + return "each month if you
                                            made $20,000/mo" + } + }, + + renderAverage: function() { + var average = this.state.value / this.props.product.average_bounty + + if(average < 0.001) { + return "< 0.001x" + } else if(average < 1) { + var roundedAverage = Math.floor(average * 1000) / 1000 + return roundedAverage + 'x' + } else if(average < 10) { + var roundedAverage = Math.floor(average * 100) / 100 + return roundedAverage + 'x' + } else { + var roundedAverage = Math.floor(average) + return roundedAverage + 'x' + } + }, + + renderStats: function() { + if(this.props.profitLastMonth) { + return( +
                                            +
                                            +
                                            + {this.renderOwnership()}
                                            -
                                            -
                                            - {this.renderPayout()} -
                                            -
                                            +
                                            + ownership
                                            + in {this.props.product.name}
                                            -
                                            -
                                            - {this.renderSellingPrice()} -
                                            -
                                            - if {this.props.product.name} was
                                            sold for $1 million -
                                            +
                                            +
                                            +
                                            + {this.renderPayout()}
                                            +
                                            - ) - } else { - return( -
                                            -
                                            -
                                            - {this.renderOwnership()} -
                                            -
                                            - ownership in {this.props.product.name} -
                                            +
                                            +
                                            + {this.renderSellingPrice()}
                                            -
                                            -
                                            - {this.renderAverage()} -
                                            -
                                            - the average {this.props.product.name} bounty -
                                            +
                                            + if {this.props.product.name} was
                                            sold for $1 million
                                            - ) - } - }, - - render: function() { - return ( -
                                            -
                                            -
                                            - - +
                                            + ) + } else { + return( +
                                            +
                                            +
                                            + {this.renderOwnership()} +
                                            +
                                            + ownership in {this.props.product.name}
                                            -
                                            - {this.renderStats()} +
                                            +
                                            + {this.renderAverage()} +
                                            +
                                            + the average {this.props.product.name} bounty +
                                            ) - }, + } + }, + + render: function() { + return ( +
                                            +
                                            +
                                            + + +
                                            +
                                            +
                                            + {this.renderStats()} +
                                            +
                                            + ) + }, - handleOfferChange: function(e) { - this.setState({ - value: parseInt(e.target.value.replace(/[^\d]/g, '')) || 0 - }) + handleOfferChange: function(e) { + this.setState({ + value: parseInt(e.target.value.replace(/[^\d]/g, '')) || 0 + }) - if(this.props.onChange) { - this.props.onChange(e); - } + if(this.props.onChange) { + this.props.onChange(e); } - }); - - if (typeof module !== 'undefined') { - module.exports = CustomBountyOffer; } +}); - window.CustomBountyOffer = CustomBountyOffer; -})(); +module.exports = window.CustomBountyOffer = CustomBountyOffer; diff --git a/app/assets/javascripts/components/dashboard/dashboard_index.js.jsx b/app/assets/javascripts/components/dashboard/dashboard_index.js.jsx index 3f5fd52bf..36754a1d3 100644 --- a/app/assets/javascripts/components/dashboard/dashboard_index.js.jsx +++ b/app/assets/javascripts/components/dashboard/dashboard_index.js.jsx @@ -474,6 +474,9 @@ let DashboardIndex = React.createClass({ }, getStateFromStore: function() { + if (!this.isMounted()) { + return + } let dashboard = DashboardStore.getDashboard() this.setState({ diff --git a/app/assets/javascripts/components/form_group.js.jsx b/app/assets/javascripts/components/form_group.js.jsx index ec2b26051..7aec1c383 100644 --- a/app/assets/javascripts/components/form_group.js.jsx +++ b/app/assets/javascripts/components/form_group.js.jsx @@ -29,7 +29,7 @@ var FormGroup = React.createClass({ }, errorMessage: function() { - return {this.props.error} + return {this.props.error} } }); diff --git a/app/assets/javascripts/components/ideas/idea_form.js.jsx b/app/assets/javascripts/components/ideas/idea_form.js.jsx index 89c9192eb..f95c8c185 100644 --- a/app/assets/javascripts/components/ideas/idea_form.js.jsx +++ b/app/assets/javascripts/components/ideas/idea_form.js.jsx @@ -43,7 +43,8 @@ let NewIdeaForm = React.createClass({ ideaBody: idea.raw_body || '', ideaName: idea.name || '', isFounder: true, - showWarning: false + showWarning: false, + buttonValid: true }; }, @@ -70,8 +71,13 @@ let NewIdeaForm = React.createClass({ }); }, + buttonValid() { + return this.state.buttonValid || !_.isEmpty(this.props.initialIdea); + }, + onNextClick(e) { e.preventDefault(); + this.setState({buttonValid: false}); if (_.isEmpty(this.props.initialIdea)) { let idea = { @@ -81,6 +87,7 @@ let NewIdeaForm = React.createClass({ }; IdeaActionCreators.submitIdeaClicked(idea); + } else { let slug = this.props.initialIdea.slug; @@ -130,7 +137,7 @@ let NewIdeaForm = React.createClass({
                                            -
                                            diff --git a/app/assets/javascripts/components/invite_bounty_form.js.jsx b/app/assets/javascripts/components/invite_bounty_form.js.jsx index cce662d56..31a5190f1 100644 --- a/app/assets/javascripts/components/invite_bounty_form.js.jsx +++ b/app/assets/javascripts/components/invite_bounty_form.js.jsx @@ -48,7 +48,7 @@ var FormGroup = require('./form_group.js.jsx'); -

                                            Start off on the right foot; generosity always pays off.

                                            +

                                            Start off on the right foot; generosity always pays off.