From 71721ea00b08c4276bc70fd9ee6b77d9e4157e08 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Tue, 5 Sep 2017 15:55:34 +0200 Subject: [PATCH] Updated css for feed aggregator in demo example. cleaning. --- .../files/css/feed_aggregator.css | 7 ++ .../files/scss/feed_aggregator.scss | 7 ++ .../site/themes/admin/assets/scss/style.scss | 110 ------------------ examples/demo/site/themes/admin/debug.tpl | 38 ------ 4 files changed, 14 insertions(+), 148 deletions(-) delete mode 100644 examples/demo/site/themes/admin/assets/scss/style.scss delete mode 100644 examples/demo/site/themes/admin/debug.tpl diff --git a/examples/demo/site/modules/feed_aggregator/files/css/feed_aggregator.css b/examples/demo/site/modules/feed_aggregator/files/css/feed_aggregator.css index d0e322e..1598658 100644 --- a/examples/demo/site/modules/feed_aggregator/files/css/feed_aggregator.css +++ b/examples/demo/site/modules/feed_aggregator/files/css/feed_aggregator.css @@ -1,3 +1,10 @@ +div.feed ul.nav { + list-style: none; +} +div.feed ul.nav li { + display: inline-block; + padding-right: 1em; +} div.feed ul { list-style: none; position: relative; diff --git a/examples/demo/site/modules/feed_aggregator/files/scss/feed_aggregator.scss b/examples/demo/site/modules/feed_aggregator/files/scss/feed_aggregator.scss index 82c2b81..6609c08 100644 --- a/examples/demo/site/modules/feed_aggregator/files/scss/feed_aggregator.scss +++ b/examples/demo/site/modules/feed_aggregator/files/scss/feed_aggregator.scss @@ -1,4 +1,11 @@ div.feed { + ul.nav { + list-style: none; + li { + display: inline-block; + padding-right: 1em; + } + } ul { list-style: none; position: relative; diff --git a/examples/demo/site/themes/admin/assets/scss/style.scss b/examples/demo/site/themes/admin/assets/scss/style.scss deleted file mode 100644 index e2c4f77..0000000 --- a/examples/demo/site/themes/admin/assets/scss/style.scss +++ /dev/null @@ -1,110 +0,0 @@ -ul.horizontal { - li { - display: inline-block; - } -} - -#header { - #primary.menu { - ul { - li { - color: #555; - a { - color: #555; - text-decoration: none; - &:hover { color: black; } - } - background-color: #fff; - padding: 10px; - margin: 0; - } - &.horizontal { - border-bottom: solid 1px #ddd; - li { - border-top: solid 3px #fff; - &:hover { - background-color: #ffe; - border-top: solid 3px #999; - } - &.active { - font-weight: bold; - border-top: solid 3px #ddd; - background-color: #ddd; - } - &.active:hover { - border-top: solid 3px blue; - } - } - } - } - } -} -#content { - margin-left: 20px; - #highlighted { - position: relative; - border: solid 1px #ddd; - background-color: #ffc; - width: 70%; - left: 15%; - right: 15%; - padding: 5px; - font-style: italic; - } - .preview { - border: solid 1px red; - } -} -.sidebar { - padding: 5px; - margin: 3px; - /* border: solid 1px #ccc; */ - &#sidebar_first { - width: 250px; - position: fixed; - top: 45px; - left: 0; - bottom: 0; - width: 200px; - border-right: solid 1px #ddd; - } - &#sidebar_second { - width: 250px; - float: right; - } - - &+.main { - margin-left: 200px; - } -} -#primary-tabs { - ul.horizontal { - list-style-type: none; - li { - display: inline; - padding: 2px 5px; - border: solid 1px #ccf; - } - li.active { - border-color: #99f #99f #ddd; - border-style: solid solid none; - border-width: 2px 1px 0; - padding: 2px 7px 1px; - } - } -} -#message li.error { - background-color: #f99; - border: solid 1px red; - padding: 5px 2px 5px 2px; -} - -table.with_border { - thead td { - font-weight: bold; - } - td { - border: solid 1px #ccc; - padding: 2px 5px 2px 5px; - } -} diff --git a/examples/demo/site/themes/admin/debug.tpl b/examples/demo/site/themes/admin/debug.tpl deleted file mode 100644 index b689091..0000000 --- a/examples/demo/site/themes/admin/debug.tpl +++ /dev/null @@ -1,38 +0,0 @@ -{assign name="debug_enabled" value="True"/} -{if condition="$debug_enabled"} - -{literal} - -{/literal} -
Show debug - -
- -{/if}