diff --git a/assets/javascripts/templates/pages/offline_tmpl.coffee b/assets/javascripts/templates/pages/offline_tmpl.coffee index 752031d2..2429ec65 100644 --- a/assets/javascripts/templates/pages/offline_tmpl.coffee +++ b/assets/javascripts/templates/pages/offline_tmpl.coffee @@ -52,7 +52,7 @@ app.templates.offlineDoc = (doc, status) -> html = """ #{doc.fullName} - #{Math.ceil(doc.db_size / 100000) / 10} MB + #{Math.ceil(doc.db_size / 100000) / 10} MB """ html += if !(status and status.installed) diff --git a/assets/stylesheets/components/_content.scss b/assets/stylesheets/components/_content.scss index f9dde186..b5744001 100644 --- a/assets/stylesheets/components/_content.scss +++ b/assets/stylesheets/components/_content.scss @@ -38,17 +38,12 @@ margin-top: $headerHeight; } - &:after { // padding bottom - content: ''; - display: block; - margin-bottom: 1.25rem; - } - &::-webkit-scrollbar { -webkit-appearance: none; } &::-webkit-scrollbar:vertical { width: 14px; } &::-webkit-scrollbar:horizontal { height: 14px } &::-webkit-scrollbar-button { display: none; } - &::-webkit-scrollbar-track { background: $contentBackground; } + &::-webkit-scrollbar-track, + &::-webkit-scrollbar-corner { background: $contentBackground; } &::-webkit-scrollbar-thumb { min-height: 2rem; background: $scrollbarColor; @@ -56,6 +51,7 @@ border: 5px solid $contentBackground; border-radius: 10px; + &:hover, &:active { background-color: $scrollbarColorHover; border-width: 4px; @@ -229,8 +225,6 @@ ._credits { width: 100%; - - td:first-child, td:last-child { white-space: nowrap; } } // @@ -244,7 +238,6 @@ th, td { width: 1%; - white-space: nowrap; &:first-child { width: auto; } &:last-child { width: 12rem; } @@ -259,7 +252,11 @@ @extend %doc-icon; } -._docs-size { text-align: right; } +._docs-size { + text-align: right; + + > small { color: $textColorLight; } +} ._docs-tools { overflow: hidden; diff --git a/assets/stylesheets/components/_header.scss b/assets/stylesheets/components/_header.scss index 50c756c2..5dc13256 100644 --- a/assets/stylesheets/components/_header.scss +++ b/assets/stylesheets/components/_header.scss @@ -146,7 +146,7 @@ &:before { position: absolute; z-index: 1; - top: 1rem; + top: calc(1rem - 1px); left: 1rem; opacity: .4; pointer-events: none; diff --git a/assets/stylesheets/components/_mobile.scss b/assets/stylesheets/components/_mobile.scss index 7039eda0..25b24de7 100644 --- a/assets/stylesheets/components/_mobile.scss +++ b/assets/stylesheets/components/_mobile.scss @@ -42,6 +42,7 @@ ._settings { position: static; } ._settings ._sidebar { padding-bottom: $headerHeight; } ._settings-tabs { display: block; } + ._header ._settings-btn { width: auto; } // Header diff --git a/assets/stylesheets/components/_settings.scss b/assets/stylesheets/components/_settings.scss index 089e0732..ec69f95d 100644 --- a/assets/stylesheets/components/_settings.scss +++ b/assets/stylesheets/components/_settings.scss @@ -22,6 +22,10 @@ } } +// +// Settings page +// + ._settings-fieldset { display: flex; margin: 1.5rem 0; @@ -68,12 +72,13 @@ vertical-align: top; margin-left: .375rem; - &[data-behavior=reset] { - font-size: .75rem; - color: $textColorRed; - } + &[data-behavior="reset"] { color: $textColorRed; } } +// +// Footer +// + ._footer { position: absolute; z-index: $headerZ; @@ -92,6 +97,7 @@ ._settings-btn { display: block; + width: 100%; height: 100%; line-height: 1.5rem; padding: 0 .75rem; @@ -113,8 +119,6 @@ } } -._save-btn { width: 100%; } - // // Header tabs // diff --git a/assets/stylesheets/components/_sidebar.scss b/assets/stylesheets/components/_sidebar.scss index 1e6b6d52..a02cba41 100644 --- a/assets/stylesheets/components/_sidebar.scss +++ b/assets/stylesheets/components/_sidebar.scss @@ -27,6 +27,7 @@ border: 3px solid $contentBackground; border-radius: 5px; + &:hover, &:active { background-color: $scrollbarColorHover; border-width: 2px; diff --git a/assets/stylesheets/global/_base.scss b/assets/stylesheets/global/_base.scss index 58012df4..9615e117 100644 --- a/assets/stylesheets/global/_base.scss +++ b/assets/stylesheets/global/_base.scss @@ -126,6 +126,7 @@ th, td { padding-bottom: -webkit-calc(.3em + 1px); padding-bottom: calc(.3em + 1px); text-align: left; + white-space: normal !important; } th { diff --git a/assets/stylesheets/pages/_support_tables.scss b/assets/stylesheets/pages/_support_tables.scss index 8fc21fac..0ef0b3d3 100644 --- a/assets/stylesheets/pages/_support_tables.scss +++ b/assets/stylesheets/pages/_support_tables.scss @@ -30,7 +30,6 @@ td { padding: .125rem .25rem; - white-space: nowrap; cursor: default; } diff --git a/assets/stylesheets/pages/_yii.scss b/assets/stylesheets/pages/_yii.scss index e27623dd..e2d5f0b7 100644 --- a/assets/stylesheets/pages/_yii.scss +++ b/assets/stylesheets/pages/_yii.scss @@ -9,6 +9,4 @@ float: right; color: $textColorLight; } - - .param-type-col { white-space: nowrap; } } diff --git a/views/app.erb b/views/app.erb index 92d83a61..accac693 100644 --- a/views/app.erb +++ b/views/app.erb @@ -44,13 +44,12 @@ Back