From 61cd0433303cacc7ec9f6bdeacae364cde138092 Mon Sep 17 00:00:00 2001 From: edhelas Date: Thu, 7 Jan 2016 23:08:09 +0100 Subject: [PATCH] Remove old CSS + references --- app/views/page.tpl | 1 - app/widgets/Presence/Presence.php | 3 +- themes/material/css/header.css | 106 ---------- themes/material/css/list.css | 324 ------------------------------ 4 files changed, 1 insertion(+), 433 deletions(-) delete mode 100644 themes/material/css/list.css diff --git a/app/views/page.tpl b/app/views/page.tpl index 2e85a45cd..d8a0527b0 100644 --- a/app/views/page.tpl +++ b/app/views/page.tpl @@ -20,7 +20,6 @@ addCss('style.css'); $this->addCss('header.css'); - //$this->addCss('list.css'); $this->addCss('listn.css'); $this->addCss('grid.css'); $this->addCss('article.css'); diff --git a/app/widgets/Presence/Presence.php b/app/widgets/Presence/Presence.php index 7411e248c..eec13d45b 100644 --- a/app/widgets/Presence/Presence.php +++ b/app/widgets/Presence/Presence.php @@ -48,8 +48,7 @@ class Presence extends WidgetBase function onPostDisconnect($data) { - RPC::call('movim_reload', - BASE_URI."index.php?q=disconnect"); + RPC::call('movim_reload', Route::urlize('disconnect')); } function ajaxSet($form = false) diff --git a/themes/material/css/header.css b/themes/material/css/header.css index a93f79575..e5586068f 100644 --- a/themes/material/css/header.css +++ b/themes/material/css/header.css @@ -27,109 +27,3 @@ header.fixed + div { margin-top: 7rem; } -/* -header.big { - background-size: cover, cover; - background-position: center center; - width: 100%; - max-width: 100%; - color: white; - position: relative; - margin-bottom: 2rem; -} - -header.big p { - color: white; -}*/ -/* -main > section > div > header, -main > section > div:first-child:nth-last-child(2) ~ div > header { - position: relative; - width: 100%; - max-width: 100%; - z-index: 1; - display: block; - overflow: hidden; - max-height: 50rem; - transition: max-height 0.3s cubic-bezier(.4,0,.2,1); -} - -main > section > div > header.scroll, -main > section > div:first-child:nth-last-child(2) ~ div > header.scroll { - max-height: 7rem; - position: fixed; - top: 0; - transition: max-height 0.3s cubic-bezier(.4,0,.2,1); -} - -main > section > div:first-child:nth-last-child(2) ~ div > header.scroll { - width: 65%; -} - -main > section > div > header.scroll:not(.big) { - border-bottom: 1px solid rgba(0, 0, 0, 0.12); -} - -main > section > div:first-child:nth-last-child(2) > header.scroll { - width: 35%; -} - -@media screen and (max-width: 1024px) { - main > section > div:first-child:nth-last-child(2) > header.scroll, - main > section > div:first-child:nth-last-child(2) ~ div > header.scroll { - width: 100%; - } -} - -main > section > div > header > div > h2 { - display: inline-block; - margin-left: 1rem; - white-space: nowrap; - text-overflow: ellipsis; - max-width: calc(100% - 10rem); - opacity: 0; - transition: opacity 0.3s cubic-bezier(.4,0,.2,1); - transition-delay: 0.3s; -} - -main > section > div > header.scroll > div > h2 { - opacity: 1; -} - -main > section > div > header ul.tabs, -main > section > div > header form { - margin-top: 1rem; - width: calc(100% - 8rem); - box-sizing: border-box; - float: right; - border: 0; -} - -main > section > div > header form { - padding: 0 1rem; - margin-top: 2rem; -} - -main > section > div > header form > div:not(.clear):not(.control) { - min-height: 0; -} - -main > section > div > header form > div > input:not([type=submit]) { - padding-top: 0rem; -} - -header.big h2, -header.big p { - color: white; -} - - -main > section > div > header.scroll + * { - margin-top: 7rem; -}*/ - -/* -main > section > div > header + article { - margin-bottom: 2rem; -} -*/ diff --git a/themes/material/css/list.css b/themes/material/css/list.css deleted file mode 100644 index 1908c4da0..000000000 --- a/themes/material/css/list.css +++ /dev/null @@ -1,324 +0,0 @@ -/* List */ -ul li { - padding: 0 2rem; - padding-left: 9rem; - font-size: 2rem; - min-height: 6rem; - line-height: 6rem; - position: relative; - box-sizing: border-box; - text-overflow: ellipsis; - overflow: hidden; - /*min-width: 12rem;*/ -} - -ul > a { - max-width: 100%; - display: block; -} - -ul li.oppose { - padding-left: 0; - padding-right: 9rem; -} - - -ul li.inactive { - opacity: 0.6; -} - -ul.simple > li { - padding-left: 2rem; - line-height: 6rem; -} - -ul.simple > li span.icon { - display: none; -} - -ul.middle > li { - min-height: 7rem; - line-height: 5rem; - padding-top: 1rem; - padding-bottom: 1rem; -} - -ul.thin > li { - min-height: 5rem; - line-height: 5rem; -} - -ul.thick > li { - min-height: 7rem; - line-height: 5rem; - padding-top: 2rem; - padding-bottom: 2rem; -} - -ul li.subheader { - min-height: 0; - height: 5rem; - line-height: 5rem; - font-size: 1.75rem; - padding-left: 2rem; - padding-top: 0; - font-weight: 600; - /* - position: sticky; - top: 0; - background-color: white; - z-index: 1; - */ -} - -ul.active li:hover:not(.subheader), -ul.active.all li:hover, -ul.active li.active:not(.subheader) { - background-color: rgba(0, 0, 0, 0.03); - cursor: pointer; -} - -ul.active li:hover:not(.subheader) > p.more:after, -ul.active.all li:hover > p.more:after, -ul.active li.active:not(.subheader) > p.more:after { - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), rgba(247, 247, 247, 1)); -} - -ul.active li:focus:not(.subheader), -ul.active.all li:focus, -ul.active li.active:not(.subheader) { - background-color: rgba(0, 0, 0, 0.07); -} - -ul.active li:focus:not(.subheader) > p.more:after, -ul.active.all li:focus > p.more:after, -ul.active li.active:not(.subheader) > p.more:after { - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), rgba(237, 237, 237, 1)); -} - -.dark ul.active li:hover:not(.subheader), -.dark ul.active.all li:hover, -.dark ul.active li.active:not(.subheader) { - background-color: rgba(255, 255, 255, 0.035); -} - -ul li.condensed, -ul.thin li.condensed, -ul.thick li.condensed { - line-height: 3rem; -} - -ul li.condensed p, -ul.thin li.condensed p, -ul.thick li.condensed p { - line-height: 2.5rem; - margin-bottom: 0; -} - -ul li > p, -ul li > a > p { - display: block; - font-size: 1.75rem; - color: rgba(0, 0, 0, 0.60); - overflow: hidden; - text-overflow: ellipsis; - max-height: 8rem; - line-height: 2.5rem; - position: relative; -} - -ul li > p.more:after { - display: block; - width: 100%; - height: 3rem; - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), white); - content: ""; - position: absolute; - bottom: 0; -} - -ul li > p.all { - max-height: 100%; -} - -ul li p.wrap { - white-space: nowrap; -} - -ul li span { - white-space: nowrap; -} - -ul li div.bubble span { - white-space: initial; -} - -ul li span.second { - opacity: 0.6; - padding-left: 0.5rem; -} - -ul li img { - max-width: 100%; - height: auto; -} - -ul li > p.more img:not(.emoji) { - margin: 1rem auto; - display: block; -} - -ul li.action { - padding-right: 7rem; -} - -ul li.action > div.action, -ul li.action > form > div.action { - position: absolute; - top: 50%; - right: 2rem; - margin-top: -2.5rem; - font-size: 3rem; - height: 5rem; - line-height: 5rem; -} - -ul li span.info { - float: right; - margin-left: 1rem; -} - -/* Counter */ - -ul li span.counter:empty { - display: none; -} - -ul li span.counter { - position: absolute; - right: 1rem; - top: calc(50% - 1.5rem); - line-height: 2rem; - border-radius: 3rem; - padding: 0.5rem; - text-align: center; - min-width: 2rem; -} - -ul li span.counter.bottom { - top: calc(50%); -} - -/* Bubble */ - -ul li div.bubble { - padding: 1rem 2rem; - border-radius: 0.25rem; - line-height: 2.75rem; - position: relative; - box-sizing: border-box; - display: block; - font-size: 1.75rem; - background-color: white; - border-color: white; - max-width: 100%; - float: left; -} - -ul li div.bubble div { - /*white-space: pre-wrap;*/ - display: inline; -} - -ul li div.quote { - font-style: italic; -} - -ul li.oppose div.bubble { - margin-left: 2rem; - float: right; -} - -ul li div.bubble:after { - visibility: hidden; - display: block; - font-size: 0; - content: " "; - clear: both; - height: 0; -} - -ul li:not(.same) div.bubble:before { - content: ""; - position: absolute; - top: 0; - left: -1.5rem; - border-top: 1.5rem solid black; - border-top-color: inherit; - border-left: 1.5rem solid transparent; - border-right: 1.5rem solid transparent; -} - -ul li.oppose:not(.same) div.bubble:before { - left: calc(100% - 1.5rem); -} - -ul li.same span.icon { - display: none; -} - -/* Tabs */ - -ul.tabs { - text-align: center; - border-bottom: 1px solid rgba(0, 0, 0, 0.12); - overflow: hidden; - white-space: nowrap; - height: 6rem; -} - -ul.tabs:hover { - overflow-x: auto; -} - -ul.tabs li { - display: inline-block; - white-space: nowrap; - text-transform: uppercase; - font-size: 1.75rem; - font-weight: 600; - opacity: 0.6; - padding: 0 2rem; - height: 2rem; - box-sizing: border-box; -} - -ul.tabs li:hover { - cursor: pointer; -} - -ul.tabs li.active { - opacity: 1; - border-bottom-width: 2px; - border-bottom-style: solid; -} - -/* Menu */ - -ul.context_menu { - border-radius: 0.25rem; - overflow: hidden; - background-color: white; - color: #333; - position: absolute; - top: 0; - right: 0; - margin: 0.5rem; - z-index: 3; - box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.26), 0px 2px 10px 0px rgba(0, 0, 0, 0.16); - display: none; -} - -ul.context_menu.shown { - display: block; -}