diff options
author | Petr Vobornik <pvoborni@redhat.com> | 2011-10-11 09:42:35 +0200 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2011-10-19 10:44:44 -0200 |
commit | 1dda03120e5873d231072468c5637c4718656ed3 (patch) | |
tree | b6c52e93f986b3c83f86631b4ea03ca576c2ae5c /install/migration | |
parent | 27ea90792fb06e7e62f81c352936232ee10894ff (diff) | |
download | freeipa-1dda03120e5873d231072468c5637c4718656ed3.tar.gz freeipa-1dda03120e5873d231072468c5637c4718656ed3.tar.xz freeipa-1dda03120e5873d231072468c5637c4718656ed3.zip |
Fixed: Duplicate CSS definitions
https://fedorahosted.org/freeipa/ticket/1565
The ipa.css, ipa_error.css and ipa_migration.css contain some duplicate definitions which cause maintenance problems.
Additional changes:
* fixed whitespaces in ipa.css
* unified headings in config pages
Diffstat (limited to 'install/migration')
-rw-r--r-- | install/migration/error.html | 5 | ||||
-rw-r--r-- | install/migration/index.html | 7 | ||||
-rw-r--r-- | install/migration/invalid.html | 7 | ||||
-rw-r--r-- | install/migration/ipa_migration.css | 823 |
4 files changed, 39 insertions, 803 deletions
diff --git a/install/migration/error.html b/install/migration/error.html index 3d58efe76..521b3ee1c 100644 --- a/install/migration/error.html +++ b/install/migration/error.html @@ -5,10 +5,11 @@ <title>IPA: Identity Policy Audit</title> <link rel="stylesheet" type="text/css" href="../ui/jquery-ui.css" /> + <link rel="stylesheet" type="text/css" href="../ui/ipa.css" /> <link rel="stylesheet" type="text/css" href="ipa_migration.css" /> </head> -<body id="header-bg"> +<body class="info-page"> <div class="container_1"> <div class="header-logo"> @@ -17,7 +18,7 @@ <br> <br> <div id="formwindow"> - <h4>We're Sorry</h4> + <h2>We're Sorry</h2> <div class="formcontent"> <p> <strong>There was a problem with your request. Please, try again later.</strong> diff --git a/install/migration/index.html b/install/migration/index.html index d61cd61c4..e0c7d1f50 100644 --- a/install/migration/index.html +++ b/install/migration/index.html @@ -5,17 +5,18 @@ <title>IPA: Identity Policy Audit</title> <link rel="stylesheet" type="text/css" href="../ui/jquery-ui.css" /> + <link rel="stylesheet" type="text/css" href="../ui/ipa.css" /> <link rel="stylesheet" type="text/css" href="ipa_migration.css" /> </head> -<body id="header-bg"> +<body class="info-page"> <div class="container_1"> <div class="header-logo"> <img src="../ui/ipalogo.png" /><img src="../ui/ipabanner.png" /> </div> <div class="textblock"> - <h3>Password Migration</h3> + <h1>Password Migration</h1> <p>If you have been sent here by your administrator, your personal information is being migrated to a new identity management solution (IPA).</p> @@ -24,7 +25,7 @@ activated.</p> </div> <div id="formwindow"> - <h4>Login</h4> + <h2>Login</h2> <form id="login" action="migration.py" method="post" name=""> <ul> <li> diff --git a/install/migration/invalid.html b/install/migration/invalid.html index 11f1eb215..70e49f659 100644 --- a/install/migration/invalid.html +++ b/install/migration/invalid.html @@ -5,17 +5,18 @@ <title>IPA: Identity Policy Audit</title> <link rel="stylesheet" type="text/css" href="..ui/jquery-ui.css" /> + <link rel="stylesheet" type="text/css" href="../ui/ipa.css" /> <link rel="stylesheet" type="text/css" href="ipa_migration.css" /> </head> -<body id="header-bg"> +<body class="info-page"> <div class="container_1"> <div class="header-logo"> <img src="../ui/ipalogo.png" /><img src="../ui/ipabanner.png" /> </div> <div class="textblock"> - <h3>Password Migration</h3> + <h1>Password Migration</h1> <p>If you have been sent here by your administrator, your personal information is being migrated to a new identity management solution (IPA).</p> @@ -24,7 +25,7 @@ activated.</p> </div> <div id="formwindow"> - <h4>Login</h4> + <h2>Login</h2> <div id="error-box"> <div class="formcontent"> <p><strong>Please re-enter your username or password</strong></p> diff --git a/install/migration/ipa_migration.css b/install/migration/ipa_migration.css index ed4f58d5d..68d070f95 100644 --- a/install/migration/ipa_migration.css +++ b/install/migration/ipa_migration.css @@ -7,558 +7,20 @@ * Copyright (C) 2010 Red Hat */ +/* Migration */ -@font-face { - font-family: 'Overpass'; - src: url('../ui/overpass_regular-web.eot'); - src: url('../ui/overpass_regular-web.eot?#iefix') format('eot'), - url('../ui/overpass_regular-web.woff') format('woff'), - url('../ui/overpass_regular-web.ttf') format('truetype'), - url('../ui/overpass_regular-web.svg#webfontLTZe4IYH') format('svg'); - font-weight: normal; - font-style: normal; - -} - -@font-face { - font-family: 'Overpass Bold'; - src: url('../ui/overpass_bold-web.eot'); - src: url('../ui/overpass_bold-web.eot?#iefix') format('eot'), - url('../ui/overpass_bold-web.woff') format('woff'), - url('../ui/overpass_bold-web.ttf') format('truetype'), - url('../ui/overpass_bold-web.svg#webfontzAU82Ltw') format('svg'); - font-weight: bold; - font-style: normal; - -} - -body{ - background-image:url("../ui/outer-bg.png"); - background-repeat:repeat-x; - background-position:left top; - background-color:#F9F9F9; - border-width: 0; - font-family:"Liberation Sans",Arial,Sans; - font-size:11px; - margin: 0; -} - -.center-container { - margin-left: auto; - margin-right: auto; - width: 960px; -} - -.ui-widget { - font-size: 1em; -} - -.input_link { - padding: .4em 1em .4em 2em; - text-decoration: none; - position: relative; - cursor: pointer; -} - -.input_link span.ui-icon { - -moz-border-radius: 0.3em; - border: 1px solid #B8B8B8; - margin: -0.9em 0.4em 0em -0.3em; - position: absolute; - left: .2em; - top: 50%; -} - -/* ---- Header ---- */ -div.header { - background-color:#0C3B00; - width: 100%; - height: 4em; -} - -div.header a { - text-decoration: none; -} - -div.header a:link { - text-decoration: none; - color: white; -} - -div.header a:visited { - text-decoration: none; - color: white; -} - -div.header span.header-logo { - padding-left: 2em; -} - -div.header span.header-logo a img { - border: 0; -} - -div.header span.header-loggedinas { - width: 96em; - color: #fff; - display: block; - padding-left: 71em; - margin-top: -2.6em; - margin-left: auto; - margin-right: 27.6em; - width: 20em; -} - -/* ---- Navigation ---- */ -div.tabs { - overflow: auto; - width: 100%; - height: 100%; - min-height: 40em; -} - -div#content { - margin-top: 0; - position: relative; - width: 100%; -} - - -ul#viewtype { - padding-left: 2em; -} - -ul#viewtype li { - color: #656565; - display: inline; - font-weight: bold; - list-style-type: none; - padding-right: 2em; -} - - -ul#viewtype li img { - vertical-align: middle; -} - -ul#viewtype li a { - font-weight: normal; -} - -div.content div.content-buttons { - float: right; - margin-right: 1.5em; -} - -div.content div.content-buttons img { - border: 0; -} - -h2 { - font-family: "Overpass Bold","Liberation Sans", Arial, sans-serif; - font-size: 1.5em; - font-weight: normal; - color: #333333; - text-transform: uppercase; - margin-left: 1em; - margin-bottom: 0; - text-align: left; -} - -.section-expand{ - float:left; - -moz-border-radius: 0.3em; - background-color: -moz-linear-gradient(top, #959595, #5e5e5e); - border: 1px solid #b8b8b8; - color: #fff; - margin-right: 0.5em; - margin-top: 0.1em; -} - -hr { - background-color: #EEEEEE; - clear: both; - color: #FFFFFF; - height: 0.1em; - margin-left: 1.5em; - margin-right: 1.5em; - margin-top: 1em; -} - -.details-section { - margin-left: 4.5em; - margin-right: 1.5em; - margin-top: 1.8em; - white-space: nowrap; - padding-bottom: 1.8em; - padding-right: 1.8em; -} - -.undo { - cursor:pointer; -} - -dl.entryattrs { - clear: both; - margin-left: 1.5em; - margin-top: 1.8em; - white-space: nowrap; -} - -dl.entryattrs dt { - clear: left; - float: left; - padding-bottom: 1.8em; - padding-right: 1.8em; - text-align: right; - width: 16em; - margin: 0.5em -0.5em 0 -6em; -} - -dl.entryattrs dd { - float: left; - padding-bottom: 1.8em; -} - -dl.entryattrs dd.first { - margin-left: 0; - margin-top: 0.7em; -} - -dl.entryattrs dd.other { - clear: both; - margin-left: 10.7em; -} - -dl.entryattrs input { - margin-right: 0.5em; - margin-top: -1.2em; - min-width: 27.5em; -} - - -span.attrhint { - font-size: 8pt; - left: 5em; - margin-left: 12.5em; - position: absolute; - overflow-x: hidden; -} - - -/*Navigation */ -.tabs1 .ui-tabs-nav{ - padding-left: 2.5em; - padding-top: 2em; - margin: 0; - border: none; - background-image: url("../ui/Mainnav-background.png"); - -moz-border-radius: 0; -} - -.ui-tabs { - padding:0; -} - -#the positions for these are in the large icon image, -#and need to be specified in pixels. -.ui-icon-plus { - background-position: -16px -129px; -} - -.ui-icon-minus { - background-position: -48px -129px; -} - -.ui-icon-trash { - background-position: -176px -97px; -} - -.ui-widget-content .ui-icon { - background-image: url("../ui/ui-icons_222222_256x240.png"); - background-color: #e2e2e2; -} - -.ui-widget-content { -} - - -.ui-widget-content a { - text-decoration: none; - color: #1d85d5; - font-weight: normal; -} - -.ui-widget-header { - background: url("../ui/modal-background.png") repeat scroll 50% 50% #1f9123; - border: 1px solid #244c16; - color: #EEEEEE; - font-weight: bold; -} - -.tabs1 .ui-tabs-nav { - height: 3em; -} - -.ui-widget input, .ui-widget select, -.ui-widget textarea, .ui-widget button { - font-family: "Liberation Sans", Arial, sans-serif; - font-size: 1.3em; - margin-right: .1em; -} - -.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { - -moz-border-radius: .3em; - background: -moz-linear-gradient(top, #959595, #5e5e5e); - border: 1px solid #777777; - color: #fff; - font-weight: normal; -} - -.tabs1 .ui-tabs-nav li { - -moz-border-radius: 0 !important; - background-image: url("../ui/Mainnav-offtab.png"); - margin: 0; - border-width: 0; - text-align: center; - vertical-align:baseline; - } - -.tabs1 .ui-tabs-nav li.ui-tabs-selected { - padding: 0 0; - background-image: url("../ui/Mainnav-ontab.png"); - text-align: center; - margin: 0; -} - -.tabs1 .ui-tabs-nav li a{ - -moz-border-radius: 0 !important; - font-family: "Overpass Bold", "Liberation Sans", Arial, Sans; - width:5.5em; - padding: none; - color: #7E7E7E; - margin: 0 auto; - text-align:center; - font-size:1.5em; -} - - -.tabs1 .ui-tabs-nav li > a:link, span.main-nav-off > a:visited{ - color: #7E7E7E; -} - -.tabs1 .ui-tabs-nav li.ui-tabs-selected a{ - color: #3D752A; -} - -.tabs1 .ui-tabs-panel { - display: block; - border-width: 0; - padding: 0 0 0 0; - background: none; - overflow-x: hidden; -} - -.tabs2 .ui-tabs-nav { - padding: 0.3em 6em 0 4em; - margin: 0; - height: 2.4em; - background-image: url("../ui/Subnav-background.png"); -} - -.tabs2 .ui-tabs-nav li { - width:auto; - padding-left: 1em; - margin: 0; - background: #326122 !important; - color: white; -} - -.tabs2 .ui-tabs-nav li.ui-tabs-selected { - padding-left: 1em; - height: 1em; - background: #326122 !important; -} - - -.tabs2 .ui-tabs-nav li a{ - width:auto; - padding: 0.4em 0.6em ; - -moz-border-radius: 2em !important; - border-radius: 2em !important; - color: white; - font-size: 1em; - font-family: "Liberation Sans", Arial, Sans; -} - -.tabs2 .ui-tabs-nav li > a:link, span.main-nav-off > a:visited{ - color:white; -} - - -.tabs2 .ui-tabs-nav li a:hover{ - background: none repeat scroll 0 0 #1C3612; -} - -.tabs2 .ui-tabs-nav li.ui-tabs-selected a{ - background: none repeat scroll 0 0 #1C3612; - color: white; - -} - -span.sub-nav-off > a:link, span.sub-nav-off > a:visited{ - color:white; -} - -span.main-nav-off > a:link, span.main-nav-off > a:visited{ - color:white; -} - -span.main-separator{ - background: #333339; - padding:0.1em; -} - - - -/* Entity */ - -.entity-container{ - position: relative; - left: 22em; - width: 80%; - margin: 0.06em; - padding: 0.06em; - background: #e8e8e8; -} - -.action-panel { - position: fixed; - height: 33em; - left: auto; - border: none; - float: none; - margin-top: 6.3em; - margin-left: -19.5em; - margin-right: 0; - padding-left: 0; - position: fixed; - width: 18em; - background-image:url("../ui/panel-background.png"); - background-repeat:no-repeat; - background-position:right; -} - -.action-panel h3{ - font-family: "Overpass Bold", "Liberation Sans", Arial, sans-serif; +h1 { color: #333333; - margin: 0; - background: #EEEEEE; - padding: .5em; - border-right: 1px solid #dfdfdf; - text-transform: uppercase; - font-size: 1.2em; -} - -.action-panel ul { - list-style-type:none; - padding-left: .5em; -} - -.action-panel h3{ - margin: 0; - background: #e8e8e8; -} - -.action-panel li { font-family: "Overpass Bold", "Liberation Sans", Arial, sans-serif; - font-size: 1.1em; - color: #1d85d5; - list-style-type: none; - min-height: 2.1em; - padding: none; -} - -.action-panel li.search-facet { - font-family: "Overpass Bold", "Liberation Sans", Arial, Sans; - color: #1D85D5; - cursor: pointer; - text-transform: uppercase; - font-size: 1.2em; -} - -.action-panel li.entity-facet { - font-family: "Liberation Sans",Arial,sans-serif; - color: #1d85d5; - cursor: pointer; - margin-left:1.2em; - text-transform: none; -} - -.action-panel li.entity-facet-selected { - font-family: "Overpass Bold", "Liberation Sans", Arial, Sans; - color: black; - text-transform: uppercase; - cursor: pointer; -} - -.action-panel li.entity-facet-disabled { - font-family: "Liberation Sans",Arial,sans-serif; - color: gray; - cursor: default; - text-decoration: none; - text-transform: none; - -} - -.action-panel li.entity-facet-relation-label { - font-family: "Overpass Bold", "Liberation Sans", Arial, Sans; - color: #8a8a8a; - cursor: default; + font-size: 1.5em; + font-weight: normal; text-transform: uppercase; - margin-left:1.8em; -} - -.action-panel li.facet-group-member { - margin-left: 2.9em -} - - -.action-button { - background: none; - background-image:none; - font-family: "Liberation Sans", Arial, sans-serif; - font-size: 0.9em; -} - -.action-controls { - position: relative; - display:inline; -} - -.client { - font-size: 10px; - margin-top: 0.4em; - float: left; - min-width: 70em; -} - -/* Migration */ - -body#header-bg { - background: url("../ui/Static-Background.png") repeat-x scroll left top #EDEDED; -} - -.container_1 { - margin-left: auto; - margin-right: auto; - width: 960px; - background: url("../ui/centered-bg.png") no-repeat scroll 0 7em transparent; - min-height: 40em; } #formwindow { -moz-box-shadow: 0 1px 5px rgba(0, 0, 0, 0.6); + -webkit-box-shadow: 0 1px 5px rgba(0, 0, 0, 0.6); + box-shadow: 0 1px 5px rgba(0, 0, 0, 0.6); background: none repeat scroll 0 0 #FFFFFF; border-color: #FFFFFF #F0F0F0 #F0F0F0; border-right: 1px solid #F0F0F0; @@ -570,31 +32,25 @@ body#header-bg { } .formcontent { - padding: 0 1em 2em 2em; + padding: 0 1em 2em 2em; } #error-box { - -moz-border-radius: 0.3em 0.3em 0.3em 0.3em; - background-color: #FFEBE8; - border: 1px solid #DD3C10; - margin: 0 2em 1em; - padding: 1em 1em 0 0; + -moz-border-radius: 0.3em 0.3em 0.3em 0.3em; + -webkit-border-radius: 0.3em 0.3em 0.3em 0.3em; + background-color: #FFEBE8; + border: 1px solid #DD3C10; + margin: 0 2em 1em; + padding: 1em 1em 0 0; } -.# { - background: url("../ui/ipalogo.png") no-repeat scroll left top transparent; - border: none; - float: left; - height: 36px; - width: 205px; -} - -#formwindow h4 { +#formwindow h2 { background-color: #F0F0F0; font-size: 1.6em; padding: 18px 15px 14px 22px; text-transform: uppercase; - margin-top: 0; + margin: 0 0 1em 0; + font-weight: bold; } #login li { @@ -605,7 +61,9 @@ body#header-bg { } #login li input { - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2) inset; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); margin-left: 15px; padding: 2px 10px; width: 248px; @@ -626,238 +84,13 @@ form#login { .formbutton input { float: right; margin: 1em 1em 1em 0; - -moz-border-radius: 0.3em 0.3em 0.3em 0.3em; - background: -moz-linear-gradient(center top, #959595, #5e5e5e) repeat scroll 0 0 transparent; - border: 1px solid #777777; - color: #ffffff; - font-weight: normal; - padding: 0.5em 0.8em; -} - -.textblock { - text-align: center; - margin-top: 6em; - font-size: 1.1em; -} - -.textblockkrb { - text-align: left; - margin-top: 5em; - font-size: 1.1em; - padding-left: 3em; - -} - -.textblockkrb ul li { - list-style-type: none; - padding: .15em; - -} - - -h3 { - color: #333333; - font-family: "Overpass Bold", "Liberation Sans", Arial, sans-serif; - font-size: 1.5em; + -moz-border-radius: 0.3em 0.3em 0.3em 0.3em; + -webkit-border-radius: 0.3em 0.3em 0.3em 0.3em; + border-radius: 0.3em 0.3em 0.3em 0.3em; + background: -moz-linear-gradient(center top, #959595, #5e5e5e) repeat scroll 0 0 transparent; + background: -webkit-radial-gradient(center top, #959595, #5e5e5e) repeat scroll 0 0 transparent; + border: 1px solid #777777; + color: #ffffff; font-weight: normal; - text-transform: uppercase; -} - -h5 { - color: #333333; - font-family: "Overpass Bold", "Liberation Sans", Arial, sans-serif; - font-size: 1em; - font-weight: normal; - text-transform: uppercase; - margin-bottom: 3em; - margin-left: 5em; - margin-top: -3em; - -} - - - -/* Search */ - -.search-controls { - -moz-border-radius: .7em .7em 0 0; - height:2.5em; - background: -moz-linear-gradient(top, #eeeeee, #dfdfdf); - position: relative; - padding: 1em 1.5em; - margin-top: 1.5em; -} - -.search-table > a:link,a:visted{ - color:black; -} - -.search-table{ - padding: 0; - width:100%; - border: none; -} - -.search-table td{ - padding-left: 0.5em; -} - -.search-table th{ - padding-left: 0.5em; - background-color:#f6f6f6; - color:#333333; - text-align: left; - border: 1px solid #dfdfdf; -} - -.search-table tfoot tr td span{ - border-top: 1px solid #dfdfdf; - padding: 0.9em 0 0 1em; - display: block; - margin-top: 2em; -} - -.search-table tr:nth-child(even){ -# background-color:#CCC; -} - -.search-table tr:nth-child(odd){ -# background-color:#FFF; -} - -.entity-views{ - list-style-type:none; -} - -.entity-views li { - display:inline; - cursor: pointer; - padding: 0.4em; -} - -.strikethrough { text-decoration: line-through; } - - -.key-status-valid { - list-style-type: circle; - color: #008000; -} - -.key-status-missing { - list-style-type: circle; - color: #daa520; -} - -.key-status-active { - list-style-type: disc; -} - -.certificate-status-valid { - list-style-type: circle; - color: #008000; -} - -.certificate-status-revoked { - list-style-type: circle; - color: #ff0000; -} - -.certificate-status-missing { - list-style-type: circle; - color: #daa520; -} - -.certificate-status-active { - list-style-type: disc; -} - -dl.modal { - clear: both; - margin-left: 1em; - margin-top: 1em; - white-space: nowrap; -} - -dl.modal dt { - clear: left; - float: left; - padding-bottom: 0; - padding-right: 0; - text-align: right; - width: 10em; -} - -dl.modal dd { - float: left; - padding-bottom: 0; - margin-left: 0.8em; -} - - - -.ui-widget-content { -border:0; -} - -table.scrollable thead { - display: block; -} - -table.scrollable tbody { - display: block; - overflow: auto; -} - -.adder-dialog-filter { - height: 2.5em; -} - -.adder-dialog-results { - position: relative; - height: 20.0em; -} - -.adder-dialog-available { - border: 1px solid black; - position: absolute; - top: 0; - left: 0; - bottom: 0; - width: 25.0em; -} - -.adder-dialog-buttons { - position: absolute; - top: 1.5em; - left: 25em; - right: 25; - bottom: 0; - text-align: center; -} - -.adder-dialog-selected { - border: 1px solid black; - position: absolute; - top: 0; - right: 0; - bottom: 0; - width: 25em; -} - -.adder-dialog-internal { - border: 1px solid black; - position: absolute; - top: 0; - left: 0; - bottom: 4.5em; - width: 25em; -} - -.adder-dialog-external { - border: 1px solid black; - position: absolute; - left: 0; - bottom: 0; - width: 25em; - height: 4em; -} + padding: 0.5em 0.8em; +}
\ No newline at end of file |