From 8bae8aee3175ed093f693f6ea984586a776afbf5 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 3 Sep 2017 18:08:37 +0200 Subject: [PATCH 01/12] styles: Remove table cell borders --- .../app/styles/_bootstrap-theme-skylines.scss | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/ember/app/styles/_bootstrap-theme-skylines.scss b/ember/app/styles/_bootstrap-theme-skylines.scss index c1787c72c2..9d7e369c6c 100644 --- a/ember/app/styles/_bootstrap-theme-skylines.scss +++ b/ember/app/styles/_bootstrap-theme-skylines.scss @@ -153,6 +153,25 @@ abbr[title] { font-weight: 300; } +.table { + > thead, + > tbody, + > tfoot { + > tr { + > th, + > td { + border-top: none; + } + } + } + > thead > tr > th { + border-bottom: 1px solid $table-border-color; + } + > tbody + tbody { + border-top: 1px solid $table-border-color; + } +} + /* Page footer */ .footer { /* center align it with the container */ From 803c26d48b665064cc69be14928476c1f913be5c Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 3 Sep 2017 18:43:07 +0200 Subject: [PATCH 02/12] styles: Extract "_bootstrap.scss" file --- ember/app/styles/_bootstrap.scss | 11 +++++++++++ ember/app/styles/app.scss | 11 +---------- 2 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 ember/app/styles/_bootstrap.scss diff --git a/ember/app/styles/_bootstrap.scss b/ember/app/styles/_bootstrap.scss new file mode 100644 index 0000000000..99b2fa8c5d --- /dev/null +++ b/ember/app/styles/_bootstrap.scss @@ -0,0 +1,11 @@ +$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif; +$headings-font-weight: 700; +$zindex-tooltip: 6000; +$zindex-navbar-fixed: 2000; + +@import 'ember-bootstrap/bootstrap'; + +@import 'bootstrap-theme-skylines'; +@import 'bootstrap-badges'; +@import 'bootstrap-vertical-tabs'; +@import 'bootstrap-datetimepicker'; diff --git a/ember/app/styles/app.scss b/ember/app/styles/app.scss index 39c7c031f5..cf14c39b80 100644 --- a/ember/app/styles/app.scss +++ b/ember/app/styles/app.scss @@ -1,16 +1,7 @@ @import '_power-select'; -$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif; -$headings-font-weight: 700; -$zindex-tooltip: 6000; -$zindex-navbar-fixed: 2000; +@import 'bootstrap'; -@import 'ember-bootstrap/bootstrap'; - -@import 'bootstrap-theme-skylines'; -@import 'bootstrap-badges'; -@import 'bootstrap-vertical-tabs'; -@import 'bootstrap-datetimepicker'; @import 'panel'; @import 'follower-panel'; @import 'tables'; From 4f9f8289cbddc9679a43d7780a44b406d279a0cc Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 3 Sep 2017 19:00:51 +0200 Subject: [PATCH 03/12] styles: Move custom bootstrap styles into "bootstrap" subfolder --- ember/app/styles/_bootstrap.scss | 8 ++++---- ember/app/styles/{ => bootstrap}/_bootstrap-badges.scss | 0 .../styles/{ => bootstrap}/_bootstrap-datetimepicker.scss | 0 .../styles/{ => bootstrap}/_bootstrap-theme-skylines.scss | 0 .../styles/{ => bootstrap}/_bootstrap-vertical-tabs.scss | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename ember/app/styles/{ => bootstrap}/_bootstrap-badges.scss (100%) rename ember/app/styles/{ => bootstrap}/_bootstrap-datetimepicker.scss (100%) rename ember/app/styles/{ => bootstrap}/_bootstrap-theme-skylines.scss (100%) rename ember/app/styles/{ => bootstrap}/_bootstrap-vertical-tabs.scss (100%) diff --git a/ember/app/styles/_bootstrap.scss b/ember/app/styles/_bootstrap.scss index 99b2fa8c5d..0c49199b97 100644 --- a/ember/app/styles/_bootstrap.scss +++ b/ember/app/styles/_bootstrap.scss @@ -5,7 +5,7 @@ $zindex-navbar-fixed: 2000; @import 'ember-bootstrap/bootstrap'; -@import 'bootstrap-theme-skylines'; -@import 'bootstrap-badges'; -@import 'bootstrap-vertical-tabs'; -@import 'bootstrap-datetimepicker'; +@import 'bootstrap/bootstrap-theme-skylines'; +@import 'bootstrap/bootstrap-badges'; +@import 'bootstrap/bootstrap-vertical-tabs'; +@import 'bootstrap/bootstrap-datetimepicker'; diff --git a/ember/app/styles/_bootstrap-badges.scss b/ember/app/styles/bootstrap/_bootstrap-badges.scss similarity index 100% rename from ember/app/styles/_bootstrap-badges.scss rename to ember/app/styles/bootstrap/_bootstrap-badges.scss diff --git a/ember/app/styles/_bootstrap-datetimepicker.scss b/ember/app/styles/bootstrap/_bootstrap-datetimepicker.scss similarity index 100% rename from ember/app/styles/_bootstrap-datetimepicker.scss rename to ember/app/styles/bootstrap/_bootstrap-datetimepicker.scss diff --git a/ember/app/styles/_bootstrap-theme-skylines.scss b/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss similarity index 100% rename from ember/app/styles/_bootstrap-theme-skylines.scss rename to ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss diff --git a/ember/app/styles/_bootstrap-vertical-tabs.scss b/ember/app/styles/bootstrap/_bootstrap-vertical-tabs.scss similarity index 100% rename from ember/app/styles/_bootstrap-vertical-tabs.scss rename to ember/app/styles/bootstrap/_bootstrap-vertical-tabs.scss From c82913464134f5b96b8f9e19123785328cec34aa Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 3 Sep 2017 19:08:34 +0200 Subject: [PATCH 04/12] styles: Refactor "modal" overrides --- ember/app/styles/_bootstrap.scss | 4 ++++ ember/app/styles/_modals.scss | 11 ----------- ember/app/styles/app.scss | 1 - ember/app/styles/bootstrap/_modals.scss | 3 +++ 4 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 ember/app/styles/_modals.scss create mode 100644 ember/app/styles/bootstrap/_modals.scss diff --git a/ember/app/styles/_bootstrap.scss b/ember/app/styles/_bootstrap.scss index 0c49199b97..a1b799efb2 100644 --- a/ember/app/styles/_bootstrap.scss +++ b/ember/app/styles/_bootstrap.scss @@ -2,6 +2,8 @@ $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetic $headings-font-weight: 700; $zindex-tooltip: 6000; $zindex-navbar-fixed: 2000; +$zindex-modal-background: 2010; +$zindex-modal: 2020; @import 'ember-bootstrap/bootstrap'; @@ -9,3 +11,5 @@ $zindex-navbar-fixed: 2000; @import 'bootstrap/bootstrap-badges'; @import 'bootstrap/bootstrap-vertical-tabs'; @import 'bootstrap/bootstrap-datetimepicker'; + +@import "bootstrap/modals"; diff --git a/ember/app/styles/_modals.scss b/ember/app/styles/_modals.scss deleted file mode 100644 index 896187be7d..0000000000 --- a/ember/app/styles/_modals.scss +++ /dev/null @@ -1,11 +0,0 @@ -.modal { - z-index: 2020; -} - -.modal-dialog { - top: 40px; -} - -.modal-backdrop { - z-index: 2010; -} diff --git a/ember/app/styles/app.scss b/ember/app/styles/app.scss index cf14c39b80..3d5a44f1af 100644 --- a/ember/app/styles/app.scss +++ b/ember/app/styles/app.scss @@ -14,7 +14,6 @@ @import 'wingman'; @import 'ol3-sidebar'; @import 'flags'; -@import 'modals'; @import 'spinner'; @import 'loading-indicator'; diff --git a/ember/app/styles/bootstrap/_modals.scss b/ember/app/styles/bootstrap/_modals.scss new file mode 100644 index 0000000000..71624b3e12 --- /dev/null +++ b/ember/app/styles/bootstrap/_modals.scss @@ -0,0 +1,3 @@ +.modal-dialog { + top: 40px; +} From 85606f833a4ae7f37ea16531827efd8c5774b4be Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 3 Sep 2017 19:10:13 +0200 Subject: [PATCH 05/12] styles: Refactor "panel" overrides --- ember/app/styles/_bootstrap.scss | 1 + ember/app/styles/_panel.scss | 46 -------------------------- ember/app/styles/app.scss | 1 - ember/app/styles/bootstrap/_panel.scss | 19 +++++++++++ 4 files changed, 20 insertions(+), 47 deletions(-) delete mode 100644 ember/app/styles/_panel.scss create mode 100644 ember/app/styles/bootstrap/_panel.scss diff --git a/ember/app/styles/_bootstrap.scss b/ember/app/styles/_bootstrap.scss index a1b799efb2..107a7ca1ce 100644 --- a/ember/app/styles/_bootstrap.scss +++ b/ember/app/styles/_bootstrap.scss @@ -13,3 +13,4 @@ $zindex-modal: 2020; @import 'bootstrap/bootstrap-datetimepicker'; @import "bootstrap/modals"; +@import "bootstrap/panel"; diff --git a/ember/app/styles/_panel.scss b/ember/app/styles/_panel.scss deleted file mode 100644 index 61be3c4b36..0000000000 --- a/ember/app/styles/_panel.scss +++ /dev/null @@ -1,46 +0,0 @@ -.panel { - position: relative; -} - -.panel > form { - padding-top: 12px; -} - -.panel-body > form:last-child > .form-group:last-child { - margin-bottom: 0; -} - -.panel-body > :last-child, -.panel-body > div:last-child > :last-child { - margin-bottom: 0; -} - -.panel-help-icon { - position: absolute; - right: 5pt; - top: 0px; - font-size: 20pt; -} - -.panel-help-icon > a { - color: #aaa; - text-decoration: none; -} - -.panel-help-icon > a:hover { - color: #666; -} - -.panel-separator { - padding: 10px 15px; - background-color: rgb(245, 245, 245); - border-top: 1px solid rgb(221, 221, 221); - border-bottom: 1px solid rgb(221, 221, 221); -} - -.panel-subtitle { - margin-top: 0px; - margin-bottom: 0px; - font-size: 16px; - font-weight: normal; -} diff --git a/ember/app/styles/app.scss b/ember/app/styles/app.scss index 3d5a44f1af..8c621f1c16 100644 --- a/ember/app/styles/app.scss +++ b/ember/app/styles/app.scss @@ -2,7 +2,6 @@ @import 'bootstrap'; -@import 'panel'; @import 'follower-panel'; @import 'tables'; @import 'login-dropdown'; diff --git a/ember/app/styles/bootstrap/_panel.scss b/ember/app/styles/bootstrap/_panel.scss new file mode 100644 index 0000000000..753fc2db0d --- /dev/null +++ b/ember/app/styles/bootstrap/_panel.scss @@ -0,0 +1,19 @@ +.panel-heading { + position: relative; +} + +.panel-help-icon { + position: absolute; + right: 0; + top: 0; + font-size: 20pt; +} + +.panel-help-icon > a { + color: #aaa; + text-decoration: none; +} + +.panel-help-icon > a:hover { + color: #666; +} From 41c3a30571af3728f01d86f6d06407466e6f607d Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 3 Sep 2017 19:23:42 +0200 Subject: [PATCH 06/12] styles: Refactor "form-login" styles --- ember/app/styles/_form-login.scss | 19 +++++++++++++++++++ ember/app/styles/_login-dropdown.scss | 26 -------------------------- ember/app/styles/app.scss | 2 +- 3 files changed, 20 insertions(+), 27 deletions(-) create mode 100644 ember/app/styles/_form-login.scss delete mode 100644 ember/app/styles/_login-dropdown.scss diff --git a/ember/app/styles/_form-login.scss b/ember/app/styles/_form-login.scss new file mode 100644 index 0000000000..3fd47196fa --- /dev/null +++ b/ember/app/styles/_form-login.scss @@ -0,0 +1,19 @@ +.form-login { + min-width: 300px; + padding: 0 20px; + margin-bottom: inherit; + + + > div, > button { + margin: 15px 0; + } + + hr { + margin: 8px 0; + } + + a { + padding-left: 0; + padding-right: 0; + } +} diff --git a/ember/app/styles/_login-dropdown.scss b/ember/app/styles/_login-dropdown.scss deleted file mode 100644 index b7ac36c02c..0000000000 --- a/ember/app/styles/_login-dropdown.scss +++ /dev/null @@ -1,26 +0,0 @@ -.form-login { - min-width: 300px; - padding: 0 20px; - margin-bottom: inherit; -} - -.form-login div { - margin: 10px 0; -} - -.form-login .btn { - margin: 0; -} - -.form-login #remember { - margin-top: 5px; -} - -.form-login hr { - margin: 8px 0; -} - -.form-login a { - padding-left: 0; - padding-right: 0; -} diff --git a/ember/app/styles/app.scss b/ember/app/styles/app.scss index 8c621f1c16..b7ae64cc5b 100644 --- a/ember/app/styles/app.scss +++ b/ember/app/styles/app.scss @@ -4,7 +4,7 @@ @import 'follower-panel'; @import 'tables'; -@import 'login-dropdown'; +@import 'form-login'; @import 'about'; @import 'search'; @import 'events'; From 6f78ab3624f18bb51781efc9830a2550313d13c9 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 3 Sep 2017 19:40:29 +0200 Subject: [PATCH 07/12] styles: Refactor "page-header" overrides --- ember/app/styles/_bootstrap.scss | 1 + .../bootstrap/_bootstrap-theme-skylines.scss | 37 ------------------- ember/app/styles/bootstrap/_page-header.scss | 33 +++++++++++++++++ 3 files changed, 34 insertions(+), 37 deletions(-) create mode 100644 ember/app/styles/bootstrap/_page-header.scss diff --git a/ember/app/styles/_bootstrap.scss b/ember/app/styles/_bootstrap.scss index 107a7ca1ce..89704608c6 100644 --- a/ember/app/styles/_bootstrap.scss +++ b/ember/app/styles/_bootstrap.scss @@ -13,4 +13,5 @@ $zindex-modal: 2020; @import 'bootstrap/bootstrap-datetimepicker'; @import "bootstrap/modals"; +@import "bootstrap/page-header"; @import "bootstrap/panel"; diff --git a/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss b/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss index 9d7e369c6c..a9b62a7c5d 100644 --- a/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss +++ b/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss @@ -48,43 +48,6 @@ abbr[title] { height: 100%; } -/* Page header */ -.page-header { - position: relative; - padding: 0; - margin: 10px 0; -} - -.page-header h1 { - margin-top: 0; -} - -.page-header-with-tabs { - padding-bottom: 50px; -} - -.page-header-tabs { - position: absolute; - bottom: 0; - left: 5px; -} - -.page-header-tabs .nav-tabs { - margin-bottom: 0; - border-bottom: 0; -} - -@media (min-width: 768px) { - .page-header-with-tabs { - padding-bottom: 0; - } - - .page-header-tabs { - left: auto; - right: 5px; - } -} - .content { padding-top: 15px; padding-bottom: 15px; diff --git a/ember/app/styles/bootstrap/_page-header.scss b/ember/app/styles/bootstrap/_page-header.scss new file mode 100644 index 0000000000..ce60a26441 --- /dev/null +++ b/ember/app/styles/bootstrap/_page-header.scss @@ -0,0 +1,33 @@ +.page-header { + position: relative; + padding: 0; + margin: 10px 0; + + h1 { + margin-top: 0; + } +} + +.page-header-with-tabs { + padding-bottom: 50px; + + @media (min-width: 768px) { + padding-bottom: 0; + } +} + +.page-header-tabs { + position: absolute; + bottom: 0; + left: 5px; + + @media (min-width: 768px) { + left: auto; + right: 5px; + } + + .nav-tabs { + margin-bottom: 0; + border-bottom: 0; + } +} From 1ccdd932643d335ce1609982c1065e777535d0c0 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 3 Sep 2017 20:48:38 +0200 Subject: [PATCH 08/12] styles: Refactor "navbar" overrides --- ember/app/styles/_bootstrap.scss | 1 + ember/app/styles/_search.scss | 11 ---- .../bootstrap/_bootstrap-theme-skylines.scss | 53 ----------------- ember/app/styles/bootstrap/_navbar.scss | 57 +++++++++++++++++++ 4 files changed, 58 insertions(+), 64 deletions(-) create mode 100644 ember/app/styles/bootstrap/_navbar.scss diff --git a/ember/app/styles/_bootstrap.scss b/ember/app/styles/_bootstrap.scss index 89704608c6..3c7eba3048 100644 --- a/ember/app/styles/_bootstrap.scss +++ b/ember/app/styles/_bootstrap.scss @@ -13,5 +13,6 @@ $zindex-modal: 2020; @import 'bootstrap/bootstrap-datetimepicker'; @import "bootstrap/modals"; +@import "bootstrap/navbar"; @import "bootstrap/page-header"; @import "bootstrap/panel"; diff --git a/ember/app/styles/_search.scss b/ember/app/styles/_search.scss index 67d4d6738d..906fd46a80 100644 --- a/ember/app/styles/_search.scss +++ b/ember/app/styles/_search.scss @@ -1,14 +1,3 @@ -.navbar-search input { - color: #bbb; - background-color: #626262; - border: 1px solid #333; -} - -.navbar-search input:focus { - color: #666; - background-color: white; -} - .search-results .column-icon { width: 1px; text-align: center; diff --git a/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss b/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss index a9b62a7c5d..0162a79c52 100644 --- a/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss +++ b/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss @@ -53,65 +53,12 @@ abbr[title] { padding-bottom: 15px; } -/* Navbar */ - -.navbar { - min-height: 40px; - font-weight: 400; - border: 0; -} - -.navbar .fa-bars { - color: white; -} - -.logo { - width: 24px; - height: 24px; - margin: -2px 6px -2px 0; - vertical-align: bottom; -} - -.navbar-brand { - font-size: 20px; - font-weight: 400; - text-shadow: 0 1px 1px black; - line-height: 20px; - padding: 10px 15px; - height: 100%; -} - @media (max-width: 767px) { - .navbar-brand { - padding: 15px; - } - .dropdown-menu .divider { background-color: #666; } } -.navbar-nav > li > a { - padding-top: 10px !important; - padding-bottom: 10px !important; - - text-shadow: 0 1px 1px black; -} - -.navbar .badge { - vertical-align: top; - padding: 4px 7px; -} - -.navbar-form { - margin: 5px 0; -} - -.navbar-form .form-control { - height: 30px; -} - -.navbar-form .form-control, .dropdown-menu > li > a { font-weight: 300; } diff --git a/ember/app/styles/bootstrap/_navbar.scss b/ember/app/styles/bootstrap/_navbar.scss new file mode 100644 index 0000000000..af90dc6234 --- /dev/null +++ b/ember/app/styles/bootstrap/_navbar.scss @@ -0,0 +1,57 @@ +.navbar { + min-height: 40px; + font-weight: 400; + border: 0; + + .badge { + vertical-align: top; + padding: 4px 7px; + } +} + +.navbar-brand { + font-size: 20px; + font-weight: 400; + text-shadow: 0 1px 1px black; + line-height: 20px; + padding: 10px 15px; + height: 100%; + + @media (max-width: 767px) { + padding: 15px; + } + + .logo { + width: 24px; + height: 24px; + margin: -2px 6px -2px 0; + vertical-align: bottom; + } +} + +.navbar-nav > li > a { + padding-top: 10px !important; + padding-bottom: 10px !important; + + text-shadow: 0 1px 1px black; +} + +.navbar-form { + margin: 5px 0; + + .form-control { + height: 30px; + font-weight: 300; + } +} + +.navbar-search input { + color: #bbb; + background-color: #626262; + border: 1px solid #333; + + &:focus { + color: #666; + background-color: white; + } +} From 12d1febf5922830c68186176b523c1a34637c1b0 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 3 Sep 2017 21:47:35 +0200 Subject: [PATCH 09/12] styles: Refactor "about" styles --- ember/app/styles/_about.scss | 74 ++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/ember/app/styles/_about.scss b/ember/app/styles/_about.scss index 68d83b93c8..52c9e073c9 100644 --- a/ember/app/styles/_about.scss +++ b/ember/app/styles/_about.scss @@ -1,37 +1,39 @@ -#about .social-buttons .btn-group { - float: right; -} - -#about .social-buttons .btn { - width: 40px; -} - -#about h2 { - font-size: 22px; -} - -#about h2 .fa { - width: 1.2em; - text-align: center; -} - -#about h2 a { - color: inherit; - text-decoration: none; -} - -#about h2 a:hover { - color: #666; -} - -#about h2 small { - font-size: 13px; -} - -#about p { - text-align: justify; -} - -#about .banner div { - padding: 0; +#about { + .social-buttons .btn-group { + float: right; + } + + .social-buttons .btn { + width: 40px; + } + + h2 { + font-size: 22px; + + .fa { + width: 1.2em; + text-align: center; + } + + a { + color: inherit; + text-decoration: none; + + &:hover { + color: #666; + } + } + + small { + font-size: 13px; + } + } + + p { + text-align: justify; + } + + .banner div { + padding: 0; + } } From 833913207c252221c71bc74df1335ce9834c69a4 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 3 Sep 2017 22:12:04 +0200 Subject: [PATCH 10/12] styles: Refactor "popover" overrides --- ember/app/styles/_bootstrap.scss | 1 + .../styles/bootstrap/_bootstrap-theme-skylines.scss | 10 ---------- ember/app/templates/components/share-button.hbs | 2 +- ember/app/templates/components/wingman-row.hbs | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/ember/app/styles/_bootstrap.scss b/ember/app/styles/_bootstrap.scss index 3c7eba3048..73808f4844 100644 --- a/ember/app/styles/_bootstrap.scss +++ b/ember/app/styles/_bootstrap.scss @@ -1,5 +1,6 @@ $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif; $headings-font-weight: 700; +$zindex-popover: 5000; $zindex-tooltip: 6000; $zindex-navbar-fixed: 2000; $zindex-modal-background: 2010; diff --git a/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss b/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss index 0162a79c52..e2179ab8aa 100644 --- a/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss +++ b/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss @@ -179,13 +179,3 @@ body, .btn, .form-control, .dropdown-menu { margin-top: 5px; margin-right: 28px; } - -.popover-share { - white-space: nowrap; - z-index: 5000; -} - -.popover-wingmen { - white-space: nowrap; - z-index: 5000; -} diff --git a/ember/app/templates/components/share-button.hbs b/ember/app/templates/components/share-button.hbs index 9f6764f73f..b4cca081e6 100644 --- a/ember/app/templates/components/share-button.hbs +++ b/ember/app/templates/components/share-button.hbs @@ -1,7 +1,7 @@ {{#bs-button class="btn-share btn-sm pull-right"}} {{fa-icon "share-alt"}} Share - {{#bs-popover title="Spread the word" placement="bottom" class="popover-share"}} + {{#bs-popover title="Spread the word" placement="bottom"}}
Share diff --git a/ember/app/templates/components/wingman-row.hbs b/ember/app/templates/components/wingman-row.hbs index 47c7ebe898..d8c86c1438 100644 --- a/ember/app/templates/components/wingman-row.hbs +++ b/ember/app/templates/components/wingman-row.hbs @@ -52,7 +52,7 @@ {{format-time times.firstObject.start format='hhmmss'}}
{{format-time times.lastObject.end format='hhmmss'}} - {{#bs-popover title="Periods" triggerEvents="hover" class="popover-wingmen"}} + {{#bs-popover title="Periods" triggerEvents="hover"}} {{#each times as |interval|}} From cd5547b1595836942fd4ba36f6c398dc76cde515 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 3 Sep 2017 22:34:17 +0200 Subject: [PATCH 11/12] styles: Refactor "footer" styles --- ember/app/styles/_footer.scss | 11 +++++++++++ ember/app/styles/app.scss | 1 + .../bootstrap/_bootstrap-theme-skylines.scss | 16 ---------------- 3 files changed, 12 insertions(+), 16 deletions(-) create mode 100644 ember/app/styles/_footer.scss diff --git a/ember/app/styles/_footer.scss b/ember/app/styles/_footer.scss new file mode 100644 index 0000000000..647f9ae028 --- /dev/null +++ b/ember/app/styles/_footer.scss @@ -0,0 +1,11 @@ +.footer { + /* center align it with the container */ + text-align: center; + margin-top: 5px; + font-size: 85%; + + a { + color: #333; + text-decoration: none; + } +} diff --git a/ember/app/styles/app.scss b/ember/app/styles/app.scss index b7ae64cc5b..a743b8118f 100644 --- a/ember/app/styles/app.scss +++ b/ember/app/styles/app.scss @@ -15,6 +15,7 @@ @import 'flags'; @import 'spinner'; @import 'loading-indicator'; +@import 'footer'; @import 'ol-GraphicLayerSwitcher-v3'; @import 'ol-PlayButton'; diff --git a/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss b/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss index e2179ab8aa..b3432d60d1 100644 --- a/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss +++ b/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss @@ -82,22 +82,6 @@ abbr[title] { } } -/* Page footer */ -.footer { - /* center align it with the container */ - text-align: center; - margin-top: 5px; - font-size: 85%; -} - -.footer a { - color: #333; -} - -.footer a:hover { - text-decoration: none; -} - /* File upload field fix */ input[type="file"].form-control { height: auto; From 5e92dee6d0901fc8a0eab99622e2f38f5c341c20 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Sun, 3 Sep 2017 22:39:07 +0200 Subject: [PATCH 12/12] styles: Refactor "table" overrides --- ember/app/styles/_bootstrap.scss | 1 + .../bootstrap/_bootstrap-theme-skylines.scss | 19 ------------------- ember/app/styles/bootstrap/_tables.scss | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 ember/app/styles/bootstrap/_tables.scss diff --git a/ember/app/styles/_bootstrap.scss b/ember/app/styles/_bootstrap.scss index 73808f4844..ec54509738 100644 --- a/ember/app/styles/_bootstrap.scss +++ b/ember/app/styles/_bootstrap.scss @@ -17,3 +17,4 @@ $zindex-modal: 2020; @import "bootstrap/navbar"; @import "bootstrap/page-header"; @import "bootstrap/panel"; +@import "bootstrap/tables"; diff --git a/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss b/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss index b3432d60d1..1d2517614f 100644 --- a/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss +++ b/ember/app/styles/bootstrap/_bootstrap-theme-skylines.scss @@ -63,25 +63,6 @@ abbr[title] { font-weight: 300; } -.table { - > thead, - > tbody, - > tfoot { - > tr { - > th, - > td { - border-top: none; - } - } - } - > thead > tr > th { - border-bottom: 1px solid $table-border-color; - } - > tbody + tbody { - border-top: 1px solid $table-border-color; - } -} - /* File upload field fix */ input[type="file"].form-control { height: auto; diff --git a/ember/app/styles/bootstrap/_tables.scss b/ember/app/styles/bootstrap/_tables.scss new file mode 100644 index 0000000000..9c853d1828 --- /dev/null +++ b/ember/app/styles/bootstrap/_tables.scss @@ -0,0 +1,18 @@ +.table { + > thead, + > tbody, + > tfoot { + > tr { + > th, + > td { + border-top: none; + } + } + } + > thead > tr > th { + border-bottom: 1px solid $table-border-color; + } + > tbody + tbody { + border-top: 1px solid $table-border-color; + } +}