Skip to content
Permalink
Browse files

Merge style & content css

  • Loading branch information...
flack committed Sep 9, 2019
1 parent c49ab44 commit 4a5d46249e86a933d5c615a5c68db9e64e1ffc4d

This file was deleted.

@@ -9,6 +9,7 @@ body
padding: 0;
background-color: #d3d7cf;
color: #222;
font-family: 'Lucida Grande', 'Segoe UI', 'Lucida Sans', 'Arial', sans-serif;
}

body,
@@ -249,7 +250,6 @@ a:hover
margin-left: 240px;
}


#container > #content
{
height: auto;
@@ -729,3 +729,134 @@ body#org_openpsa_popup {
#org_openpsa_popup .org_openpsa_toolbar ul{
padding: 0.2em 0.4em 0.2em 0
}

/** former content.css **/

.content-with-sidebar
{
display: flex;
align-items: flex-start
}

.content-with-sidebar > div.main
{
padding-right: 1em;
width: 70%;
}
.content-with-sidebar > aside
{
width: 30%;
}

#content-text aside div.vcard
{
float: none;
display: inline-block;
}

#content-text div.wide
{
width: 100%;
clear: both
}

#content-text
{
padding: 1em;
overflow: auto;
position: relative
}

#content-text h1
{
display: none;
}

#content-text h2
{
font-size: 120%;
margin: 1em 0 .5em 0
}

#content-text h3
{
font-size: 100%;
}

#content-text h4
{
font-size: 100%;
}

aside .area
{
margin-bottom: 1.5em;
}

aside .org_openpsa_helper_box
{
font-size: 90%;
padding: 0;
border-style: solid;
border-width: 1px;
border-color: #daddd6;
border-radius: 6px;
padding-left: 4px;
padding-right: 4px;
padding-bottom: .3em;
}

aside .org_openpsa_helper_box h3
{
color: #24436e;
background-color: #e9ede4;
background: -ms-linear-gradient(top, #f4f4ef 0%,#e7e6e0 76%,#e7e6e0 100%); /* IE10+ */
background: linear-gradient(to bottom, #f4f4ef 0%,#e7e6e0 76%,#e7e6e0 100%); /* W3C */

padding: .2em 0.5em;
margin: 0;
border: none;
border-bottom: solid 1px #d2d6cd;
border-radius: 6px 6px 0 0;
margin-left: -4px;
margin-right: -4px;
margin-bottom: .3em;
}

.org_openpsa_helper_box ul
{
margin-left: 0;
padding-left: 0;
list-style: none;
}

.org_openpsa_helper_box li
{
margin-top: .7em;
}

.org_openpsa_helper_box .date
{
color: #777;
}

.org_openpsa_helper_box span.tip
{
display: block;
padding: 0.5em;
}

.org_openpsa_helper_box div.current-status
{
font-size: larger;
margin-bottom: 4px;
}

.org_openpsa_user_badPass, .org_openpsa_user_shortPass
{
color: red;
}
.org_openpsa_user_goodPass, .org_openpsa_user_strongPass
{
color: green;
}
@@ -11,7 +11,6 @@
<?php
$head->add_stylesheet(MIDCOM_STATIC_URL . '/org.openpsa.core/popup.css');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/style.css');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/content.css');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/ui-elements.css');
$head->print_head_elements();
?>
@@ -26,10 +26,9 @@
<link type="image/x-icon" href="<?php echo MIDCOM_STATIC_URL; ?>/org.openpsa.core/openpsa-16x16.png" rel="shortcut icon"/>
<?php
$head->add_stylesheet(MIDCOM_STATIC_URL . "/stock-icons/font-awesome-4.7.0/css/font-awesome.min.css");
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/style.css', 'screen');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/content.css', 'all');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/style.css');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/print.css', 'print');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/ui-elements.css', 'all');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/ui-elements.css');
$head->enable_jquery_ui(['mouse', 'draggable']);
@@ -10,10 +10,9 @@
<meta charset="UTF-8">
<title><(title)> OpenPSA</title>
<?php
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/style.css', 'screen');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/content.css', 'all');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/style.css');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/print.css', 'print');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/error.css', 'all');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/error.css');
$head->print_head_elements();
?>

@@ -19,8 +19,7 @@
<title><(title)> OpenPSA</title>
<?php
$head = midcom::get()->head;
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/style.css', 'screen');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/content.css', 'all');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/style.css');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/print.css', 'print');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/login.css', 'all');
$head->add_jscript('var MIDCOM_PAGE_PREFIX = "' . midcom_connection::get_url('self') . '";');
@@ -12,7 +12,6 @@
<?php
$head->add_stylesheet(MIDCOM_STATIC_URL . '/org.openpsa.core/popup.css');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/style.css');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/content.css');
$head->add_stylesheet(MIDCOM_STATIC_URL . '/OpenPsa2/ui-elements.css');
$head->print_head_elements();
?>

0 comments on commit 4a5d462

Please sign in to comment.
You can’t perform that action at this time.