From e4da09575fc67b20bb3bf61cbf8cff1dd4c789c9 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Mon, 11 Mar 2019 22:57:37 +0100 Subject: Fix design issue in #410 --- css/app.css | 30 +-- css/content.css | 687 ++++++++++++++++++++++++++--------------------------- css/custom.css | 2 +- css/explore.css | 85 ++++--- css/navigation.css | 9 +- 5 files changed, 404 insertions(+), 409 deletions(-) (limited to 'css') diff --git a/css/app.css b/css/app.css index 73ffe9957..ffaf63617 100644 --- a/css/app.css +++ b/css/app.css @@ -21,24 +21,24 @@ } #undo { - z-index:101; - background-color:var(--color-warning); - border:0; - padding:0 .7em .3em; - display:none; + z-index: 101; + background-color: var(--color-warning); + border: 0; + padding: 0 .7em .3em; + display: none; position: relative; - top:0; - border-bottom-left-radius:1em; - border-bottom-right-radius:1em; + top: 0; + border-bottom-left-radius: 1em; + border-bottom-right-radius: 1em; } - #undo a { - font-weight: bold; - } +#undo a { + font-weight: bold; +} - #undo a:hover { - text-decoration: underline; - } +#undo a:hover { + text-decoration: underline; +} #searchbox { display: block !important; @@ -46,5 +46,5 @@ /* Override hidden before angular is loaded */ [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak, .ng-hide:not(.ng-hide-animate) { - display: none !important; + display: none !important; } \ No newline at end of file diff --git a/css/content.css b/css/content.css index c3bdb481d..4a88c230f 100644 --- a/css/content.css +++ b/css/content.css @@ -12,6 +12,7 @@ width: 100%; flex-basis: auto; } + #app-navigation:not(.hidden) + #app-content { width: calc(100% - 300px); } @@ -60,7 +61,7 @@ z-index: 10000; background-color: #111; display: flex; - position: sticky; + position: sticky; top: 50px; align-items: center; } @@ -81,7 +82,6 @@ border: 0; border-radius: 0; margin: 0; - background-color: #111; background-color: transparent; background-repeat: no-repeat; background-position: center; @@ -124,7 +124,7 @@ background: url('../img/loading.gif') no-repeat; background-position: calc(50% - 16px) calc(50% - 16px); /* Overrides the snap.js animation making the loading icon to fly in app-content. */ - transition:none !important; + transition: none !important; -webkit-transition: none !important; -moz-webkit-transition: none !important; } @@ -145,7 +145,7 @@ background-image: url('../img/loading.gif'); background-position: calc(50% - 16px) calc(50% - 16px); /* Overrides the snap.js animation making the loading icon to fly in app-content. */ - transition:none !important; + transition: none !important; -webkit-transition: none !important; -moz-webkit-transition: none !important; } @@ -154,7 +154,6 @@ background: var(--color-main-background); } - /** * */ @@ -162,10 +161,10 @@ height: 0; overflow: hidden; text-align: center; - background-image:-moz-linear-gradient(top, #eee 0%, #fefefe 100%); - background-image:-webkit-linear-gradient(top, #eee 0%, #fefefe 100%); - background-image:-ms-linear-gradient(top, #eee 0%, #fefefe 100%); - background-image:linear-gradient(top, #eee 0%, #fefefe 100%); + background-image: -moz-linear-gradient(top, #eee 0%, #fefefe 100%); + background-image: -webkit-linear-gradient(top, #eee 0%, #fefefe 100%); + background-image: -ms-linear-gradient(top, #eee 0%, #fefefe 100%); + background-image: linear-gradient(top, #eee 0%, #fefefe 100%); } .pull-to-refresh.show-pull-to-refresh { @@ -197,7 +196,6 @@ #app-content .item { cursor: default; border-bottom: 1px solid var(--color-border); - background: var(--color-background-dark); } #app-content .item.active { @@ -227,7 +225,6 @@ -webkit-position: sticky; position: sticky; top: 50px; - background-color: var(--color-main-background); min-height: 41px; opacity: 0.9; } @@ -244,214 +241,214 @@ height: auto; } - #app-content .utils ul > li { - min-width: 0; - } - - #app-content .util-spacer { - width: 20px; - } - - #app-content .compact .util-spacer { - width: 19px; - } - - #app-content .utils li { - line-height: 40px; - vertical-align: middle; - } - - #app-content .utils > ul > li:last-child { - padding-right: 0; - } - - #app-content .utils > ul > li:first-child { - padding-left: 0; - } - - #app-content .utils .util { - padding: 0 6px; - } - - #app-content .utils .article-action-plugins { - - } - - #app-content .utils button, - #app-content .utils .external { - padding: 0; - margin: 0; - height: 40px; - width: 40px; - border: 0; - float: left; - background-color: transparent; - background-size: 100%; - background-repeat: no-repeat; - background-size: 25px; - background-position: center; - } - - #app-content .utils .external, - #app-content .utils .menu button, - #app-content .utils .icon-toggle { - display: inline-block; - opacity: 0.3; - } - - #app-content .utils .external:hover, - #app-content .utils .menu button:hover, - #app-content .utils .icon-toggle:hover, - #app-content .utils .icon-toggle.keep-unread { - opacity: 1; - } - - #app-content .utils .star { - background-image: url('../img/inactive_star.svg'); - } - - #app-content .utils .starred { - background-image: url('../img/active_star.svg'); - } - - #app-content .utils .star:hover { - background-image: url('../img/hover_star.svg'); - } - - #app-content .utils .more button { - opacity: .3; - } - - #app-content .utils .more button:hover { - opacity: 1; - } - - #app-content .utils .more { - position: relative; - } - - #app-content .article-actions { - display: none; - filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75)); - -webkit-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75)); - -moz-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75)); - position: absolute; - top: 40px; - border-radius: 3px; - z-index: 1000; - border: 1px solid transparent; - background-color: var(--color-main-background); - margin: 0; - padding: 0; - } - - #app-content .article-actions ul { - display: flex; - float: left; - } - - #app-content .article-actions li { - float: left; - width: 40px !important; - } - - #app-content #articles:not(.compact) .article-actions { - left: 6px; - } - - #app-content #articles:not(.compact) .article-actions:after, - #app-content #articles:not(.compact) .article-actions:before { - left: 20px; - } - - #app-content #articles.compact .article-actions { - right: -10px; - } - - #app-content #articles.compact .article-actions:after, - #app-content #articles.compact .article-actions:before { - right: 9px; - } - - #app-content .article-actions:after, - #app-content .article-actions:before { - bottom: 100%; - border: solid transparent; - content: " "; - height: 0; - width: 0; - position: absolute; - pointer-events: none; - } - - #app-content .article-actions:after { - border-color: rgba(255, 255, 255, 0); - border-bottom-color: var(--color-border); - border-width: 5px; - margin-left: -5px; - } - #app-content .article-actions:before { - border-color: rgba(255, 255, 255, 0); - border-bottom-color: var(--color-border); - border-width: 9px; - margin-left: -9px; - } - - /** - * Article title - */ - #app-content .utils .title { - width: 100%; - padding-left: 45px; - background-position: 10px 10px; - background-size: 20px 20px; - background-repeat: no-repeat; - } - - #app-content .feed-view .utils .title { - background: none !important; - padding-left: 10px; - } - - #app-content .utils .title h1 a { - /*text-overflow: ellipsis;*/ - white-space: nowrap; - overflow: hidden; - width: 100%; - display: inline-block; - color: var(--color-main-text); - font-weight: bold; - font-size: 16px; - line-height: 1.5; - padding-top: 8px; - min-height: 40px; - } - - #app-content .open .title .intro { - display: none; - } - - #app-content .title .intro { - color: var(--color-text-lighter); - font-size: 10pt; - font-weight: normal; - margin-left: 20px; - } - - #app-content .open .utils .title h1 a { - overflow: auto; - white-space: normal; - } - - #app-content .read .utils .title h1 a { - font-weight: normal; - color: var(--color-text-lighter); - } - - #app-content .utils .date { - padding: 0 15px; - margin-right: 25px; - } +#app-content .utils ul > li { + min-width: 0; +} + +#app-content .util-spacer { + width: 20px; +} + +#app-content .compact .util-spacer { + width: 19px; +} + +#app-content .utils li { + line-height: 40px; + vertical-align: middle; +} + +#app-content .utils > ul > li:last-child { + padding-right: 0; +} + +#app-content .utils > ul > li:first-child { + padding-left: 0; +} + +#app-content .utils .util { + padding: 0 6px; +} + +#app-content .utils .article-action-plugins { + +} + +#app-content .utils button, +#app-content .utils .external { + padding: 0; + margin: 0; + height: 40px; + width: 40px; + border: 0; + float: left; + background-color: transparent; + background-size: 100%; + background-repeat: no-repeat; + background-size: 25px; + background-position: center; +} + +#app-content .utils .external, +#app-content .utils .menu button, +#app-content .utils .icon-toggle { + display: inline-block; + opacity: 0.3; +} + +#app-content .utils .external:hover, +#app-content .utils .menu button:hover, +#app-content .utils .icon-toggle:hover, +#app-content .utils .icon-toggle.keep-unread { + opacity: 1; +} + +#app-content .utils .star { + background-image: url('../img/inactive_star.svg'); +} + +#app-content .utils .starred { + background-image: url('../img/active_star.svg'); +} + +#app-content .utils .star:hover { + background-image: url('../img/hover_star.svg'); +} + +#app-content .utils .more button { + opacity: .3; +} + +#app-content .utils .more button:hover { + opacity: 1; +} + +#app-content .utils .more { + position: relative; +} + +#app-content .article-actions { + display: none; + filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75)); + -webkit-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75)); + -moz-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75)); + position: absolute; + top: 40px; + border-radius: 3px; + z-index: 1000; + border: 1px solid transparent; + margin: 0; + padding: 0; +} + +#app-content .article-actions ul { + display: flex; + float: left; +} + +#app-content .article-actions li { + float: left; + width: 40px !important; +} + +#app-content #articles:not(.compact) .article-actions { + left: 6px; +} + +#app-content #articles:not(.compact) .article-actions:after, +#app-content #articles:not(.compact) .article-actions:before { + left: 20px; +} + +#app-content #articles.compact .article-actions { + right: -10px; +} + +#app-content #articles.compact .article-actions:after, +#app-content #articles.compact .article-actions:before { + right: 9px; +} + +#app-content .article-actions:after, +#app-content .article-actions:before { + bottom: 100%; + border: solid transparent; + content: " "; + height: 0; + width: 0; + position: absolute; + pointer-events: none; +} + +#app-content .article-actions:after { + border-color: rgba(255, 255, 255, 0); + border-bottom-color: var(--color-border); + border-width: 5px; + margin-left: -5px; +} + +#app-content .article-actions:before { + border-color: rgba(255, 255, 255, 0); + border-bottom-color: var(--color-border); + border-width: 9px; + margin-left: -9px; +} + +/** + * Article title + */ +#app-content .utils .title { + width: 100%; + padding-left: 45px; + background-position: 10px 10px; + background-size: 20px 20px; + background-repeat: no-repeat; +} + +#app-content .feed-view .utils .title { + background: none !important; + padding-left: 10px; +} + +#app-content .utils .title h1 a { + /*text-overflow: ellipsis;*/ + white-space: nowrap; + overflow: hidden; + width: 100%; + display: inline-block; + color: var(--color-main-text); + font-weight: bold; + font-size: 16px; + line-height: 1.5; + padding-top: 8px; + min-height: 40px; +} + +#app-content .open .title .intro { + display: none; +} + +#app-content .title .intro { + color: var(--color-text-lighter); + font-size: 10pt; + font-weight: normal; + margin-left: 20px; +} + +#app-content .open .utils .title h1 a { + overflow: auto; + white-space: normal; +} + +#app-content .read .utils .title h1 a { + font-weight: normal; + color: var(--color-text-lighter); +} + +#app-content .utils .date { + padding: 0 15px; + margin-right: 25px; +} /** @@ -467,14 +464,15 @@ word-wrap: break-word; } - #app-content .heading a { - font-weight: bold; - color: var(--color-main-text); - text-decoration: none; - } - #app-content .heading a:hover { - text-decoration: underline; - } +#app-content .heading a { + font-weight: bold; + color: var(--color-main-text); + text-decoration: none; +} + +#app-content .heading a:hover { + text-decoration: underline; +} #app-content .heading .date { float: right; @@ -545,13 +543,13 @@ font-size: 15px; } - #app-content .author a { - color: inherit; - } +#app-content .author a { + color: inherit; +} - #app-content .author a:hover { - text-decoration: underline; - } +#app-content .author a:hover { + text-decoration: underline; +} /** * Enclosure @@ -588,114 +586,115 @@ overflow-x: auto; } - #app-content .body p { - line-height: 1.5; - margin: 7px 0 14px 0; - } - - #app-content .body img, - #app-content .body table { - max-width: 100%; - height: auto; - overflow: auto; - word-wrap: break-word; - white-space:normal; - } - - #app-content .body iframe { - max-width: 100%; - } - - #app-content .body > div > img:first-child, - #app-content .body > div > :first-child > img:first-child { - padding: 0 14px 0 0; - float: left; - } - - #app-content .body h1, - #app-content .body h2 { - font-size: 17px; - font-weight: bold; - color: var(--color-main-text); - margin: 21px 0 5px 0; - } - - #app-content .body h3 { - font-size: 15px; - font-weight: bold; - color: var(--color-main-text); - margin: 21px 0 0 0; - text-decoration: underline; - } - - #app-content .body h4, - #app-content .body h5, - #app-content .body h6 { - font-weight: bold; - } - - #app-content .body > div { - margin: 7px 0; - } - - #app-content .body a { - color: #0000ff; - text-decoration: underline; - } - - #app-content .body ul { - margin: 7px 0; - padding-left: 14px; - list-style-type: disc; - } - - #app-content .body ol { - margin: 7px 0; - padding-left: 21px; - } - - #app-content .body ul li { - cursor: default; - line-height: 21px; - } - - #app-content .body pre { - padding: 7px 7px 7px 14px; - background-color: var(--color-background-darker); - border: 1px solid var(--color-border-dark); - margin: 7px 0 14px 0; - overflow-y: auto; - } - #app-content .body pre::-webkit-scrollbar { - height: 10px; - } - - #app-content .body pre::-webkit-scrollbar-thumb { - background: #333; - } - - #app-content .body pre::-webkit-scrollbar-track-piece { - background: #ddd; - } - - #app-content .body code, - #app-content .body pre { - font-family: monospace; - font-size: 16px; - } - - #app-content .body blockquote { - border-left: 1px solid rgb(210,210,210); - margin: 25px 0; - padding: 0 0 0 15px; - font-style: italic; - } - - #app-content .body em { - font-style: italic; - opacity: 1; - } - - #app-content *[dir=rtl] { - text-align: right; - } +#app-content .body p { + line-height: 1.5; + margin: 7px 0 14px 0; +} + +#app-content .body img, +#app-content .body table { + max-width: 100%; + height: auto; + overflow: auto; + word-wrap: break-word; + white-space: normal; +} + +#app-content .body iframe { + max-width: 100%; +} + +#app-content .body > div > img:first-child, +#app-content .body > div > :first-child > img:first-child { + padding: 0 14px 0 0; + float: left; +} + +#app-content .body h1, +#app-content .body h2 { + font-size: 17px; + font-weight: bold; + color: var(--color-main-text); + margin: 21px 0 5px 0; +} + +#app-content .body h3 { + font-size: 15px; + font-weight: bold; + color: var(--color-main-text); + margin: 21px 0 0 0; + text-decoration: underline; +} + +#app-content .body h4, +#app-content .body h5, +#app-content .body h6 { + font-weight: bold; +} + +#app-content .body > div { + margin: 7px 0; +} + +#app-content .body a { + color: #0000ff; + text-decoration: underline; +} + +#app-content .body ul { + margin: 7px 0; + padding-left: 14px; + list-style-type: disc; +} + +#app-content .body ol { + margin: 7px 0; + padding-left: 21px; +} + +#app-content .body ul li { + cursor: default; + line-height: 21px; +} + +#app-content .body pre { + padding: 7px 7px 7px 14px; + background-color: var(--color-background-darker); + border: 1px solid var(--color-border-dark); + margin: 7px 0 14px 0; + overflow-y: auto; +} + +#app-content .body pre::-webkit-scrollbar { + height: 10px; +} + +#app-content .body pre::-webkit-scrollbar-thumb { + background: #333; +} + +#app-content .body pre::-webkit-scrollbar-track-piece { + background: #ddd; +} + +#app-content .body code, +#app-content .body pre { + font-family: monospace; + font-size: 16px; +} + +#app-content .body blockquote { + border-left: 1px solid rgb(210, 210, 210); + margin: 25px 0; + padding: 0 0 0 15px; + font-style: italic; +} + +#app-content .body em { + font-style: italic; + opacity: 1; +} + +#app-content *[dir=rtl] { + text-align: right; +} diff --git a/css/custom.css b/css/custom.css index 585e17212..25a124b6d 100644 --- a/css/custom.css +++ b/css/custom.css @@ -10,7 +10,7 @@ #app-content .custom-slashdot-org .body div > i { display: block; - border-left: 1px solid rgb(210,210,210); + border-left: 1px solid rgb(210, 210, 210); margin: 25px 0; padding: 0 0 0 15px; } diff --git a/css/explore.css b/css/explore.css index 7ba2371f6..8bf60a754 100644 --- a/css/explore.css +++ b/css/explore.css @@ -12,101 +12,98 @@ * Explore styles */ .explore #app-content-wrapper { - height: 100%; + height: 100%; } #explore { - height: 100%; - width: 100%; - padding: 45px; - padding-right: 0; + height: 100%; + width: 100%; + padding: 45px 0 45px 45px; } #explore .grid-item { - float: left; - width: 300px; - border-collapse: collapse; - border: 1px solid #ccc; - margin: 0 25px 25px 0; + float: left; + width: 300px; + border-collapse: collapse; + border: 1px solid #ccc; + margin: 0 25px 25px 0; } #explore h1 { - font-size: 13pt; - background-repeat: no-repeat; - background-position: 0 center; - background-size: 24px 24px; - padding: 5px 0 0 35px; - background-position: 0 center; + font-size: 13pt; + background-repeat: no-repeat; + background-position: 0 center; + background-size: 24px 24px; + padding: 5px 0 0 35px; } #explore h1 a { - word-wrap: break-word; + word-wrap: break-word; } #explore h1 a:hover { - text-decoration: underline; + text-decoration: underline; } #explore .category-wrapper { - text-align: center; + text-align: center; } #explore .category { - font-weight: normal; - font-size: 10pt; - color: var(--color-primary-text); - background-color: var(--color-primary); - padding: 10px; - font-weight: bold; + font-weight: normal; + font-size: 10pt; + color: var(--color-primary-text); + background-color: var(--color-primary); + padding: 10px; + font-weight: bold; } #explore .grid-item-content { - padding: 30px; + padding: 30px; } #explore .explore-logo { - text-align: center; - margin-top: 25px; + text-align: center; + margin-top: 25px; } #explore .explore-logo img { - width: 100%; + width: 100%; } #explore .explore-subscribe { - padding-top: 15px; - text-align: right; + padding-top: 15px; + text-align: right; } #explore .explore-content { - padding-top: 25px; + padding-top: 25px; } #explore .explore-filter { - text-align: right; - padding: 30px; - padding-top: 0; + text-align: right; + padding: 0 30px 30px; } #explore .explore-filter input, #explore .explore-filter select { - margin-left: 10px; - display: inline-block; + margin-left: 10px; + display: inline-block; } #explore .explore-filter input { - width: 200px; + width: 200px; } #explore .explore-footer { - clear: both; - margin: 75px 0; - text-align: center; + clear: both; + margin: 75px 0; + text-align: center; } #explore .explore-footer a { - font-size: 11pt; - color: #0000AA; - text-decoration: underline; + font-size: 11pt; + color: #0000AA; + text-decoration: underline; } diff --git a/css/navigation.css b/css/navigation.css index 1a90130c4..f61b05fc3 100644 --- a/css/navigation.css +++ b/css/navigation.css @@ -160,7 +160,6 @@ right: 0; position: absolute; margin: 0; - padding: 0; height: 44px; width: 44px; padding: 15px; @@ -179,14 +178,14 @@ #app-navigation .animate-show.ng-hide-add, #app-navigation .animate-show.ng-hide-remove { - /* this is required as of 1.3x to properly - apply all styling in a show/hide animation */ - transition: 0s linear opacity; + /* this is required as of 1.3x to properly + apply all styling in a show/hide animation */ + transition: 0s linear opacity; } #app-navigation .animate-show.ng-hide-add-active, #app-navigation .animate-show.ng-hide-remove-active { - transition: .2s linear opacity; + transition: .2s linear opacity; } #app-navigation .animate-show { -- cgit v1.2.3