From 7c82d96f579ed80458da36f0bf4d33eac6db8b48 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Tue, 8 Nov 2016 21:58:27 -0500 Subject: [PATCH 01/19] add modified gravitons utility classes --- app/styles/_utilities.scss | 85 ++++++++++++++++++++++++++++++++++++++ app/styles/app.scss | 1 + 2 files changed, 86 insertions(+) create mode 100644 app/styles/_utilities.scss diff --git a/app/styles/_utilities.scss b/app/styles/_utilities.scss new file mode 100644 index 0000000000..cb6541c13a --- /dev/null +++ b/app/styles/_utilities.scss @@ -0,0 +1,85 @@ +/* stylelint-disable */ +/* modified gravitons */ +.h0 { font-size:48px } +.h1 { font-size:32px } +.h2 { font-size:24px } +.h3 { font-size:20px } +.h4 { font-size:16px } +.h5 { font-size:14px } +.h6 { font-size:12px } +.m-0 { margin:0 } +.m-1 { margin:8px } +.m-2 { margin:16px } +.m-3 { margin:32px } +.m-4 { margin:64px } +.mt-0 { margin-top:0 } +.mt-1 { margin-top:8px } +.mt-2 { margin-top:16px } +.mt-3 { margin-top:32px } +.mt-4 { margin-top:64px } +.mr-0 { margin-right:0 } +.mr-1 { margin-right:8px } +.mr-2 { margin-right:16px } +.mr-3 { margin-right:32px } +.mr-4 { margin-right:64px } +.mb-0 { margin-bottom:0 } +.mb-1 { margin-bottom:8px } +.mb-2 { margin-bottom:16px } +.mb-3 { margin-bottom:32px } +.mb-4 { margin-bottom:64px } +.ml-0 { margin-left:0 } +.ml-1 { margin-left:8px } +.ml-2 { margin-left:16px } +.ml-3 { margin-left:32px } +.ml-4 { margin-left:64px } +.p-0 { padding:0 } +.p-1 { padding:8px } +.p-2 { padding:16px } +.p-3 { padding:32px } +.p-4 { padding:64px } +.pt-0 { padding-top:0 } +.pt-1 { padding-top:8px } +.pt-2 { padding-top:16px } +.pt-3 { padding-top:32px } +.pt-4 { padding-top:64px } +.pr-0 { padding-right:0 } +.pr-1 { padding-right:8px } +.pr-2 { padding-right:16px } +.pr-3 { padding-right:32px } +.pr-4 { padding-right:64px } +.pb-0 { padding-bottom:0 } +.pb-1 { padding-bottom:8px } +.pb-2 { padding-bottom:16px } +.pb-3 { padding-bottom:32px } +.pb-4 { padding-bottom:64px } +.pl-0 { padding-left:0 } +.pl-1 { padding-left:8px } +.pl-2 { padding-left:16px } +.pl-3 { padding-left:32px } +.pl-4 { padding-left:64px } +.d-block { display:block } +.d-inline-block { display:inline-block } +.d-inline { display:inline } +.d-table { display:table } +.d-table-row { display:table-row } +.d-table-cell { display:table-cell } +.d-flex { display:flex } +.d-inline-flex { display:inline-flex } +.f-left { float:left } +.f-right { float:right } +.o-hidden { overflow:hidden } +.cf:after { content:"";display:block;clear:both } +.x0 { width:0 } +.x1 { width:8.333333333333332% } +.x2 { width:16.666666666666664% } +.x3 { width:25% } +.x4 { width:33.33333333333333% } +.x5 { width:41.66666666666667% } +.x6 { width:50% } +.x7 { width:58.333333333333336% } +.x8 { width:66.66666666666666% } +.x9 { width:75% } +.x10 { width:83.33333333333334% } +.x11 { width:91.66666666666666% } +.x12 { width:100% } +/* stylelint-enable */ diff --git a/app/styles/app.scss b/app/styles/app.scss index 6585e9ac4e..dcb193fed3 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -1,3 +1,4 @@ +@import 'utilities'; @import 'variables_mixins'; @import 'bootstrap'; @import 'bootstrap-theme'; From 7fb4cc3ef13ce67a04fe40b5e42a8a0923afe88b Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 16:10:47 -0500 Subject: [PATCH 02/19] move to vars sheet --- app/styles/_temp_misc.scss | 3 --- app/styles/_variables_mixins.scss | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/styles/_temp_misc.scss b/app/styles/_temp_misc.scss index ef88b17160..136368e548 100644 --- a/app/styles/_temp_misc.scss +++ b/app/styles/_temp_misc.scss @@ -1,6 +1,3 @@ -$table-header-color: rgba($navy_drk2,.7); -$inactive-sort-indicator: rgba($navy_drk2,.3); - .table-header { background-color: $navy_light; color: $table-header-color; diff --git a/app/styles/_variables_mixins.scss b/app/styles/_variables_mixins.scss index 89f0ecee62..fff82cdcf1 100644 --- a/app/styles/_variables_mixins.scss +++ b/app/styles/_variables_mixins.scss @@ -32,6 +32,11 @@ $sidebar_sublink_text: #c2d2e3; $view_sub_nav: #6784a2; $content_border: $blue_lightest; +// from misc + +$table-header-color: rgba($navy_drk2,.7); +$inactive-sort-indicator: rgba($navy_drk2,.3); + // end variables ------------/ From 58e2b2674e9b6284010fb0097ddd2b4718547501 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 16:10:58 -0500 Subject: [PATCH 03/19] extract to tables sheet --- app/styles/_temp_misc.scss | 13 ------------- app/styles/app.scss | 1 + app/styles/components/_tables.scss | 12 ++++++++++++ 3 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 app/styles/components/_tables.scss diff --git a/app/styles/_temp_misc.scss b/app/styles/_temp_misc.scss index 136368e548..99daf3a300 100644 --- a/app/styles/_temp_misc.scss +++ b/app/styles/_temp_misc.scss @@ -1,16 +1,3 @@ -.table-header { - background-color: $navy_light; - color: $table-header-color; - - .sortable-column { - cursor: pointer; - - .inactive { - color: $inactive-sort-indicator; - } - } -} - .twitter-typeahead { width: 100%; diff --git a/app/styles/app.scss b/app/styles/app.scss index dcb193fed3..51030f09ac 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -23,6 +23,7 @@ @import 'components/patient_history'; @import 'components/imaging'; @import 'components/labs'; +@import 'components/tables'; // NOTE: do not place styles in this file // If you have styles to add, put them in diff --git a/app/styles/components/_tables.scss b/app/styles/components/_tables.scss new file mode 100644 index 0000000000..9d527904bc --- /dev/null +++ b/app/styles/components/_tables.scss @@ -0,0 +1,12 @@ +.table-header { + background-color: $navy_light; + color: $table-header-color; + + .sortable-column { + cursor: pointer; + + .inactive { + color: $inactive-sort-indicator; + } + } +} From fd68e3b2b7c5291c5ac5abb6a95f29628e57cb37 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 16:11:54 -0500 Subject: [PATCH 04/19] extract typeahead styles --- app/styles/_temp_misc.scss | 45 --------------------------- app/styles/app.scss | 1 + app/styles/components/_typeahead.scss | 44 ++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 45 deletions(-) create mode 100644 app/styles/components/_typeahead.scss diff --git a/app/styles/_temp_misc.scss b/app/styles/_temp_misc.scss index 99daf3a300..76f674bc3e 100644 --- a/app/styles/_temp_misc.scss +++ b/app/styles/_temp_misc.scss @@ -1,48 +1,3 @@ -.twitter-typeahead { - width: 100%; - - .tt-query, - .tt-hint { margin-bottom: 0; } -} - -.tt-menu { - border: 1px solid rgba(0,0,0,.1); - border-radius: 0 0 3px 3px; - box-shadow: 0 3px 5px rgba(0,0,0,.1); - background-clip: padding-box; - background-color: $white; - padding: 5px 0; - width: 100%; - min-width: 160px; - max-height: 110px; - overflow-y: scroll; - overflow-x: none; - - .query-results { margin-bottom: 0; } -} - -.tt-suggestion { - display: block; - padding: 3px 12px; - - &.tt-is-under-cursor { - background-color: #0081c2; - background-image: linear-gradient(to bottom,#08c,#0077b3); - background-repeat: repeat-x; - color: $white; - - a { color: $white; } - } - - p { margin: 0; } -} - -//Scrollable typeahead -.scrollable-typeahead .tt-menu { - max-height: 200px; - overflow-y: auto; -} - .jumbotron { background-color: #2e4359; diff --git a/app/styles/app.scss b/app/styles/app.scss index 51030f09ac..0c1a21767f 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -24,6 +24,7 @@ @import 'components/imaging'; @import 'components/labs'; @import 'components/tables'; +@import 'components/typeahead'; // NOTE: do not place styles in this file // If you have styles to add, put them in diff --git a/app/styles/components/_typeahead.scss b/app/styles/components/_typeahead.scss new file mode 100644 index 0000000000..68a314adcc --- /dev/null +++ b/app/styles/components/_typeahead.scss @@ -0,0 +1,44 @@ +.twitter-typeahead { + width: 100%; + + .tt-query, + .tt-hint { margin-bottom: 0; } +} + +.tt-menu { + border: 1px solid rgba(0,0,0,.1); + border-radius: 0 0 3px 3px; + box-shadow: 0 3px 5px rgba(0,0,0,.1); + background-clip: padding-box; + background-color: $white; + padding: 5px 0; + width: 100%; + min-width: 160px; + max-height: 110px; + overflow-y: scroll; + overflow-x: none; + + .query-results { margin-bottom: 0; } +} + +.tt-suggestion { + display: block; + padding: 3px 12px; + + &.tt-is-under-cursor { + background-color: #0081c2; + background-image: linear-gradient(to bottom,#08c,#0077b3); + background-repeat: repeat-x; + color: $white; + + a { color: $white; } + } + + p { margin: 0; } +} + +//Scrollable typeahead +.scrollable-typeahead .tt-menu { + max-height: 200px; + overflow-y: auto; +} From 71b86cd0fcdac5a6f4579ebdf5d0b2af16f98fe7 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 16:13:15 -0500 Subject: [PATCH 05/19] reorder components alphabetically --- app/styles/app.scss | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/styles/app.scss b/app/styles/app.scss index 0c1a21767f..d163014d86 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -12,17 +12,16 @@ @import 'loading_notice'; // Components - -@import 'components/sidebar_nav'; -@import 'components/panel'; @import 'components/form_styles'; -@import 'components/tab_nav'; -@import 'components/tab_content'; -@import 'components/pagination'; -@import 'components/patient_summary'; -@import 'components/patient_history'; @import 'components/imaging'; @import 'components/labs'; +@import 'components/pagination'; +@import 'components/panel'; +@import 'components/patient_history'; +@import 'components/patient_summary'; +@import 'components/sidebar_nav'; +@import 'components/tab_content'; +@import 'components/tab_nav'; @import 'components/tables'; @import 'components/typeahead'; From 0e6e9ec3b3526b36755767dd4de7145702243c08 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 16:15:16 -0500 Subject: [PATCH 06/19] move to components dir --- app/styles/app.scss | 2 +- app/styles/{ => components}/_loading_notice.scss | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename app/styles/{ => components}/_loading_notice.scss (100%) diff --git a/app/styles/app.scss b/app/styles/app.scss index d163014d86..5063c40b17 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -9,12 +9,12 @@ @import 'print'; @import 'temp_misc'; @import 'sign_in_screen'; -@import 'loading_notice'; // Components @import 'components/form_styles'; @import 'components/imaging'; @import 'components/labs'; +@import 'components/loading_notice'; @import 'components/pagination'; @import 'components/panel'; @import 'components/patient_history'; diff --git a/app/styles/_loading_notice.scss b/app/styles/components/_loading_notice.scss similarity index 100% rename from app/styles/_loading_notice.scss rename to app/styles/components/_loading_notice.scss From a28e081e9dc8a704d162e0649637bb2551da3291 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 16:15:22 -0500 Subject: [PATCH 07/19] cleanup whitespace --- app/styles/_variables_mixins.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/styles/_variables_mixins.scss b/app/styles/_variables_mixins.scss index fff82cdcf1..5285626e8c 100644 --- a/app/styles/_variables_mixins.scss +++ b/app/styles/_variables_mixins.scss @@ -37,10 +37,8 @@ $content_border: $blue_lightest; $table-header-color: rgba($navy_drk2,.7); $inactive-sort-indicator: rgba($navy_drk2,.3); - // end variables ------------/ - // Mixins // -------------------------------------------/ From bb1a81fdf94839a9c339136cb5bd76d070ce2c92 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 16:16:46 -0500 Subject: [PATCH 08/19] logically reorder --- app/styles/app.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/styles/app.scss b/app/styles/app.scss index 5063c40b17..1a1ce7054e 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -1,3 +1,4 @@ +// Base styles @import 'utilities'; @import 'variables_mixins'; @import 'bootstrap'; @@ -7,8 +8,6 @@ @import 'layout'; @import 'index'; @import 'print'; -@import 'temp_misc'; -@import 'sign_in_screen'; // Components @import 'components/form_styles'; @@ -25,6 +24,10 @@ @import 'components/tables'; @import 'components/typeahead'; +// Custom CSS for specific views +@import 'sign_in_screen'; +@import 'temp_misc'; + // NOTE: do not place styles in this file // If you have styles to add, put them in // the appropriate imported stylesheet, or From f87894d4ded228f4c25eaf08f4a61acd6334345f Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 16:45:05 -0500 Subject: [PATCH 09/19] reword comment --- app/styles/app.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/app.scss b/app/styles/app.scss index 1a1ce7054e..cbee337d0c 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -24,7 +24,7 @@ @import 'components/tables'; @import 'components/typeahead'; -// Custom CSS for specific views +// Styles for specific views @import 'sign_in_screen'; @import 'temp_misc'; From ebae45bb0229c47cadaea7c93d073c2438f203f8 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 19:13:56 -0500 Subject: [PATCH 10/19] move to views dir --- app/styles/app.scss | 2 +- app/styles/{ => views}/_sign_in_screen.scss | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename app/styles/{ => views}/_sign_in_screen.scss (100%) diff --git a/app/styles/app.scss b/app/styles/app.scss index cbee337d0c..ebc9339fd8 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -25,7 +25,7 @@ @import 'components/typeahead'; // Styles for specific views -@import 'sign_in_screen'; +@import 'views/sign_in_screen'; @import 'temp_misc'; // NOTE: do not place styles in this file diff --git a/app/styles/_sign_in_screen.scss b/app/styles/views/_sign_in_screen.scss similarity index 100% rename from app/styles/_sign_in_screen.scss rename to app/styles/views/_sign_in_screen.scss From bb6363486b8e553215bf25a94b930349fbc6343b Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 19:14:14 -0500 Subject: [PATCH 11/19] :fire: unnecessary styles --- app/styles/_index.scss | 6 ------ app/styles/app.scss | 1 - 2 files changed, 7 deletions(-) delete mode 100644 app/styles/_index.scss diff --git a/app/styles/_index.scss b/app/styles/_index.scss deleted file mode 100644 index ade0b058ee..0000000000 --- a/app/styles/_index.scss +++ /dev/null @@ -1,6 +0,0 @@ -// Index (dashboard) styles -// -------------------------------------------/ - -.index { - .view-current-title { text-align: center; } -} diff --git a/app/styles/app.scss b/app/styles/app.scss index ebc9339fd8..0e55f23ac6 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -6,7 +6,6 @@ @import 'typography'; @import 'base'; @import 'layout'; -@import 'index'; @import 'print'; // Components From e6224875665d21c8196a7018cc4dcc82c3de2e83 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 19:23:59 -0500 Subject: [PATCH 12/19] belongs in form styles --- app/styles/_temp_misc.scss | 13 ------------- app/styles/components/_form_styles.scss | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/styles/_temp_misc.scss b/app/styles/_temp_misc.scss index 76f674bc3e..ba3637d4a2 100644 --- a/app/styles/_temp_misc.scss +++ b/app/styles/_temp_misc.scss @@ -22,19 +22,6 @@ cursor: default; } -// mark input fields as required -.required { - .control-label::after { - color: $red; - content: '*'; - } -} - -.input-group-addon { - border: 0; - background-color: $white; -} - //Loading icon from http://www.bootply.com/128062 .glyphicon-refresh-animate { -webkit-animation: spin2 .7s infinite linear; diff --git a/app/styles/components/_form_styles.scss b/app/styles/components/_form_styles.scss index 777e7e01f1..16fb637583 100644 --- a/app/styles/components/_form_styles.scss +++ b/app/styles/components/_form_styles.scss @@ -10,3 +10,16 @@ .checkbox-label-space { top: 25px; } + +// mark input fields as required +.required { + .control-label::after { + color: $red; + content: '*'; + } +} + +.input-group-addon { + border: 0; + background-color: $white; +} From ac9aceebf302a1c02514ed7dd3f2ac6702775edf Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 19:26:45 -0500 Subject: [PATCH 13/19] move to a buttons partial --- app/styles/_temp_misc.scss | 16 ---------------- app/styles/app.scss | 1 + app/styles/components/_buttons.scss | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 app/styles/components/_buttons.scss diff --git a/app/styles/_temp_misc.scss b/app/styles/_temp_misc.scss index ba3637d4a2..0c53b9d11c 100644 --- a/app/styles/_temp_misc.scss +++ b/app/styles/_temp_misc.scss @@ -21,19 +21,3 @@ background-color: rgba($gray_light,.5); cursor: default; } - -//Loading icon from http://www.bootply.com/128062 -.glyphicon-refresh-animate { - -webkit-animation: spin2 .7s infinite linear; - -animation: spin .7s infinite linear; -} - -@-webkit-keyframes spin2 { - from { -webkit-transform: rotate(0deg); } - to { -webkit-transform: rotate(360deg); } -} - -@keyframes spin { - from { transform: scale(1) rotate(0deg); } - to { transform: scale(1) rotate(360deg); } -} diff --git a/app/styles/app.scss b/app/styles/app.scss index 0e55f23ac6..5a7644859d 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -9,6 +9,7 @@ @import 'print'; // Components +@import 'components/buttons'; @import 'components/form_styles'; @import 'components/imaging'; @import 'components/labs'; diff --git a/app/styles/components/_buttons.scss b/app/styles/components/_buttons.scss new file mode 100644 index 0000000000..8541ee9d16 --- /dev/null +++ b/app/styles/components/_buttons.scss @@ -0,0 +1,15 @@ +// Loading icon from http://www.bootply.com/128062 +.glyphicon-refresh-animate { + -webkit-animation: spin2 .7s infinite linear; + -animation: spin .7s infinite linear; +} + +@-webkit-keyframes spin2 { + from { -webkit-transform: rotate(0deg); } + to { -webkit-transform: rotate(360deg); } +} + +@keyframes spin { + from { transform: scale(1) rotate(0deg); } + to { transform: scale(1) rotate(360deg); } +} From afafbed23504e80388096af2a68e9adf1f3a9cc5 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 19:27:19 -0500 Subject: [PATCH 14/19] move to base --- app/styles/_base.scss | 8 ++++++++ app/styles/_temp_misc.scss | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/styles/_base.scss b/app/styles/_base.scss index 927e491f96..99e6886fe2 100644 --- a/app/styles/_base.scss +++ b/app/styles/_base.scss @@ -7,3 +7,11 @@ body { } .clickable { cursor: pointer; } + +.modal-dialog { color: $navy; } + +.not-editable { + opacity: .5; + background-color: rgba($gray_light,.5); + cursor: default; +} diff --git a/app/styles/_temp_misc.scss b/app/styles/_temp_misc.scss index 0c53b9d11c..90fef1f829 100644 --- a/app/styles/_temp_misc.scss +++ b/app/styles/_temp_misc.scss @@ -13,11 +13,3 @@ .container { label { font-weight: 300; } } - -.modal-dialog { color: $navy; } - -.not-editable { - opacity: .5; - background-color: rgba($gray_light,.5); - cursor: default; -} From 0f887260075b6a6759b6ad0dfdea5f7bc0f7e718 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 19:43:35 -0500 Subject: [PATCH 15/19] extracting from temp styles --- app/styles/_temp_misc.scss | 4 ---- app/styles/components/_form_styles.scss | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/styles/_temp_misc.scss b/app/styles/_temp_misc.scss index 90fef1f829..d22fa0605d 100644 --- a/app/styles/_temp_misc.scss +++ b/app/styles/_temp_misc.scss @@ -9,7 +9,3 @@ font-weight: 100; } } - -.container { - label { font-weight: 300; } -} diff --git a/app/styles/components/_form_styles.scss b/app/styles/components/_form_styles.scss index 16fb637583..c61d8beaf2 100644 --- a/app/styles/components/_form_styles.scss +++ b/app/styles/components/_form_styles.scss @@ -23,3 +23,10 @@ border: 0; background-color: $white; } + +// I *think* this belongs here (extracting from +// temp_styles), but not actually sure if we +// even use this anymore +.container { + label { font-weight: 300; } +} From 16b80476a4d019db891abc975bf60d78defc7ea7 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 19:44:26 -0500 Subject: [PATCH 16/19] we don't even need this anymore --- app/styles/_temp_misc.scss | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 app/styles/_temp_misc.scss diff --git a/app/styles/_temp_misc.scss b/app/styles/_temp_misc.scss deleted file mode 100644 index d22fa0605d..0000000000 --- a/app/styles/_temp_misc.scss +++ /dev/null @@ -1,11 +0,0 @@ -.jumbotron { - background-color: #2e4359; - - h1 { - margin: 20px 0; - text-align: center; - word-spacing: 8px; - letter-spacing: -3px; - font-weight: 100; - } -} From f733c097fcee14589b5a5f080ba637e2781d7069 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 19:48:13 -0500 Subject: [PATCH 17/19] going to use basscss instead and will do that in a separate PR --- app/styles/_utilities.scss | 85 -------------------------------------- 1 file changed, 85 deletions(-) delete mode 100644 app/styles/_utilities.scss diff --git a/app/styles/_utilities.scss b/app/styles/_utilities.scss deleted file mode 100644 index cb6541c13a..0000000000 --- a/app/styles/_utilities.scss +++ /dev/null @@ -1,85 +0,0 @@ -/* stylelint-disable */ -/* modified gravitons */ -.h0 { font-size:48px } -.h1 { font-size:32px } -.h2 { font-size:24px } -.h3 { font-size:20px } -.h4 { font-size:16px } -.h5 { font-size:14px } -.h6 { font-size:12px } -.m-0 { margin:0 } -.m-1 { margin:8px } -.m-2 { margin:16px } -.m-3 { margin:32px } -.m-4 { margin:64px } -.mt-0 { margin-top:0 } -.mt-1 { margin-top:8px } -.mt-2 { margin-top:16px } -.mt-3 { margin-top:32px } -.mt-4 { margin-top:64px } -.mr-0 { margin-right:0 } -.mr-1 { margin-right:8px } -.mr-2 { margin-right:16px } -.mr-3 { margin-right:32px } -.mr-4 { margin-right:64px } -.mb-0 { margin-bottom:0 } -.mb-1 { margin-bottom:8px } -.mb-2 { margin-bottom:16px } -.mb-3 { margin-bottom:32px } -.mb-4 { margin-bottom:64px } -.ml-0 { margin-left:0 } -.ml-1 { margin-left:8px } -.ml-2 { margin-left:16px } -.ml-3 { margin-left:32px } -.ml-4 { margin-left:64px } -.p-0 { padding:0 } -.p-1 { padding:8px } -.p-2 { padding:16px } -.p-3 { padding:32px } -.p-4 { padding:64px } -.pt-0 { padding-top:0 } -.pt-1 { padding-top:8px } -.pt-2 { padding-top:16px } -.pt-3 { padding-top:32px } -.pt-4 { padding-top:64px } -.pr-0 { padding-right:0 } -.pr-1 { padding-right:8px } -.pr-2 { padding-right:16px } -.pr-3 { padding-right:32px } -.pr-4 { padding-right:64px } -.pb-0 { padding-bottom:0 } -.pb-1 { padding-bottom:8px } -.pb-2 { padding-bottom:16px } -.pb-3 { padding-bottom:32px } -.pb-4 { padding-bottom:64px } -.pl-0 { padding-left:0 } -.pl-1 { padding-left:8px } -.pl-2 { padding-left:16px } -.pl-3 { padding-left:32px } -.pl-4 { padding-left:64px } -.d-block { display:block } -.d-inline-block { display:inline-block } -.d-inline { display:inline } -.d-table { display:table } -.d-table-row { display:table-row } -.d-table-cell { display:table-cell } -.d-flex { display:flex } -.d-inline-flex { display:inline-flex } -.f-left { float:left } -.f-right { float:right } -.o-hidden { overflow:hidden } -.cf:after { content:"";display:block;clear:both } -.x0 { width:0 } -.x1 { width:8.333333333333332% } -.x2 { width:16.666666666666664% } -.x3 { width:25% } -.x4 { width:33.33333333333333% } -.x5 { width:41.66666666666667% } -.x6 { width:50% } -.x7 { width:58.333333333333336% } -.x8 { width:66.66666666666666% } -.x9 { width:75% } -.x10 { width:83.33333333333334% } -.x11 { width:91.66666666666666% } -.x12 { width:100% } -/* stylelint-enable */ From 625afb96a491e6ee1ac0cfe0f91870722401b95a Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 22:05:01 -0500 Subject: [PATCH 18/19] remove utilities from styles index --- app/styles/app.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/styles/app.scss b/app/styles/app.scss index 5a7644859d..dde5e661f7 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -1,5 +1,4 @@ // Base styles -@import 'utilities'; @import 'variables_mixins'; @import 'bootstrap'; @import 'bootstrap-theme'; From 0ba2d03424aee6a9b9dffae2f40b5d838c0a7922 Mon Sep 17 00:00:00 2001 From: Joel Glovier Date: Wed, 9 Nov 2016 22:08:32 -0500 Subject: [PATCH 19/19] remove temp styles from style index --- app/styles/app.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/styles/app.scss b/app/styles/app.scss index dde5e661f7..a0c7838252 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -25,7 +25,6 @@ // Styles for specific views @import 'views/sign_in_screen'; -@import 'temp_misc'; // NOTE: do not place styles in this file // If you have styles to add, put them in